CPP-405 - Namespace rapidjson to avoid conflicts

Author: Michael Fero

cpp-driver/src/json.hpp

@@ -1,15 +1,26 @@
 /*
   Copyright (c) DataStax, Inc.
 
-  This software can be used solely with DataStax Enterprise. Please consult the
-  license at http://www.datastax.com/terms/datastax-dse-driver-license-terms
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 */
 
-#ifndef __DSE_JSON_HPP_INCLUDED__
-#define __DSE_JSON_HPP_INCLUDED__
+#ifndef __CASS_JSON_HPP_INCLUDED__
+#define __CASS_JSON_HPP_INCLUDED__
 
 #include "memory.hpp"
-
+#define RAPIDJSON_NAMESPACE cass::rapidjson
+#define RAPIDJSON_NAMESPACE_BEGIN namespace cass { namespace rapidjson {
+#define RAPIDJSON_NAMESPACE_END } }
 #define RAPIDJSON_NEW(x) cass::Memory::allocate<x>
 #define RAPIDJSON_DELETE(x) cass::Memory::deallocate(x)
 
@@ -36,14 +47,14 @@ class Allocator {
     }
 };
 
-typedef rapidjson::GenericDocument<rapidjson::UTF8<>, rapidjson::MemoryPoolAllocator<json::Allocator>, json::Allocator> Document;
-typedef rapidjson::GenericValue<rapidjson::UTF8<>, rapidjson::MemoryPoolAllocator<json::Allocator> > Value;
-typedef rapidjson::GenericStringBuffer<rapidjson::UTF8<>, json::Allocator> StringBuffer;
+typedef cass::rapidjson::GenericDocument<cass::rapidjson::UTF8<>, cass::rapidjson::MemoryPoolAllocator<json::Allocator>, json::Allocator> Document;
+typedef cass::rapidjson::GenericValue<cass::rapidjson::UTF8<>, cass::rapidjson::MemoryPoolAllocator<json::Allocator> > Value;
+typedef cass::rapidjson::GenericStringBuffer<cass::rapidjson::UTF8<>, json::Allocator> StringBuffer;
 
-template<typename OutputStream, typename SourceEncoding = rapidjson::UTF8<>, typename TargetEncoding = rapidjson::UTF8<>, typename StackAllocator = json::Allocator, unsigned writeFlags = rapidjson::kWriteDefaultFlags>
-class Writer : public rapidjson::Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator, writeFlags> {
+template<typename OutputStream, typename SourceEncoding = cass::rapidjson::UTF8<>, typename TargetEncoding = cass::rapidjson::UTF8<>, typename StackAllocator = json::Allocator, unsigned writeFlags = cass::rapidjson::kWriteDefaultFlags>
+class Writer : public cass::rapidjson::Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator, writeFlags> {
 public:
-    typedef rapidjson::Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator, writeFlags> Type;
+    typedef cass::rapidjson::Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator, writeFlags> Type;
 
     explicit Writer(OutputStream& os, StackAllocator* stackAllocator = 0, size_t levelDepth = Type::kDefaultLevelDepth) :
         Type(os, stackAllocator, levelDepth) { }
@@ -54,4 +65,4 @@ class Writer : public rapidjson::Writer<OutputStream, SourceEncoding, TargetEnco
 
 } } // namespace cass::json
 
-#endif
+#endif // __CASS_JSON_HPP_INCLUDED__

src/graph.cpp

@@ -392,7 +392,7 @@ CassError dse_graph_object_add_object_n(DseGraphObject* object,
     return CASS_ERROR_LIB_BAD_PARAMS;
   }
   object->add_key(name, name_length);
-  object->add_writer(value, rapidjson::kObjectType);
+  object->add_writer(value, cass::rapidjson::kObjectType);
   return CASS_OK;
 }
 
@@ -412,7 +412,7 @@ CassError dse_graph_object_add_array_n(DseGraphObject* object,
     return CASS_ERROR_LIB_BAD_PARAMS;
   }
   object->add_key(name, name_length);
