From 98b92dae54a9244e1947937fcf7432ac38956659 Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Tue, 17 Jan 2017 09:48:05 +0100 Subject: [PATCH] easy-setup: Rename header to EasySetup.hpp 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 Reviewed-on: https://gerrit.iotivity.org/gerrit/16479 Reviewed-by: George Nash Tested-by: jenkins-iotivity Reviewed-by: Uze Choi --- service/easy-setup/enrollee/unittests/ESMediatorSimulator.h | 2 +- service/easy-setup/mediator/richsdk/SConscript | 2 +- .../richsdk/android/EasySetupCore/src/main/jni/JniEasySetup.h | 4 ++-- .../easy-setup/mediator/richsdk/inc/{EasySetup.h => EasySetup.hpp} | 6 +++--- service/easy-setup/mediator/richsdk/src/EasySetup.cpp | 2 +- service/easy-setup/mediator/richsdk/unittests/ESMediatorTest.cpp | 2 +- .../easy-setup/sampleapp/mediator/linux/richsdk_sample/mediator.cpp | 2 +- .../sampleapp/mediator/linux/richsdk_sample/submediator.cpp | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) rename service/easy-setup/mediator/richsdk/inc/{EasySetup.h => EasySetup.hpp} (97%) diff --git a/service/easy-setup/enrollee/unittests/ESMediatorSimulator.h b/service/easy-setup/enrollee/unittests/ESMediatorSimulator.h index db1159f..392cf6c 100755 --- a/service/easy-setup/enrollee/unittests/ESMediatorSimulator.h +++ b/service/easy-setup/enrollee/unittests/ESMediatorSimulator.h @@ -27,7 +27,7 @@ #include "OCApi.h" #include "oic_malloc.h" -#include "EasySetup.h" +#include "EasySetup.hpp" #include "ESRichCommon.h" #include "ocrandom.h" diff --git a/service/easy-setup/mediator/richsdk/SConscript b/service/easy-setup/mediator/richsdk/SConscript index 6751b3a..6e795ac 100755 --- a/service/easy-setup/mediator/richsdk/SConscript +++ b/service/easy-setup/mediator/richsdk/SConscript @@ -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) diff --git a/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/JniEasySetup.h b/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/JniEasySetup.h index d4e6391..049ee89 100755 --- a/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/JniEasySetup.h +++ b/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/JniEasySetup.h @@ -28,7 +28,7 @@ #include -#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 diff --git a/service/easy-setup/mediator/richsdk/inc/EasySetup.h b/service/easy-setup/mediator/richsdk/inc/EasySetup.hpp similarity index 97% rename from service/easy-setup/mediator/richsdk/inc/EasySetup.h rename to service/easy-setup/mediator/richsdk/inc/EasySetup.hpp index 531971d..5cfe9f5 100755 --- a/service/easy-setup/mediator/richsdk/inc/EasySetup.h +++ b/service/easy-setup/mediator/richsdk/inc/EasySetup.hpp @@ -18,8 +18,8 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -#ifndef EASYSETUP_H_ -#define EASYSETUP_H_ +#ifndef EASYSETUP_HPP_ +#define EASYSETUP_HPP_ #include #include @@ -75,4 +75,4 @@ namespace OIC } } -#endif /* EASYSETUP_H_ */ +#endif /* EASYSETUP_HPP_ */ diff --git a/service/easy-setup/mediator/richsdk/src/EasySetup.cpp b/service/easy-setup/mediator/richsdk/src/EasySetup.cpp index 4fcc332..9415bdb 100755 --- a/service/easy-setup/mediator/richsdk/src/EasySetup.cpp +++ b/service/easy-setup/mediator/richsdk/src/EasySetup.cpp @@ -18,7 +18,7 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -#include "EasySetup.h" +#include "EasySetup.hpp" #include "OCPlatform.h" #include "logger.h" diff --git a/service/easy-setup/mediator/richsdk/unittests/ESMediatorTest.cpp b/service/easy-setup/mediator/richsdk/unittests/ESMediatorTest.cpp index cb1d8ee..f0931f0 100755 --- a/service/easy-setup/mediator/richsdk/unittests/ESMediatorTest.cpp +++ b/service/easy-setup/mediator/richsdk/unittests/ESMediatorTest.cpp @@ -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" diff --git a/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/mediator.cpp b/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/mediator.cpp index 082b74a..54beb20 100755 --- a/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/mediator.cpp +++ b/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/mediator.cpp @@ -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" diff --git a/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/submediator.cpp b/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/submediator.cpp index b548475..2737f06 100755 --- a/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/submediator.cpp +++ b/service/easy-setup/sampleapp/mediator/linux/richsdk_sample/submediator.cpp @@ -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" -- 2.7.4