Imported Upstream version 1.2.0

[platform/upstream/iotivity.git] / resource / examples / threadingsample.cpp

diff --git a/resource/examples/threadingsample.cpp b/resource/examples/threadingsample.cpp
index e1332c8..46cfbec 100644 (file)
--- a/resource/examples/threadingsample.cpp
+++ b/resource/examples/threadingsample.cpp
@@ -23,6 +23,7 @@
 /// server in a separate thread, and running 2 clients in each thread.
 ///
 
+#include "iotivity_config.h"
 
 #include <memory>
 #include <iostream>
@@ -33,6 +34,11 @@
 
 #include "OCPlatform.h"
 #include "OCApi.h"
+
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
+
 using namespace OC;
 
 static std::ostringstream requestURI;
@@ -156,8 +162,8 @@ struct FooResource
     }
 };
 
-void putResourceInfo(const HeaderOptions& headerOptions,
-        const OCRepresentation rep, const OCRepresentation rep2, const int eCode)
+void putResourceInfo(const HeaderOptions& /*headerOptions*/,
+        const OCRepresentation rep, const OCRepresentation /*rep2*/, const int eCode)
 {
    bool m_isFoo = false;
    int m_barCount = 0;
@@ -186,7 +192,7 @@ void putResourceInfo(const HeaderOptions& headerOptions,
    }
 }
 
-void getResourceInfo(std::shared_ptr<OCResource> resource, const HeaderOptions& headerOptions,
+void getResourceInfo(std::shared_ptr<OCResource> resource, const HeaderOptions& /*headerOptions*/,
             const OCRepresentation rep,
             const int eCode)
 {
@@ -279,7 +285,7 @@ void client1()
 {
     std::cout << "in client1\n";
     std::cout<<"result1:" << OCPlatform::findResource("", requestURI.str(),
-            OC_ALL, foundResource1)<< std::endl;
+            CT_DEFAULT, foundResource1)<< std::endl;
 
     // A condition variable will free the mutex it is given, then do a non-
     // intensive block until 'notify' is called on it.  In this case, since we
@@ -296,7 +302,7 @@ void client2()
     std::cout << "in client2\n";
     std::cout<<"result2:" << OCPlatform::findResource("",
                 requestURI.str(),
-                OC_ALL, foundResource2)<< std::endl;
+                CT_DEFAULT, foundResource2)<< std::endl;
 
     // A condition variable will free the mutex it is given, then do a non-
     // intensive block until 'notify' is called on it.  In this case, since we
@@ -327,10 +333,10 @@ void server()
     cv.wait(lock);
 }
 
-int main(int argc, char* argv[])
+int main(int /*argc*/, char** /*argv[]*/)
 {
 
-    requestURI << OC_MULTICAST_DISCOVERY_URI << "?rt=core.foo";
+    requestURI << OC_RSRVD_WELL_KNOWN_URI << "?rt=core.foo";
 
     PlatformConfig cfg {
         OC::ServiceType::InProc,