Merge pull request #474 from jasongraffius/master

Fixes for clang build in Device Layer

Author: robszewczyk

src/adaptations/device-layer/GeneralUtils.cpp

@@ -31,7 +31,8 @@ WEAVE_ERROR ParseCompilerDateStr(const char * dateStr, uint16_t & year, uint8_t
 {
     WEAVE_ERROR err = WEAVE_NO_ERROR;
     char monthStr[4];
-    char * p;
+    const char * p;
+    char* endptr;
 
     static const char months[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
 
@@ -45,11 +46,11 @@ WEAVE_ERROR ParseCompilerDateStr(const char * dateStr, uint16_t & year, uint8_t
 
     month = ((p - months) / 3) + 1;
 
-    dayOfMonth = strtoul(dateStr + 4, &p, 10);
-    VerifyOrExit(p == dateStr + 6, err = WEAVE_ERROR_INVALID_ARGUMENT);
+    dayOfMonth = strtoul(dateStr + 4, &endptr, 10);
+    VerifyOrExit(endptr == dateStr + 6, err = WEAVE_ERROR_INVALID_ARGUMENT);
 
-    year = strtoul(dateStr + 7, &p, 10);
-    VerifyOrExit(p == dateStr + 11, err = WEAVE_ERROR_INVALID_ARGUMENT);
+    year = strtoul(dateStr + 7, &endptr, 10);
+    VerifyOrExit(endptr == dateStr + 11, err = WEAVE_ERROR_INVALID_ARGUMENT);
 
 exit:
     return err;

src/adaptations/device-layer/include/Weave/DeviceLayer/ConfigurationManager.h

@@ -140,8 +140,9 @@ class ConfigurationManager
     template<class> friend class ::nl::Weave::DeviceLayer::Internal::GenericPlatformManagerImpl;
     friend class ::nl::Weave::DeviceLayer::TraitManager;
     friend class ::nl::Weave::DeviceLayer::Internal::DeviceControlServer;
-    friend WEAVE_ERROR ::nl::Weave::Platform::PersistedStorage::Read(::nl::Weave::Platform::PersistedStorage::Key key, uint32_t & value);
-    friend WEAVE_ERROR ::nl::Weave::Platform::PersistedStorage::Write(::nl::Weave::Platform::PersistedStorage::Key key, uint32_t value);
+    // Parentheses used to fix clang parsing issue with these declarations
+    friend WEAVE_ERROR (::nl::Weave::Platform::PersistedStorage::Read(::nl::Weave::Platform::PersistedStorage::Key key, uint32_t & value));
+    friend WEAVE_ERROR (::nl::Weave::Platform::PersistedStorage::Write(::nl::Weave::Platform::PersistedStorage::Key key, uint32_t value));
 
     using ImplClass = ConfigurationManagerImpl;
 

src/adaptations/device-layer/include/Weave/DeviceLayer/PlatformManager.h

@@ -28,6 +28,19 @@
 
 namespace nl {
 namespace Weave {
+namespace System {
+namespace Platform {
+namespace Layer {
+
+System::Error PostEvent(System::Layer&, void*, System::Object&, System::EventType, uintptr_t);
+System::Error DispatchEvents(System::Layer&, void*);
+System::Error DispatchEvent(System::Layer&, void*, System::Event);
+System::Error StartTimer(System::Layer&, void*, uint32_t);
+
+} // namespace Layer
+} // namespace Platform
+} // namespace System
+
 namespace DeviceLayer {
 
 class PlatformManagerImpl;
@@ -90,10 +103,11 @@ class PlatformManager
     template<class> friend class Internal::GenericThreadStackManagerImpl_OpenThread;
     template<class> friend class Internal::GenericThreadStackManagerImpl_OpenThread_LwIP;
     template<class> friend class Internal::GenericConfigurationManagerImpl;
-    friend ::nl::Weave::System::Error ::nl::Weave::System::Platform::Layer::PostEvent(::nl::Weave::System::Layer & aLayer, void * aContext, ::nl::Weave::System::Object & aTarget, ::nl::Weave::System::EventType aType, uintptr_t aArgument);
-    friend ::nl::Weave::System::Error ::nl::Weave::System::Platform::Layer::DispatchEvents(::nl::Weave::System::Layer & aLayer, void * aContext);
-    friend ::nl::Weave::System::Error ::nl::Weave::System::Platform::Layer::DispatchEvent(::nl::Weave::System::Layer & aLayer, void * aContext, ::nl::Weave::System::Event aEvent);
-    friend ::nl::Weave::System::Error ::nl::Weave::System::Platform::Layer::StartTimer(::nl::Weave::System::Layer & aLayer, void * aContext, uint32_t aMilliseconds);
+    // Parentheses used to fix clang parsing issue with these declarations
+    friend ::nl::Weave::System::Error (::nl::Weave::System::Platform::Layer::PostEvent(::nl::Weave::System::Layer & aLayer, void * aContext, ::nl::Weave::System::Object & aTarget, ::nl::Weave::System::EventType aType, uintptr_t aArgument));
+    friend ::nl::Weave::System::Error (::nl::Weave::System::Platform::Layer::DispatchEvents(::nl::Weave::System::Layer & aLayer, void * aContext));
+    friend ::nl::Weave::System::Error (::nl::Weave::System::Platform::Layer::DispatchEvent(::nl::Weave::System::Layer & aLayer, void * aContext, ::nl::Weave::System::Event aEvent));
+    friend ::nl::Weave::System::Error (::nl::Weave::System::Platform::Layer::StartTimer(::nl::Weave::System::Layer & aLayer, void * aContext, uint32_t aMilliseconds));
 
     void PostEvent(const WeaveDeviceEvent * event);
     void DispatchEvent(const WeaveDeviceEvent * event);