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>
(cherry picked from commit
98b92dae54a9244e1947937fcf7432ac38956659)
Origin: https://gerrit.iotivity.org/gerrit/#/c/16481/
pp
#include "OCApi.h"
#include "oic_malloc.h"
-#include "EasySetup.h"
+#include "EasySetup.hpp"
#include "ESRichCommon.h"
#include "ocrandom.h"
easy_setup_env.InstallTarget(es_sdk_shared, '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)
#include <jni.h>
-#include "EasySetup.h"
+#include "EasySetup.hpp"
#include "RemoteEnrollee.h"
#include "ESException.h"
#include "oic_string.h"
#ifdef __cplusplus
}
#endif
-#endif // __JNI_ES_EASYSETUP_H
\ No newline at end of file
+#endif // __JNI_ES_EASYSETUP_H
+++ /dev/null
-//******************************************************************
-//
-// Copyright 2015 Samsung Electronics All Rights Reserved.
-//
-//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-#ifndef EASYSETUP_H_
-#define EASYSETUP_H_
-
-#include <memory>
-#include <vector>
-
-#include "ESRichCommon.h"
-#include "RemoteEnrollee.h"
-
-using namespace OC;
-namespace OIC
-{
- namespace Service
- {
- class RemoteEnrollee;
-
- /**
- * This provides an API to instanciate a new RemoteEnrollee object correspondent to Enrollee
- * Device to be setup.
- */
- class EasySetup
- {
- public:
- /**
- * API for getting the instance of EasySetup singleton class.
- * @return EasySetup instance.
- */
- static EasySetup* getInstance();
-
- /**
- * This API is used for creating a remote Enrollee instance.
- *
- * @param enrolleeResource an OCResource object corresponding to enrollee resource
- * discovered in a network. The OCResource object can be obtained by calling
- * OCPlatform.findResource() API. What resource you have to discover with
- * the OCPlatform.findResource() API is a "provisioning" resource with a certain
- * resource type, i.e. oic.wk.prov
- *
- * @throws ESBadRequestException If createEnrolleeDevice is invoked with the same
- * provisioning information.
- *
- * @return Pointer to RemoteEnrollee instance.
- */
- std::shared_ptr<RemoteEnrollee> createRemoteEnrollee(
- std::shared_ptr< OC::OCResource > enrolleeResource);
-
- private:
- EasySetup();
- ~EasySetup();
-
- private:
- std::shared_ptr< OC::OCResource > m_ocResource;
- static EasySetup *s_instance;
- };
- }
-}
-
-#endif /* EASYSETUP_H_ */
--- /dev/null
+//******************************************************************
+//
+// Copyright 2015 Samsung Electronics All Rights Reserved.
+//
+//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+#ifndef EASYSETUP_HPP_
+#define EASYSETUP_HPP_
+
+#include <memory>
+#include <vector>
+
+#include "ESRichCommon.h"
+#include "RemoteEnrollee.h"
+
+using namespace OC;
+namespace OIC
+{
+ namespace Service
+ {
+ class RemoteEnrollee;
+
+ /**
+ * This provides an API to instanciate a new RemoteEnrollee object correspondent to Enrollee
+ * Device to be setup.
+ */
+ class EasySetup
+ {
+ public:
+ /**
+ * API for getting the instance of EasySetup singleton class.
+ * @return EasySetup instance.
+ */
+ static EasySetup* getInstance();
+
+ /**
+ * This API is used for creating a remote Enrollee instance.
+ *
+ * @param enrolleeResource an OCResource object corresponding to enrollee resource
+ * discovered in a network. The OCResource object can be obtained by calling
+ * OCPlatform.findResource() API. What resource you have to discover with
+ * the OCPlatform.findResource() API is a "provisioning" resource with a certain
+ * resource type, i.e. oic.wk.prov
+ *
+ * @throws ESBadRequestException If createEnrolleeDevice is invoked with the same
+ * provisioning information.
+ *
+ * @return Pointer to RemoteEnrollee instance.
+ */
+ std::shared_ptr<RemoteEnrollee> createRemoteEnrollee(
+ std::shared_ptr< OC::OCResource > enrolleeResource);
+
+ private:
+ EasySetup();
+ ~EasySetup();
+
+ private:
+ std::shared_ptr< OC::OCResource > m_ocResource;
+ static EasySetup *s_instance;
+ };
+ }
+}
+
+#endif /* EASYSETUP_HPP_ */
//
//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-#include "EasySetup.h"
+#include "EasySetup.hpp"
#include "OCPlatform.h"
#include "logger.h"
#include "ESEnrolleeSimulator.h"
#include "escommon.h"
#include "ESRichCommon.h"
-#include "EasySetup.h"
+#include "EasySetup.hpp"
#include "RemoteEnrollee.h"
#include "ESEnrolleeCommon.h"
#include "OCApi.h"
#include "OCProvisioningManager.hpp"
-#include "EasySetup.h"
+#include "EasySetup.hpp"
#include "ESRichCommon.h"
#define ES_SAMPLE_APP_TAG "ES_SAMPLE_APP_TAG"
projects / platform / upstream / iotivity.git / commitdiff