easy-setup: Rename header to EasySetup.hpp 79/16479/3
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Tue, 17 Jan 2017 08:48:05 +0000 (09:48 +0100)
committerUze Choi <uzchoi@samsung.com>
Wed, 18 Jan 2017 11:13:25 +0000 (11:13 +0000)
Prevent potential name clash on case insensitive filesystems:

./service/easy-setup/mediator/richsdk/inc/EasySetup.h
./service/easy-setup/enrollee/inc/easysetup.h

Mediator one is C++ so we rename it to .hpp

Change-Id: I6d784378b5065b162d06abb2338bf70e0147d864
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16479
Reviewed-by: George Nash <george.nash@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
service/easy-setup/enrollee/unittests/ESMediatorSimulator.h
service/easy-setup/mediator/richsdk/SConscript
service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/JniEasySetup.h
service/easy-setup/mediator/richsdk/inc/EasySetup.hpp [moved from service/easy-setup/mediator/richsdk/inc/EasySetup.h with 97% similarity]
service/easy-setup/mediator/richsdk/src/EasySetup.cpp
service/easy-setup/mediator/richsdk/unittests/ESMediatorTest.cpp
service/easy-setup/sampleapp/mediator/linux/richsdk_sample/mediator.cpp
service/easy-setup/sampleapp/mediator/linux/richsdk_sample/submediator.cpp

index db1159f..392cf6c 100755 (executable)
@@ -27,7 +27,7 @@
 #include "OCApi.h"
 #include "oic_malloc.h"
 
-#include "EasySetup.h"
+#include "EasySetup.hpp"
 #include "ESRichCommon.h"
 
 #include "ocrandom.h"
index 6751b3a..6e795ac 100755 (executable)
@@ -145,7 +145,7 @@ if target_os in ['android','linux']:
        easy_setup_env.InstallTarget([es_sdk_shared, es_sdk_static], 'libESMediatorRich')
        easy_setup_env.AppendUnique(LINKFLAGS = ['-Wl,-soname,libESMediatorRich.so'])
 
-filenames = [ 'ESRichCommon.h', 'EasySetup.h', 'RemoteEnrollee.h' ]
+filenames = [ 'ESRichCommon.h', 'EasySetup.hpp', 'RemoteEnrollee.h' ]
 for filename in filenames:
        easy_setup_env.UserInstallTargetHeader('inc/' + filename, "service/easy-setup", filename)
 
index d4e6391..049ee89 100755 (executable)
@@ -28,7 +28,7 @@
 
 #include <jni.h>
 
-#include "EasySetup.h"
+#include "EasySetup.hpp"
 #include "RemoteEnrollee.h"
 #include "ESException.h"
 #include "oic_string.h"
@@ -57,4 +57,4 @@ Java_org_iotivity_service_easysetup_mediator_EasySetup_nativeCreateRemoteEnrolle
 #ifdef __cplusplus
 }
 #endif
-#endif // __JNI_ES_EASYSETUP_H
\ No newline at end of file
+#endif // __JNI_ES_EASYSETUP_H
@@ -18,8 +18,8 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#ifndef EASYSETUP_H_
-#define EASYSETUP_H_
+#ifndef EASYSETUP_HPP_
+#define EASYSETUP_HPP_
 
 #include <memory>
 #include <vector>
@@ -75,4 +75,4 @@ namespace OIC
     }
 }
 
-#endif /* EASYSETUP_H_ */
+#endif /* EASYSETUP_HPP_ */
index 4fcc332..9415bdb 100755 (executable)
@@ -18,7 +18,7 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#include "EasySetup.h"
+#include "EasySetup.hpp"
 
 #include "OCPlatform.h"
 #include "logger.h"
index cb1d8ee..f0931f0 100755 (executable)
@@ -29,7 +29,7 @@
 #include "ESEnrolleeSimulator.h"
 #include "escommon.h"
 #include "ESRichCommon.h"
-#include "EasySetup.h"
+#include "EasySetup.hpp"
 #include "RemoteEnrollee.h"
 
 #include "ESEnrolleeCommon.h"
index 082b74a..54beb20 100755 (executable)
@@ -26,7 +26,7 @@
 #include "OCProvisioningManager.hpp"
 #include "securevirtualresourcetypes.h"
 
-#include "EasySetup.h"
+#include "EasySetup.hpp"
 #include "ESRichCommon.h"
 
 #define ES_SAMPLE_APP_TAG "ES_SAMPLE_APP_TAG"
index b548475..2737f06 100755 (executable)
@@ -26,7 +26,7 @@
 #include "OCProvisioningManager.hpp"
 #include "securevirtualresourcetypes.h"
 
-#include "EasySetup.h"
+#include "EasySetup.hpp"
 #include "ESRichCommon.h"
 
 #define ES_SAMPLE_APP_TAG "ES_SAMPLE_APP_TAG"