-  object->add_writer(value, rapidjson::kArrayType);
+  object->add_writer(value, cass::rapidjson::kArrayType);
   return CASS_OK;
 }
 
@@ -556,7 +556,7 @@ CassError dse_graph_array_add_object(DseGraphArray* array,
   if (array->is_complete() || !value->is_complete()) {
     return CASS_ERROR_LIB_BAD_PARAMS;
   }
-  array->add_writer(value, rapidjson::kObjectType);
+  array->add_writer(value, cass::rapidjson::kObjectType);
   return CASS_OK;
 }
 
@@ -565,7 +565,7 @@ CassError dse_graph_array_add_array(DseGraphArray* array,
   if (array->is_complete() || !value->is_complete()) {
     return CASS_ERROR_LIB_BAD_PARAMS;
   }
-  array->add_writer(value, rapidjson::kArrayType);
+  array->add_writer(value, cass::rapidjson::kArrayType);
   return CASS_OK;
 }
 
@@ -610,13 +610,13 @@ const DseGraphResult* dse_graph_resultset_next(DseGraphResultSet* resultset) {
 
 DseGraphResultType dse_graph_result_type(const DseGraphResult* result) {
   switch (result->GetType()) {
-    case rapidjson::kNullType: return DSE_GRAPH_RESULT_TYPE_NULL;
-    case rapidjson::kFalseType: // Intentional fallthrough
-    case rapidjson::kTrueType: return DSE_GRAPH_RESULT_TYPE_BOOL;
-    case rapidjson::kNumberType: return DSE_GRAPH_RESULT_TYPE_NUMBER;
-    case rapidjson::kStringType: return DSE_GRAPH_RESULT_TYPE_STRING;
-    case rapidjson::kObjectType: return DSE_GRAPH_RESULT_TYPE_OBJECT;
-    case rapidjson::kArrayType: return DSE_GRAPH_RESULT_TYPE_ARRAY;
+    case cass::rapidjson::kNullType: return DSE_GRAPH_RESULT_TYPE_NULL;
+    case cass::rapidjson::kFalseType: // Intentional fallthrough
+    case cass::rapidjson::kTrueType: return DSE_GRAPH_RESULT_TYPE_BOOL;
+    case cass::rapidjson::kNumberType: return DSE_GRAPH_RESULT_TYPE_NUMBER;
+    case cass::rapidjson::kStringType: return DSE_GRAPH_RESULT_TYPE_STRING;
+    case cass::rapidjson::kObjectType: return DSE_GRAPH_RESULT_TYPE_OBJECT;
+    case cass::rapidjson::kArrayType: return DSE_GRAPH_RESULT_TYPE_ARRAY;
   }
 
   // Path should never be executed

src/graph.hpp

@@ -124,11 +124,11 @@ class GraphWriter : private cass::json::Writer<cass::json::StringBuffer> {
   void add_double(cass_double_t value) { Double(value); }
 
   void add_string(const char* string, size_t length) {
-    String(string, static_cast<rapidjson::SizeType>(length));
+    String(string, static_cast<cass::rapidjson::SizeType>(length));
   }
 
   void add_key(const char* key, size_t length) {
-    Key(key, static_cast<rapidjson::SizeType>(length));
+    Key(key, static_cast<cass::rapidjson::SizeType>(length));
   }
 
   void add_point(cass_double_t x, cass_double_t y);
@@ -141,7 +141,7 @@ class GraphWriter : private cass::json::Writer<cass::json::StringBuffer> {
     String(polygon->to_wkt().c_str());
   }
 
-  void add_writer(const GraphWriter* writer, rapidjson::Type type) {
+  void add_writer(const GraphWriter* writer, cass::rapidjson::Type type) {
     size_t length = writer->buffer_.GetSize();
     Prefix(type);
     memcpy(os_->Push(length), writer->buffer_.GetString(), length);