json_reader -> json_string_reader and json_stream_reader

danielaparker · May 28, 2021 · 13db9f4 · 13db9f4
1 parent 9eb5869
commit 13db9f4
Show file tree

Hide file tree

Showing 6 changed files with 324 additions and 307 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,5 @@
-master
-------
+0.164.0
+-------
 
 Changes to jsonpath:
 
@@ -26,6 +26,20 @@ Enhancements to jsonpath:
 
 - User provided custom functions are now supported
 
+Changes to json_reader and csv_reader:
+
+- The typedefs `json_reader` and `wjson_reader` have been deprecated,
+but for backwards compatibility they are still supported.  They 
+have been replaced by `json_string_reader` and `wjson_string_reader`
+for string sources, and `json_stream_reader` and `wjson_stream_reader`,
+for stream sources. 
+
+- The typedefs `csv_reader` and `wcsv_reader` have been deprecated,
+but for backwards compatibility they are still supported.  They 
+have been replaced by `csv_string_reader` and `wcsv_string_reader`
+for string sources, and `csv_stream_reader` and `wcsv_stream_reader`,
+for stream sources. 
+
 0.163.3
 --------
 

diff --git a/doc/ref/basic_json_reader.md b/doc/ref/basic_json_reader.md
@@ -21,12 +21,12 @@ A number of specializations for common character types are defined:
 
 Type                       |Definition
 ---------------------------|------------------------------
-`json_string_reader`         |`basic_json_reader<char,string_source<char>>`       (since 0.164.4)
-`wjson_string_reader`        |`basic_json_reader<wchar_t,string_source<wchar_t>>` (since 0.164.4)
-`json_stream_reader`         |`basic_json_reader<char,stream_source<char>>`       (since 0.164.4)
-`wjson_stream_reader`        |`basic_json_reader<wchar_t,stream_source<wchar_t>>` (since 0.164.4)
-`json_reader`                |Constructible from either a string or stream                (deprecated since 0.164.4)
-`wjson_reader`               |Constructible from either a wide character string or stream (deprecated since 0.164.4)
+`json_string_reader`         |`basic_json_reader<char,string_source<char>>`       (since 0.164.0)
+`wjson_string_reader`        |`basic_json_reader<wchar_t,string_source<wchar_t>>` (since 0.164.0)
+`json_stream_reader`         |`basic_json_reader<char,stream_source<char>>`       (since 0.164.0)
+`wjson_stream_reader`        |`basic_json_reader<wchar_t,stream_source<wchar_t>>` (since 0.164.0)
+`json_reader`                |Constructible from either a string or stream                (deprecated since 0.164.0)
+`wjson_reader`               |Constructible from either a wide character string or stream (deprecated since 0.164.0)
 
 #### Member types
 

diff --git a/doc/ref/csv/basic_csv_reader.md b/doc/ref/csv/basic_csv_reader.md
@@ -18,12 +18,12 @@ A number of specializations for common character types are defined:
 
 Type                  |Definition
 ----------------------|------------------------------
-`csv_string_reader`   |`basic_csv_string_reader<char,string_source<char>>`         (since 0.164.4)
-`wcsv_stringreader`   |`basic_csv_string_reader<wchar_t,string_source<wchar_t>>`   (since 0.164.4)
-`csv_stream_reader`   |`basic_csv_stream_reader<char,stream_source<char>>`         (since 0.164.4)
-`wcsv_stream_reader`  |`basic_csv_stream_reader<wchar_t,stream_source<wchar_t>>`   (since 0.164.4)
-`csv_reader`          |Constructible from either a string or stream                (deprecated since 0.164.4)
-`wcsv_reader`         |Constructible from either a wide character string or stream (deprecated since 0.164.4)
+`csv_string_reader`   |`basic_csv_string_reader<char,string_source<char>>`         (since 0.164.0)
+`wcsv_stringreader`   |`basic_csv_string_reader<wchar_t,string_source<wchar_t>>`   (since 0.164.0)
+`csv_stream_reader`   |`basic_csv_stream_reader<char,stream_source<char>>`         (since 0.164.0)
+`wcsv_stream_reader`  |`basic_csv_stream_reader<wchar_t,stream_source<wchar_t>>`   (since 0.164.0)
+`csv_reader`          |Constructible from either a string or stream                (deprecated since 0.164.0)
+`wcsv_reader`         |Constructible from either a wide character string or stream (deprecated since 0.164.0)
 
 #### Member types
 

diff --git a/include/jsoncons/config/version.hpp b/include/jsoncons/config/version.hpp
@@ -10,8 +10,8 @@
 #include <iostream>
 
 #define JSONCONS_VERSION_MAJOR 0
-#define JSONCONS_VERSION_MINOR 163
-#define JSONCONS_VERSION_PATCH 3
+#define JSONCONS_VERSION_MINOR 164
+#define JSONCONS_VERSION_PATCH 0
 
 namespace jsoncons {
 

diff --git a/include/jsoncons/json_reader.hpp b/include/jsoncons/json_reader.hpp
@@ -751,9 +751,10 @@ namespace jsoncons {
 
     };
 
+#if !defined(JSONCONS_NO_DEPRECATED)
     using json_reader = legacy_basic_json_reader<char>;
     using wjson_reader = legacy_basic_json_reader<wchar_t>;
-
+#endif
     using json_string_reader = basic_json_reader<char,string_source<char>>;
     using wjson_string_reader = basic_json_reader<wchar_t,string_source<wchar_t>>;
     using json_stream_reader = basic_json_reader<char,stream_source<char>>;