Namespace workaround for compilers on other platforms

Author: hasty

src/app/clusters/thermostat-server/thermostat-server-atomic.cpp

@@ -594,10 +594,11 @@ void ThermostatAttrAccess::RollbackAtomicWrite(CommandHandler * commandObj, cons
     SendAtomicResponse(commandObj, commandPath, status, attributeStatuses);
 }
 
-} // namespace Thermostat
-} // namespace Clusters
-} // namespace app
-} // namespace chip
+void MatterThermostatClusterServerShutdownCallback(EndpointId endpoint)
+{
+    ChipLogProgress(Zcl, "Shutting down thermostat server cluster on endpoint %d", endpoint);
+    gThermostatAttrAccess.ResetAtomicWrite(endpoint);
+}
 
 bool emberAfThermostatClusterAtomicRequestCallback(CommandHandler * commandObj, const ConcreteCommandPath & commandPath,
                                                    const Clusters::Thermostat::Commands::AtomicRequest::DecodableType & commandData)
@@ -626,8 +627,18 @@ bool emberAfThermostatClusterAtomicRequestCallback(CommandHandler * commandObj,
     return false;
 }
 
+} // namespace Thermostat
+} // namespace Clusters
+} // namespace app
+} // namespace chip
+
+bool emberAfThermostatClusterAtomicRequestCallback(CommandHandler * commandObj, const ConcreteCommandPath & commandPath,
+                                                   const Clusters::Thermostat::Commands::AtomicRequest::DecodableType & commandData)
+{
+    return Thermostat::emberAfThermostatClusterAtomicRequestCallback(commandObj, commandPath, commandData);
+}
+
 void MatterThermostatClusterServerShutdownCallback(EndpointId endpoint)
 {
-    ChipLogProgress(Zcl, "Shutting down thermostat server cluster on endpoint %d", endpoint);
-    gThermostatAttrAccess.ResetAtomicWrite(endpoint);
+    Thermostat::MatterThermostatClusterServerShutdownCallback(endpoint);
 }

src/app/clusters/thermostat-server/thermostat-server-presets.cpp

@@ -526,6 +526,14 @@ Status ThermostatAttrAccess::PrecommitPresets(EndpointId endpoint)
     return Status::Success;
 }
 
+bool emberAfThermostatClusterSetActivePresetRequestCallback(CommandHandler * commandObj, const ConcreteCommandPath & commandPath,
+                                                            const Commands::SetActivePresetRequest::DecodableType & commandData)
+{
+    auto status = gThermostatAttrAccess.SetActivePreset(commandPath.mEndpointId, commandData.presetHandle);
+    commandObj->AddStatus(commandPath, status);
+    return true;
+}
+
 } // namespace Thermostat
 } // namespace Clusters
 } // namespace app
@@ -534,7 +542,5 @@ Status ThermostatAttrAccess::PrecommitPresets(EndpointId endpoint)
 bool emberAfThermostatClusterSetActivePresetRequestCallback(CommandHandler * commandObj, const ConcreteCommandPath & commandPath,
                                                             const Commands::SetActivePresetRequest::DecodableType & commandData)
 {
-    auto status = gThermostatAttrAccess.SetActivePreset(commandPath.mEndpointId, commandData.presetHandle);
-    commandObj->AddStatus(commandPath, status);
-    return true;
+    return Thermostat::emberAfThermostatClusterSetActivePresetRequestCallback(commandObj, commandPath, commandData);
 }

src/app/clusters/thermostat-server/thermostat-server.h

@@ -206,14 +206,15 @@ class ThermostatAttrAccess : public chip::app::AttributeAccessInterface, public
 
     friend void TimerExpiredCallback(System::Layer * systemLayer, void * callbackContext);
 
-    friend void ::MatterThermostatClusterServerShutdownCallback(EndpointId endpoint);
+    friend void MatterThermostatClusterServerShutdownCallback(EndpointId endpoint);
 
-    friend bool ::emberAfThermostatClusterSetActivePresetRequestCallback(
+    friend bool emberAfThermostatClusterSetActivePresetRequestCallback(
         CommandHandler * commandObj, const ConcreteCommandPath & commandPath,
         const Clusters::Thermostat::Commands::SetActivePresetRequest::DecodableType & commandData);
-    friend bool ::emberAfThermostatClusterAtomicRequestCallback(
-        CommandHandler * commandObj, const ConcreteCommandPath & commandPath,
-        const Clusters::Thermostat::Commands::AtomicRequest::DecodableType & commandData);
+
+    friend bool
+    emberAfThermostatClusterAtomicRequestCallback(CommandHandler * commandObj, const ConcreteCommandPath & commandPath,
+                                                  const Clusters::Thermostat::Commands::AtomicRequest::DecodableType & commandData);
 
     struct AtomicWriteSession
     {