order_preserving_policy -> ordered_policy

Author: danielaparker

doc/ref/corelib/basic_json.md

@@ -13,9 +13,9 @@ namespace pmr {
     template <typename CharT,typename Policy>
     using basic_json = jsoncons::basic_json<CharT, Policy, std::pmr::polymorphic_allocator<char>>;
     using json = basic_json<char,sorted_policy>;                                                     (since 0.171.0)
-    using wjson = basic_json<wchar_t,sorted_policy>;
-    using ojson = basic_json<char, order_preserving_policy>;
-    using wojson = basic_json<wchar_t, order_preserving_policy>;
+    using wjson = basic_json<wchar_t, sorted_policy>;
+    using ojson = basic_json<char, ordered_policy>;
+    using wojson = basic_json<wchar_t, ordered_policy>;                                              
 }
 ```
 
@@ -44,13 +44,13 @@ Several aliases for common character types and policies for ordering an object's
 Type                |Definition
 --------------------|------------------------------
 [jsoncons::json](json.md)     |`jsoncons::basic_json<char,jsoncons::sorted_policy,std::allocator<char>>`
-[jsoncons::ojson](ojson.md)   |`jsoncons::basic_json<char,jsoncons::order_preserving_policy,std::allocator<char>>`
+[jsoncons::ojson](ojson.md)   |`jsoncons::basic_json<char,jsoncons::ordered_policy,std::allocator<char>>`
 [jsoncons::wjson](wjson.md)   |`jsoncons::basic_json<wchar_t,jsoncons::jsoncons::sorted_policy,std::allocator<char>>`
-[jsoncons::wojson](wojson.md) |`jsoncons::basic_json<wchar_t,jsoncons::order_preserving_policy,std::allocator<char>>`
+[jsoncons::wojson](wojson.md) |`jsoncons::basic_json<wchar_t,jsoncons::ordered_policy,std::allocator<char>>`
 `jsoncons::pmr::json` (0.171.0) |`jsoncons::pmr::basic_json<char,jsoncons::sorted_policy>`
-`jsoncons::pmr::ojson` (0.171.0) |`jsoncons::pmr::basic_json<char,jsoncons::order_preserving_policy>`
+`jsoncons::pmr::ojson` (0.171.0) |`jsoncons::pmr::basic_json<char,jsoncons::ordered_policy>`
 `jsoncons::pmr::wjson` (0.171.0) |`jsoncons::pmr::basic_json<wchar_t,jsoncons::sorted_policy>`
-`jsoncons::pmr::wojson` (0.171.0) |`jsoncons::pmr::basic_json<wchar_t,jsoncons::order_preserving_policy>`
+`jsoncons::pmr::wojson` (0.171.0) |`jsoncons::pmr::basic_json<wchar_t,jsoncons::ordered_policy>`
 
 #### Template parameters
 

doc/ref/corelib/ojson.md

@@ -4,7 +4,7 @@
 #include <jsoncons/json.hpp>
 
 typedef basic_json<char,
-                   Policy = order_preserving_policy,
+                   Policy = ordered_policy,
                    Allocator = std::allocator<char>> ojson
 ```
 The `ojson` class is an instantiation of the [basic_json](basic_json.md) class template that uses `char` as the character type. The original insertion order of an object's name/value pairs is preserved. 

doc/ref/corelib/wojson.md

@@ -4,7 +4,7 @@
 #include <jsoncons/json.hpp>
 
 typedef basic_json<wchar_t,
-                   Policy = order_preserving_policy,
+                   Policy = ordered_policy, 
                    Allocator = std::allocator<wchar_t>> wojson
 ```
 The `wojson` class is an instantiation of the [basic_json](basic_json.md) class template that uses `wchar_t` as the character type. The original insertion order of an object's name/value pairs is preserved. 

include/jsoncons/basic_json.hpp

@@ -269,7 +269,7 @@ namespace jsoncons {
         using member_key = std::basic_string<CharT, CharTraits, Allocator>;
     };
 
-    struct order_preserving_policy
+    struct ordered_policy
     {
         template <typename KeyT,typename Json>
         using object = ordered_json_object<KeyT,Json,std::vector>;
@@ -281,6 +281,11 @@ namespace jsoncons {
         using member_key = std::basic_string<CharT, CharTraits, Allocator>;
     };
 
+
+#if !defined(JSONCONS_NO_DEPRECATED)
+    using order_preserving_policy = ordered_policy;
+#endif
+
     template <typename Policy,typename KeyT,typename Json,typename Enable=void>
     struct object_iterator_typedefs
     {
@@ -5154,8 +5159,8 @@ namespace jsoncons {
 
     using json = basic_json<char,sorted_policy,std::allocator<char>>;
     using wjson = basic_json<wchar_t,sorted_policy,std::allocator<char>>;
-    using ojson = basic_json<char, order_preserving_policy, std::allocator<char>>;
-    using wojson = basic_json<wchar_t, order_preserving_policy, std::allocator<char>>;
+    using ojson = basic_json<char, ordered_policy, std::allocator<char>>;
+    using wojson = basic_json<wchar_t, ordered_policy, std::allocator<char>>;
 
     inline namespace literals {
 
@@ -5191,8 +5196,8 @@ namespace jsoncons {
         using basic_json = jsoncons::basic_json<CharT, Policy, std::pmr::polymorphic_allocator<char>>;
         using json = basic_json<char,sorted_policy>;
         using wjson = basic_json<wchar_t,sorted_policy>;
-        using ojson = basic_json<char, order_preserving_policy>;
-        using wojson = basic_json<wchar_t, order_preserving_policy>;
+        using ojson = basic_json<char, ordered_policy>;
+        using wojson = basic_json<wchar_t, ordered_policy>;
     } // namespace pmr
     #endif
 

include/jsoncons/reflect/encode_traits.hpp

@@ -39,7 +39,7 @@ struct encode_traits
         const T& val, 
         basic_json_visitor<CharT>& encoder)
     {
-        auto j = json_conv_traits<basic_json<CharT,order_preserving_policy,TempAlloc>,T>::to_json(
+        auto j = json_conv_traits<basic_json<CharT,ordered_policy,TempAlloc>,T>::to_json(
             make_alloc_set(aset.get_temp_allocator(), aset.get_temp_allocator()), val);
         return j.try_dump(encoder);
     }

test/corelib/src/json_constructor_tests.cpp

@@ -214,7 +214,7 @@ TEST_CASE("json constructor with scoped_allocator")
 {
     using cust_allocator = std::scoped_allocator_adaptor<mock_stateful_allocator<char>>;
     using cust_json = basic_json<char,sorted_policy,cust_allocator>;
-    //using cust_ojson = basic_json<char,order_preserving_policy,cust_allocator>;
+    //using cust_ojson = basic_json<char,ordered_policy,cust_allocator>;
 
     cust_allocator alloc1(1);
     cust_allocator alloc2(2);

test/corelib/src/ojson_object_tests.cpp

@@ -446,9 +446,9 @@ TEST_CASE("test_ojson_merge_or_update_move")
 template <typename T>
 using MyScopedAllocator = std::scoped_allocator_adaptor<mock_stateful_allocator<T>>;
 
-using cust_json = jsoncons::basic_json<char, jsoncons::order_preserving_policy, MyScopedAllocator<char>>;
+using cust_json = jsoncons::basic_json<char, jsoncons::ordered_policy, MyScopedAllocator<char>>;
 
-TEST_CASE("cust_json.merge test with order_preserving_policy and statefule allocator")
+TEST_CASE("cust_json.merge test with ordered_policy and statefule allocator")
 {
     MyScopedAllocator<char> alloc(1);