Merge branch 'master' into windows-port

[platform/upstream/iotivity.git] / resource / src / CAManager.cpp

diff --git a/resource/src/CAManager.cpp b/resource/src/CAManager.cpp
index 740ded3..59cba9a 100644 (file)
--- a/resource/src/CAManager.cpp
+++ b/resource/src/CAManager.cpp
@@ -33,8 +33,8 @@ using namespace OC;
 
 namespace
 {
-        CAManager::AdapterChangedCallback g_adapterHandler = NULL;
-        CAManager::ConnectionChangedCallback g_connectionHandler = NULL;
+        CAManager::AdapterChangedCallback g_adapterHandler = nullptr;
+        CAManager::ConnectionChangedCallback g_connectionHandler = nullptr;
 }
 
 OCStackResult convertCAResultToOCResult(CAResult_t caResult)