- Updated 3rd-party subrepos.

- Fixed missing RawNumber for RapidJSON parser (fixes #100).
- Added missing spaces in conversion exception messages (fixes #101).

Author: ecorm

CHANGELOG.md

@@ -1,3 +1,11 @@
+v0.6.3
+======
+Update for latest 3rd-party dependencies.
+
+- Updated 3rd-party subrepos.
+- Fixed missing RawNumber for RapidJSON parser (fixes #100).
+- Added missing spaces in conversion exception messages (fixes #101).
+
 v0.6.2
 ======
 Variant conversion enhancements.
@@ -10,6 +18,8 @@ Variant conversion enhancements.
 - Enforced Client::LocalSubs non-empty invariant during unsubscribe.
 - Added Variant::at accessors (closes #95).
 - Updated config.json test/example files for Crossbar 0.13.0.
+- Blob is now stored via a pointer within the Variant::Field union, to reduce
+  the size of a Variant object.
 
 v0.6.1
 ======

cppwamp/include/cppwamp/internal/conversion.ipp

@@ -143,7 +143,7 @@ FromVariantConverter& FromVariantConverter::operator[](T& value)
     {
         std::ostringstream oss;
         oss << "wamp::error::Conversion: Attemping to access field type "
-            << typeNameOf(var_) << "as array";
+            << typeNameOf(var_) << " as array";
         throw error::Conversion(oss.str());
     }
     catch (const std::out_of_range&)
@@ -185,7 +185,7 @@ FromVariantConverter& FromVariantConverter::operator()(const String& key,
     {
         std::ostringstream oss;
         oss << "wamp::error::Conversion: Attemping to access field type "
-            << typeNameOf(var_) << "as object using key \"" << key << '"';
+            << typeNameOf(var_) << " as object using key \"" << key << '"';
         throw error::Conversion(oss.str());
     }
     catch (const std::out_of_range&)
@@ -229,7 +229,7 @@ FromVariantConverter& FromVariantConverter::operator()(const String& key,
     {
         std::ostringstream oss;
         oss << "wamp::error::Conversion: Attemping to access field type "
-            << typeNameOf(var_) << "as object using key \"" << key << '"';
+            << typeNameOf(var_) << " as object using key \"" << key << '"';
         throw error::Conversion(oss.str());
     }
 

cppwamp/include/cppwamp/internal/json.ipp

@@ -40,6 +40,14 @@ public:
             return Base::String(str, length, true);
     }
 
+    // Only used if kParseNumbersAsStringsFlag is set
+    bool RawNumber(const char* /*str*/, SizeType /*length*/, bool /*copy*/)
+    {
+        // kParseNumbersAsStringsFlag should never be set in CppWAMP.
+        assert(false && "RapidJSON kParseNumbersAsStringsFlag not supported");
+        return false;
+    }
+
 private:
     using Base = VariantBuilder;
 };

cppwamp/include/cppwamp/version.hpp

@@ -20,10 +20,10 @@
 #define CPPWAMP_MINOR_VERSION 6
 
 /// Patch version for backwards-compatible bug fixes.
-#define CPPWAMP_PATCH_VERSION 2
+#define CPPWAMP_PATCH_VERSION 3
 
 /// Integer version number, computed as `(major*10000) + (minor*100) + patch`
-#define CPPWAMP_VERSION 602
+#define CPPWAMP_VERSION 603
 
 namespace wamp
 {

ext/Catch

@@ -47,6 +47,11 @@ add_definitions(
     -DCPPWAMP_TESTING_WAMP=1
 )
 
+# Silence GCC warnings from Catch comparison checks
+if(CMAKE_COMPILER_IS_GNUCXX)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-parentheses")
+endif()
+
 # Add include path for Catch unit test framework
 include_directories(${PATH_INCLUDE_CATCH})
 

ext/msgpack-c

@@ -15,6 +15,7 @@
 #include <cppwamp/json.hpp>
 
 using namespace wamp;
+using namespace Catch::Matchers;
 
 namespace
 {

ext/rapidjson

@@ -57,6 +57,9 @@ QMAKE_CXXFLAGS += -std=c++11
 #Enable support for threads
 QMAKE_CXXFLAGS += -pthread
 
+#Silence warnings from Catch comparison checks
+QMAKE_CXXFLAGS += -Wno-parentheses
+
 #Stop compiling after N errors
 QMAKE_CXXFLAGS += -fmax-errors=3
 

test/CMakeLists.txt

@@ -14,6 +14,7 @@
 #include <cppwamp/variant.hpp>
 
 using namespace wamp;
+using namespace Catch::Matchers;
 
 //------------------------------------------------------------------------------
 SCENARIO( "Variant type information", "[Variant]" )

test/codectestjson.cpp

@@ -24,6 +24,7 @@
 
 
 using namespace wamp;
+using namespace Catch::Matchers;
 
 namespace
 {

test/test.pro

@@ -14,6 +14,7 @@
 #include <cppwamp/internal/config.hpp>
 
 using namespace wamp;
+using namespace Catch::Matchers;
 
 namespace
 {