1. Updated boost Framework path for ios

2. Fixed build errors
	a. Some void functions return values
	b. Added missing Headers

Change-Id: I0b6a796fb815a16725e06fa154499d5a8d1605cf
Signed-off-by: srijon.sb <srijon.sb@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14797
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>

diff --git a/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c b/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c
index 3e2ab585b274ad554eb39547d9603bca1a9438e9..e2f64615019fbf1904b2803c81a282b0903846a3 100644 (file)
--- a/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c
+++ b/resource/csdk/connectivity/src/tcp_adapter/catcpserver.c
@@ -746,7 +746,7 @@ static void CAReceiveMessage(int fd)
             {
                 OIC_LOG_V(ERROR, TAG, "toal tls length is too big (buffer size : %u)",
                                     sizeof(svritem->tlsdata));
-                return CA_STATUS_FAILED;
+                return;
             }
             nbRead = tlsLength - svritem->tlsLen;
         }

diff --git a/resource/csdk/security/provisioning/src/otmcontextlist.c b/resource/csdk/security/provisioning/src/otmcontextlist.c
index c4b3c405eddce4caac02ae02e5019396de51d662..e5f4b9fa8fe5d23de3bb7bd59243c93d9b490c2a 100644 (file)
--- a/resource/csdk/security/provisioning/src/otmcontextlist.c
+++ b/resource/csdk/security/provisioning/src/otmcontextlist.c
@@ -40,8 +40,6 @@ void RemoveOTMContext(const char* addr, uint16_t port)
     }
 
     OIC_LOG(DEBUG, TAG, "OUT RemoveOTMContext");
-
-    return retCtx;
 }
 
 OCStackResult AddOTMContext(OTMContext_t* ctx, const char* addr, uint16_t port)

diff --git a/resource/csdk/security/provisioning/src/secureresourceprovider.c b/resource/csdk/security/provisioning/src/secureresourceprovider.c
index ba0e514ca054aed5f6aebcde211fee123ff0d12f..930bdf7df40d7b84c5fd7b437399d68f5fb55641 100644 (file)
--- a/resource/csdk/security/provisioning/src/secureresourceprovider.c
+++ b/resource/csdk/security/provisioning/src/secureresourceprovider.c
@@ -29,6 +29,7 @@
 #include "secureresourceprovider.h"
 #include "logger.h"
 #include "oic_malloc.h"
+#include "oic_string.h"
 #include "aclresource.h"
 #include "pstatresource.h"
 #include "srmresourcestrings.h"
@@ -44,6 +45,7 @@
 #include "base64.h"
 #include "utlist.h"
 #include "ocpayload.h"
+#include "srmutility.h"
 
 #ifdef __WITH_DTLS__
 #include "crlresource.h"

diff --git a/resource/csdk/security/src/oxmpincommon.c b/resource/csdk/security/src/oxmpincommon.c
index 23532cd93cbc194c163d6bfe6f7b4ccbb0809102..7fff31dbc5cc3f3ac4180d8fcfbe11a6b2e222e1 100644 (file)
--- a/resource/csdk/security/src/oxmpincommon.c
+++ b/resource/csdk/security/src/oxmpincommon.c
@@ -31,6 +31,7 @@
 #include "doxmresource.h"
 #include "credresource.h"
 #include "cainterface.h"
+#include "oic_string.h"
 
 #define TAG "OIC_PIN_OXM_COMMON"
 

diff --git a/resource/csdk/stack/src/ocresource.c b/resource/csdk/stack/src/ocresource.c
index 55523944bfa1ca93cb79f07ae0c614728965da04..dc52bede0741b03aa9bda8f8d8ed55082d62fc2c 100755 (executable)
--- a/resource/csdk/stack/src/ocresource.c
+++ b/resource/csdk/stack/src/ocresource.c
@@ -50,6 +50,7 @@
 #include "cacommon.h"
 #include "cainterface.h"
 #include "ocpayload.h"
+#include "oickeepalive.h"
 #include "platform_features.h"
 #include "payload_logging.h"
 #ifdef ROUTING_GATEWAY

diff --git a/resource/third_party_libs.scons b/resource/third_party_libs.scons
index dc1fb89999be7c60e473f02675bf30f23981eca2..e042a22d80e5f9ca2c6ab6a7246f43545a651702 100644 (file)
--- a/resource/third_party_libs.scons
+++ b/resource/third_party_libs.scons
@@ -73,7 +73,7 @@ elif target_os in ['windows']:
        boost_path = os.path.join(src_dir,'extlibs','boost','boost')
        lib_env.AppendUnique(CPPPATH = [boost_path])
 elif target_os == 'ios':
