From: Soemin Tjong <stjong@microsoft.com>
Date: Wed, 3 May 2017 00:51:02 +0000 (-0700)
Subject: IoT-1842: Fix OCRepresentation issues on VS2013.
X-Git-Tag: 1.3.0~39
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3f18a16aab9be938052129c73394e96974f45587;p=platform%2Fupstream%2Fiotivity.git

IoT-1842: Fix OCRepresentation issues on VS2013.

https://jira.iotivity.org/browse/IOT-1842

Removed the not working shallow copy of the OCRepresentation object.
No problem is observed.

Deep copy should also fix the problem if any issue is found in the
future.

Change-Id: Ifc4aba57a591d0cb6a55e65e1a179e2c8a9ebc08
Signed-off-by: Soemin Tjong <stjong@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19553
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-by: Alex Kelley <alexke@microsoft.com>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
---

diff --git a/resource/IPCA/unittests/SConscript b/resource/IPCA/unittests/SConscript
index a9f7bff3e..a23f3f2ce 100644
--- a/resource/IPCA/unittests/SConscript
+++ b/resource/IPCA/unittests/SConscript
@@ -128,11 +128,9 @@ if target_os in ['windows']:
 
 if ipcatest_env.get('TEST') == '1':
     if target_os in ['windows']:
-        # Disabled for VS2013 due to https://jira.iotivity.org/browse/IOT-1842.
-        if '14.0' == ipcatest_env['MSVC_VERSION']:
-            from tools.scons.RunTest import *
-            run_test(ipcatest_env,
-                     'resource_ipca_unittests.memcheck',
-                     'resource/ipca/unittests/ipcatests',
-                     ipcatests)
+        from tools.scons.RunTest import *
+        run_test(ipcatest_env,
+                 'resource_ipca_unittests.memcheck',
+                 'resource/ipca/unittests/ipcatests',
+                 ipcatests)
 
diff --git a/resource/include/OCRepresentation.h b/resource/include/OCRepresentation.h
index 541cea576..681fd3027 100644
--- a/resource/include/OCRepresentation.h
+++ b/resource/include/OCRepresentation.h
@@ -94,29 +94,6 @@ namespace OC
             // this fix will work in the meantime.
             OCRepresentation(): m_interfaceType(InterfaceType::None){}
 
-#if defined(_MSC_VER) && (_MSC_VER < 1900)
-            OCRepresentation(OCRepresentation&& o)
-            {
-                std::memmove(this, &o, sizeof(o));
-            }
-#else
-            OCRepresentation(OCRepresentation&&) = default;
-#endif
-
-            OCRepresentation(const OCRepresentation&) = default;
-
-            OCRepresentation& operator=(const OCRepresentation&) = default;
-
-#if defined(_MSC_VER) && (_MSC_VER < 1900)
-            OCRepresentation& operator=(OCRepresentation&& o)
-            {
-                std::memmove(this, &o, sizeof(o));
-                return *this;
-            }
-#else
-            OCRepresentation& operator=(OCRepresentation&&) = default;
-#endif
-
             virtual ~OCRepresentation(){}
 
             void setDevAddr(const OCDevAddr&);