json_conv_traits -> json_traits

Author: danielaparker

doc/ref/corelib/reflect.md

@@ -9,21 +9,21 @@ See [Eigen::Matrix example](json_type_traits/Eigen-Matrix-example.md) for an exa
 
 Note that in typical cases traits can be generated by the convenience macros described below.
 
-### jsoncons::reflect::json_conv_traits
+### jsoncons::reflect::json_traits
 
-jsoncons 1.4.0 introduces new trait definitions, [json_conv_traits](reflect/json_conv_traits.md), that support
+jsoncons 1.4.0 introduces new trait definitions, [json_traits](reflect/json_traits.md), that support
 non-throwing conversions and [uses-allocator construction](https://en.cppreference.com/w/cpp/memory/uses_allocator.html). 
 
-See [Eigen::Matrix example](reflect/Eigen-Matrix-example.md) for an example of specializing `json_conv_traits` for an [Eigen matrix class](https://eigen.tuxfamily.org/dox-devel/group__TutorialMatrixClass.html).
+See [Eigen::Matrix example](reflect/Eigen-Matrix-example.md) for an example of specializing `json_traits` for an [Eigen matrix class](https://eigen.tuxfamily.org/dox-devel/group__TutorialMatrixClass.html).
 
-See [User-allocator construction example](reflect/uses-allocator-construction-example.md) for an example that illustrates uses-allocator construction for types with `json_conv_traits` defined. 
+See [User-allocator construction example](reflect/uses-allocator-construction-example.md) for an example that illustrates uses-allocator construction for types with `json_traits` defined. 
 
-For backwards compatability, `json_conv_traits` defaults to `json_type_traits` if a type conversion is undefined.  
+For backwards compatability, `json_traits` defaults to `json_type_traits` if a type conversion is undefined.  
 
 ### Convenience macros
 
 jsoncons includes some [convenience macros](reflect/reflect-traits-gen.md) for generating reflection traits classes.
 Until 1.4.0, these macros generated [json_type_traits](json_type_traits/json_type_traits.md) class templates. Since 1.4.0, they
-generate [json_conv_traits](reflect/json_conv_traits.md) class templates, as well as some additional traits that support streaming.
+generate [json_traits](reflect/json_traits.md) class templates, as well as some additional traits that support streaming.
 
 

doc/ref/corelib/reflect/Eigen-Matrix-example.md

@@ -1,7 +1,7 @@
 ### Eigen::Matrix examples
 
-This example shows how to specialize [json_conv_traits](json_conv_traits.md) for an  [Eigen matrix class](https://eigen.tuxfamily.org/dox-devel/group__TutorialMatrixClass.html).
-It defines separate `json_conv_traits` class templates for the dynamic and fixed sized row/column cases.
+This example shows how to specialize [json_traits](json_traits.md) for an  [Eigen matrix class](https://eigen.tuxfamily.org/dox-devel/group__TutorialMatrixClass.html).
+It defines separate `json_traits` class templates for the dynamic and fixed sized row/column cases.
 
 ```cpp
 #include <jsoncons/json.hpp>
@@ -15,7 +15,7 @@ namespace reflect {
 // fixed sized row/columns
 
 template <typename Json, typename Scalar, std::size_t RowsAtCompileTime, std::size_t ColsAtCompileTime>
-struct json_conv_traits<Json, Eigen::Matrix<Scalar, RowsAtCompileTime, ColsAtCompileTime>>
+struct json_traits<Json, Eigen::Matrix<Scalar, RowsAtCompileTime, ColsAtCompileTime>>
 {
     using allocator_type = typename Json::allocator_type;
     using matrix_type = Eigen::Matrix<Scalar, RowsAtCompileTime, ColsAtCompileTime>;
@@ -91,7 +91,7 @@ struct json_conv_traits<Json, Eigen::Matrix<Scalar, RowsAtCompileTime, ColsAtCom
 // dynamic sized row/columns
 
 template <typename Json, typename Scalar>
-struct json_conv_traits<Json, Eigen::Matrix<Scalar, Eigen::Dynamic, Eigen::Dynamic>>
+struct json_traits<Json, Eigen::Matrix<Scalar, Eigen::Dynamic, Eigen::Dynamic>>
 {
     using allocator_type = typename Json::allocator_type;
     using matrix_type = Eigen::Matrix<Scalar, Eigen::Dynamic, Eigen::Dynamic>;