json_merge_patch -> mergepatch

Author: danielaparker

CHANGELOG.md

@@ -10,8 +10,9 @@ Changes:
 
 - For consistency with library naming conventions, the directory 
 `include/jsoncons/json_merge_patch` has been renamed to
-`include/jsoncons/mergepatch`, and the namespace `json_merge_patch`
-has been renamed to `mergepatch`.
+`include/jsoncons/mergepatch`, the namespace `json_merge_patch`
+to `mergepatch`, and the include file `json_merge_patch.hpp` to 
+`mergepatch.hpp`.
 
 0.168.7
 -------

doc/ref/mergepatch/apply_merge_patch.md

@@ -1,7 +1,7 @@
 ### jsoncons::mergepatch::apply_merge_patch
 
 ```c++
-#include <jsoncons_ext/mergepatch/json_merge_patch.hpp>
+#include <jsoncons_ext/mergepatch/mergepatch.hpp>
 
 template <class Json>
 void apply_merge_patch(Json& target, const Json& patch); 
@@ -25,7 +25,7 @@ This example is from [RFC 7386](https://datatracker.ietf.org/doc/html/rfc7386#se
 
 ```c++
 #include <jsoncons/json.hpp>
-#include <jsoncons_ext/mergepatch/json_merge_patch.hpp>
+#include <jsoncons_ext/mergepatch/mergepatch.hpp>
 
 using jsoncons::json;
 namespace mergepatch = jsoncons::mergepatch;

doc/ref/mergepatch/from_diff.md

@@ -1,7 +1,7 @@
 ### jsoncons::mergepatch::from_diff
 
 ```c++
-#include <jsoncons_ext/mergepatch/json_merge_patch.hpp>
+#include <jsoncons_ext/mergepatch/mergepatch.hpp>
 
 template <class Json>
 Json from_diff(const Json& source, const Json& target)
@@ -21,7 +21,7 @@ This example is from [RFC 7386](https://datatracker.ietf.org/doc/html/rfc7386#se
 
 ```c++
 #include <jsoncons/json.hpp>
-#include <jsoncons_ext/mergepatch/json_merge_patch.hpp>
+#include <jsoncons_ext/mergepatch/mergepatch.hpp>
 
 using jsoncons::json;
 namespace mergepatch = jsoncons::mergepatch;

doc/ref/mergepatch/json_merge_patch.md

@@ -19,7 +19,7 @@ This example is from [RFC 7386](https://datatracker.ietf.org/doc/html/rfc7386#se
 
 ```c++
 #include <jsoncons/json.hpp>
-#include <jsoncons_ext/mergepatch/json_merge_patch.hpp>
+#include <jsoncons_ext/mergepatch/mergepatch.hpp>
 
 using jsoncons::json;
 namespace mergepatch = jsoncons::mergepatch;

include/jsoncons_ext/mergepatch/json_merge_patch.hpp renamed to include/jsoncons_ext/mergepatch/mergepatch.hpp

@@ -82,7 +82,7 @@ add_executable(unit_tests
                fuzz_regression/src/fuzz_regression_tests.cpp
                jmespath/src/jmespath_expression_tests.cpp
                jmespath/src/jmespath_tests.cpp
-               mergepatch/src/json_merge_patch_test_suite.cpp
+               mergepatch/src/mergepatch_test_suite.cpp
                jsonpatch/src/jsonpatch_test_suite.cpp
                jsonpatch/src/jsonpatch_tests.cpp
                jsonpath/src/jsonpath_flatten_tests.cpp

test/CMakeLists.txt

@@ -6,7 +6,7 @@
 #endif
 #include <iostream>
 #include <jsoncons/json.hpp>
-#include <jsoncons_ext/mergepatch/json_merge_patch.hpp>
+#include <jsoncons_ext/mergepatch/mergepatch.hpp>
 #include <catch/catch.hpp>
 #include <iostream>
 #include <sstream>