Missed a few name conversions.

diff --git a/OCLib/InProcServerWrapper.cpp b/OCLib/InProcServerWrapper.cpp
index 6acb217..925acc4 100644 (file)
--- a/OCLib/InProcServerWrapper.cpp
+++ b/OCLib/InProcServerWrapper.cpp
@@ -84,7 +84,7 @@ namespace OC
     {
         using OC::OCReflect::property_type;
         using OC::OCReflect::property_binding;
-        using namespace OC::OCReflect::to_OCStack;
+        using namespace OC::OCReflect::OCStack;
 
         std::vector<std::string> reps { convert(properties) };
 

diff --git a/examples/Makefile b/examples/Makefile
index aca8919..986a93b 100644 (file)
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -5,7 +5,8 @@ CXX_FLAGS=-std=c++11 -Wall -pthread
 
 CXX_INC=-I../include/ -I./client/ -I../csdk/stack/include -I../csdk/ocsocket/include -I../csdk/ocrandom/include -I../csdk/logger/include
 
-LIB_SRC0=../OCLib/OCReflect.cpp ../OCLib/OCProperties.cpp ../OCLib/OCObserver.cpp ../OCLib/OCResource.cpp ./client/MyObserverHandler.cpp  ../OCLib/OCServer.cpp
+# LIB_SRC0=../OCLib/OCReflect.cpp ../OCLib/OCProperties.cpp ../OCLib/OCObserver.cpp ../OCLib/OCResource.cpp ./client/MyObserverHandler.cpp  ../OCLib/OCServer.cpp
+LIB_SRC0=../OCLib/OCReflect.cpp ../OCLib/OCProperties.cpp ../OCLib/OCObserver.cpp ../OCLib/OCResource.cpp ../OCLib/OCServer.cpp
 
 LIB_SRC1=../OCLib/OCReflect.cpp ../OCLib/OCObserver.cpp ./client/MyObserverHandler.cpp ../OCLib/OCResource.cpp ../OCLib/OCSecurityModel.cpp ../OCLib/InProcClientWrapper.cpp ../OCLib/OCPlatform.cpp ../OCLib/InProcServerWrapper.cpp ../csdk/liboctbstack.a ../OCLib/OCServer.cpp
 

diff --git a/examples/old_tests/OCWrapper/testServer.cpp b/examples/old_tests/OCWrapper/testServer.cpp
index 3e11cea..a191f7e 100644 (file)
--- a/examples/old_tests/OCWrapper/testServer.cpp
+++ b/examples/old_tests/OCWrapper/testServer.cpp
@@ -43,7 +43,7 @@ void rep_test()
               named_property_binding("power", property_type::integer),
        };
 
-       using namespace OC::OCReflect::to_OCStack;
+       using namespace OC::OCReflect::OCStack;
 
        std::vector<std::string> reps { convert(sigs) };
 

diff --git a/examples/reflect/test_OCReflect.cpp b/examples/reflect/test_OCReflect.cpp
index 9c4c260..d2eabac 100644 (file)
--- a/examples/reflect/test_OCReflect.cpp
+++ b/examples/reflect/test_OCReflect.cpp
@@ -221,6 +221,7 @@ class light
 
                 server.bind(b_manufacturer);
 */
+/*
                 // The canonical way to bind a property to a server in one step:
                 bind_property(
                                 server,                                      // server to bind to
@@ -229,6 +230,7 @@ class light
                                 OC::OCReflect::property_type::string,        // property
                                 OC::OCReflect::property_attribute::r         // type decoration
                 );
+*/
         }
 };
 

diff --git a/examples/simpleserver.cpp b/examples/simpleserver.cpp
index bafdfd2..1e60c21 100644 (file)
--- a/examples/simpleserver.cpp
+++ b/examples/simpleserver.cpp
@@ -82,8 +82,8 @@ public:
        {
         /*
         We could typedef to simpler names! :)
-        typedef named_property_binding_vector OCPropertyBindings;
-        typedef named_property_binding OCPropertyBinding;
+        typedef property_binding_vector OCPropertyBindings;
+        typedef property_binding OCPropertyBinding;
 
         OCPropertyBindings properties {
                        OCPropertyBinding("state", property_type::boolean),
@@ -99,8 +99,8 @@ public:
         */
 
         auto properties {
-                       named_property_binding{"state", property_type::boolean},
-                       named_property_binding{"power", property_type::integer}
+                       property_binding{"state", property_type::boolean},
+                       property_binding{"power", property_type::integer}
         };
 
                std::string resourceURI = "/a/light";