Imported Upstream version 1.2.0

[platform/upstream/iotivity.git] / resource / include / OCResourceRequest.h

diff --git a/resource/include/OCResourceRequest.h b/resource/include/OCResourceRequest.h
index a2e13c1..6761f5d 100644 (file)
--- a/resource/include/OCResourceRequest.h
+++ b/resource/include/OCResourceRequest.h
@@ -47,21 +47,53 @@ namespace OC
         typedef std::shared_ptr<OCResourceRequest> Ptr;
 
         OCResourceRequest():
-            m_requestType{},
-            m_resourceUri{},
-            m_queryParameters{},
-            m_requestHandlerFlag{},
-            m_messageID{},
-            m_representation{},
-            m_observationInfo{},
-            m_headerOptions{},
-            m_requestHandle{nullptr},
-            m_resourceHandle{nullptr}
+            m_requestType(""),
+            m_resourceUri(""),
+            m_queryParameters(QueryParamsMap()),
+            m_requestHandlerFlag(0),
+            m_messageID(0),
+            m_representation(OCRepresentation()),
+            m_headerOptions(HeaderOptions()),
+            m_requestHandle(nullptr),
+            m_resourceHandle(nullptr)
         {
+            m_observationInfo.action = ObserveAction::ObserveRegister;
+            m_observationInfo.obsId = 0;
+            m_observationInfo.connectivityType = OCConnectivityType::CT_DEFAULT;
+            m_observationInfo.address = "";
+            m_observationInfo.port = 0;
         }
 
+#if defined(_MSC_VER) && (_MSC_VER < 1900)
+        OCResourceRequest(OCResourceRequest&& o):
+            m_requestType(std::move(o.m_requestType)),
+            m_resourceUri(std::move(o.m_resourceUri)),
+            m_queryParameters(std::move(o.m_queryParameters)),
+            m_requestHandlerFlag(o.m_requestHandlerFlag),
+            m_representation(std::move(o.m_representation)),
+            m_observationInfo(std::move(o.m_observationInfo)),
+            m_headerOptions(std::move(o.m_headerOptions)),
+            m_requestHandle(std::move(o.m_requestHandle)),
+            m_resourceHandle(std::move(o.m_resourceHandle))
+        {
+        }
+        OCResourceRequest& operator=(OCResourceRequest&& o)
+        {
+            m_requestType = std::move(o.m_requestType);
+            m_resourceUri = std::move(o.m_resourceUri);
+            m_queryParameters = std::move(o.m_queryParameters);
+            m_requestHandlerFlag = o.m_requestHandlerFlag;
+            m_representation = std::move(o.m_representation);
+            m_observationInfo = std::move(o.m_observationInfo);
+            m_headerOptions = std::move(o.m_headerOptions);
+            m_requestHandle = std::move(o.m_requestHandle);
+            m_resourceHandle = std::move(o.m_resourceHandle);
+        }
+#else
         OCResourceRequest(OCResourceRequest&&) = default;
         OCResourceRequest& operator=(OCResourceRequest&&) = default;
+#endif
+
         /**
         *  Virtual destructor
         */