-       lib_env.AppendUnique(FRAMEWORKPATH = ['#extlibs/boost/ios/framework'])
+       lib_env.AppendUnique(FRAMEWORKPATH = [src_dir + '/extlibs/boost/ios/framework'])
        lib_env.AppendUnique(FRAMEWORKS = ['boost'])
 elif target_os == 'darwin':
        lib_env.AppendUnique(CPPPATH = ['/usr/local/include'])

diff --git a/service/resource-encapsulation/SConscript b/service/resource-encapsulation/SConscript
index 87f25bc0460a12162ecc5de02e825cf5e5b8eeca..c4987e31a1f683b74333761474705a290055b9e7 100644 (file)
--- a/service/resource-encapsulation/SConscript
+++ b/service/resource-encapsulation/SConscript
@@ -40,12 +40,16 @@ else:
 if env.get('LOGGING'):
     env.AppendUnique(CPPDEFINES = ['TB_LOG'])
 
+target_os = env.get('TARGET_OS')
+
+if target_os in ['ios']:
+    env.AppendUnique(CPPDEFINES = ['TARGET_OS_IPHONE'])
+
 # Add third party libraries
 lib_env = env.Clone()
 SConscript('#service/third_party_libs.scons', 'lib_env')
 
 resourceClient_env = lib_env.Clone()
-target_os = env.get('TARGET_OS')
 
 ######################################################################
 # Build flags

diff --git a/service/resource-encapsulation/src/common/primitiveResource/src/RCSResourceAttributes.cpp b/service/resource-encapsulation/src/common/primitiveResource/src/RCSResourceAttributes.cpp
index e96e7cc4651b04b7cb67f1424bdac90c43f96e4f..ee66c982b6d06e7c5c9f7b99a64220debc112234 100644 (file)
--- a/service/resource-encapsulation/src/common/primitiveResource/src/RCSResourceAttributes.cpp
+++ b/service/resource-encapsulation/src/common/primitiveResource/src/RCSResourceAttributes.cpp
@@ -30,6 +30,12 @@
 #include "boost/mpl/size.hpp"
 #include "boost/mpl/deref.hpp"
 
+#ifdef __APPLE__
+#define OC_CONSTEXPR_INLINE inline
+#else
+#define OC_CONSTEXPR_INLINE constexpr inline
+#endif
+
 namespace
 {
 
@@ -206,7 +212,7 @@ namespace
     };
 
     template< typename VARIANT, int POS >
-    constexpr inline std::vector< TypeInfo > getTypeInfo(Int2Type< POS >) noexcept
+    OC_CONSTEXPR_INLINE std::vector< TypeInfo > getTypeInfo(Int2Type< POS >) noexcept
     {
         auto vec = getTypeInfo< VARIANT >(Int2Type< POS - 1 >{ });
         vec.push_back(TypeInfo::get< VARIANT, POS >());
@@ -214,7 +220,7 @@ namespace
     }
 
     template< typename VARIANT >
-    constexpr inline std::vector< TypeInfo > getTypeInfo(Int2Type< 0 >) noexcept
+    OC_CONSTEXPR_INLINE std::vector< TypeInfo > getTypeInfo(Int2Type< 0 >) noexcept
     {
         return { TypeInfo::get< VARIANT, 0 >() };
     }

diff --git a/service/third_party_libs.scons b/service/third_party_libs.scons
index 4492fe6187119e70ab5dcd02145fe4bb070c7f3b..f5d709fdcc8c9ca55d081598144168bea0bfa0c7 100644 (file)
--- a/service/third_party_libs.scons
+++ b/service/third_party_libs.scons
@@ -90,7 +90,7 @@ if target_os == 'android':
                lib_env.AppendUnique(CCFLAGS = ['-w'])
 
 elif target_os == 'ios':
-       lib_env.AppendUnique(FRAMEWORKPATH = ['#extlibs/boost/ios/framework'])
+       lib_env.AppendUnique(FRAMEWORKPATH = [src_dir + '/extlibs/boost/ios/framework'])
        lib_env.AppendUnique(FRAMEWORKS = ['boost'])
 elif target_os == 'darwin':
        lib_env.AppendUnique(CPPPATH = ['/usr/local/include'])