heap namespace

Author: danielaparker

include/jsoncons/basic_json.hpp

@@ -613,7 +613,7 @@ namespace jsoncons {
         // long_string_storage
         struct long_string_storage
         {
-            using heap_string_factory_type = jsoncons::heap_string_factory<char_type,null_type,Allocator>;
+            using heap_string_factory_type = jsoncons::heap::heap_string_factory<char_type,null_type,Allocator>;
             using pointer = typename heap_string_factory_type::pointer;
 
             uint8_t storage_kind_:4;
@@ -662,7 +662,7 @@ namespace jsoncons {
         // byte_string_storage
         struct byte_string_storage 
         {
-            using heap_string_factory_type = jsoncons::heap_string_factory<uint8_t,uint64_t,Allocator>;
+            using heap_string_factory_type = jsoncons::heap::heap_string_factory<uint8_t,uint64_t,Allocator>;
             using pointer = typename heap_string_factory_type::pointer;
 
             uint8_t storage_kind_:4;
@@ -927,14 +927,14 @@ namespace jsoncons {
 
         typename long_string_storage::pointer create_long_string(const allocator_type& alloc, const char_type* data, std::size_t length)
         {
-            using heap_string_factory_type = jsoncons::heap_string_factory<char_type,null_type,Allocator>;
+            using heap_string_factory_type = jsoncons::heap::heap_string_factory<char_type,null_type,Allocator>;
             return heap_string_factory_type::create(data, length, null_type(), alloc); 
         }
 
         typename byte_string_storage::pointer create_byte_string(const allocator_type& alloc, const uint8_t* data, std::size_t length,
             uint64_t ext_tag)
         {
-            using heap_string_factory_type = jsoncons::heap_string_factory<uint8_t,uint64_t,Allocator>;
+            using heap_string_factory_type = jsoncons::heap::heap_string_factory<uint8_t,uint64_t,Allocator>;
             return heap_string_factory_type::create(data, length, ext_tag, alloc); 
         }
 

include/jsoncons/utility/heap_string.hpp

@@ -16,6 +16,7 @@
 #include <jsoncons/utility/more_type_traits.hpp>
 
 namespace jsoncons {
+namespace heap {
 
 inline char*
 align_up(char* ptr, std::size_t alignment) noexcept
@@ -181,6 +182,7 @@ class heap_string_factory
     }
 };
 
+} // namespace heap
 } // namespace jsoncons
 
 #endif // JSONCONS_UTILITY_HEAP_STRING_HPP

test/corelib/src/utility/heap_string_tests.cpp

@@ -15,7 +15,7 @@ using namespace jsoncons;
 
 TEST_CASE("heap_string test")
 {
-    using heap_string_factory_type = jsoncons::heap_string_factory<char, null_type, std::allocator<char>>;
+    using heap_string_factory_type = jsoncons::heap::heap_string_factory<char, null_type, std::allocator<char>>;
     using pointer = typename heap_string_factory_type::pointer;
 
     std::string s("Hello World");
@@ -63,7 +63,7 @@ class checked_resource : public std::pmr::memory_resource
 
 TEST_CASE("heap_string with polymorphic allocator test")
 {
-    using heap_string_factory_type = jsoncons::heap_string_factory<char, null_type, std::pmr::polymorphic_allocator<char>>;
+    using heap_string_factory_type = jsoncons::heap::heap_string_factory<char, null_type, std::pmr::polymorphic_allocator<char>>;
     using pointer = typename heap_string_factory_type::pointer;
 
     char buffer[1024] = {}; // a small buffer on the stack