tidy includes

danielaparker · Jan 7, 2025 · ab10bca · ab10bca
1 parent 2b12b37
commit ab10bca
Show file tree

Hide file tree

Showing 33 changed files with 57 additions and 36 deletions.
diff --git a/include/jsoncons/byte_string.hpp b/include/jsoncons/byte_string.hpp
@@ -16,6 +16,7 @@
 #include <memory> // std::allocator
 #include <ostream>
 #include <sstream>
+#include <type_traits>
 #include <utility> // std::move
 #include <vector>
 

diff --git a/include/jsoncons/conv_error.hpp b/include/jsoncons/conv_error.hpp
@@ -10,6 +10,7 @@
 #include <cstddef>
 #include <string>
 #include <system_error>
+#include <type_traits>
 
 #include <jsoncons/config/jsoncons_config.hpp>
 #include <jsoncons/json_exception.hpp>

diff --git a/include/jsoncons/detail/write_number.hpp b/include/jsoncons/detail/write_number.hpp
@@ -15,6 +15,7 @@
 #include <stdexcept>
 #include <stdio.h> // snprintf
 #include <string>
+#include <type_traits>
 
 #include <jsoncons/config/jsoncons_config.hpp>
 #include <jsoncons/detail/grisu3.hpp>

diff --git a/include/jsoncons/json_error.hpp b/include/jsoncons/json_error.hpp
@@ -9,6 +9,7 @@
 
 #include <string>
 #include <system_error>
+#include <type_traits>
 
 #include <jsoncons/config/jsoncons_config.hpp>
 

diff --git a/include/jsoncons/json_exception.hpp b/include/jsoncons/json_exception.hpp
@@ -4,8 +4,8 @@
 
 // See https://github.com/danielaparker/jsoncons for latest version
 
-#ifndef JSON_EXCEPTION_HPP
-#define JSON_EXCEPTION_HPP
+#ifndef JSONCONS_JSON_EXCEPTION_HPP
+#define JSONCONS_JSON_EXCEPTION_HPP
 
 #include <cstddef>
 #include <exception>
@@ -220,4 +220,4 @@ namespace jsoncons {
 
 } // namespace jsoncons
 
-#endif // JSON_EXCEPTION_HPP
+#endif // JSONCONS_JSON_EXCEPTION_HPP
diff --git a/include/jsoncons/json_options.hpp b/include/jsoncons/json_options.hpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <system_error>
 
+#include <jsoncons/config/compiler_support.hpp>
 #include <jsoncons/json_error.hpp>
 #include <jsoncons/ser_context.hpp>
 

diff --git a/include/jsoncons/json_parser.hpp b/include/jsoncons/json_parser.hpp
@@ -17,6 +17,7 @@
 #include <unordered_map>
 #include <vector>
 
+#include <jsoncons/config/compiler_support.hpp>
 #include <jsoncons/chunk_reader.hpp>
 #include <jsoncons/detail/parse_number.hpp>
 #include <jsoncons/json_error.hpp>

diff --git a/include/jsoncons/json_reader.hpp b/include/jsoncons/json_reader.hpp
@@ -8,12 +8,14 @@
 #define JSONCONS_JSON_READER_HPP
 
 #include <cstddef>
+#include <functional>
 #include <ios>
 #include <memory> // std::allocator
 #include <string>
 #include <system_error>
 #include <utility> // std::move
 
+#include <jsoncons/config/compiler_support.hpp>
 #include <jsoncons/json_exception.hpp>
 #include <jsoncons/json_parser.hpp>
 #include <jsoncons/json_visitor.hpp>

diff --git a/include/jsoncons/utility/unicode_traits.hpp b/include/jsoncons/utility/unicode_traits.hpp
@@ -25,6 +25,7 @@
 #include <type_traits>
 
 #include <jsoncons/config/compiler_support.hpp>
+#include <jsoncons/config/jsoncons_config.hpp>
 #include <jsoncons/utility/extension_traits.hpp>
 
 namespace jsoncons { namespace unicode_traits {

diff --git a/include/jsoncons/utility/uri.hpp b/include/jsoncons/utility/uri.hpp
@@ -13,6 +13,7 @@
 #include <iostream>
 #include <string> // std::string
 #include <system_error>
+#include <type_traits>
 #include <utility>
 
 #include <jsoncons/config/jsoncons_config.hpp>

diff --git a/include/jsoncons_ext/bson/bson_error.hpp b/include/jsoncons_ext/bson/bson_error.hpp
@@ -9,6 +9,7 @@
 
 #include <string>
 #include <system_error>
+#include <type_traits>
 
 #include <jsoncons/config/jsoncons_config.hpp>
 

diff --git a/include/jsoncons_ext/cbor/cbor_encoder.hpp b/include/jsoncons_ext/cbor/cbor_encoder.hpp
@@ -9,10 +9,12 @@
 
 #include <cstddef>
 #include <cstdint>
+#include <cstring>
 #include <limits> // std::numeric_limits
 #include <memory>
 #include <string>
 #include <system_error>
+#include <type_traits>
 #include <utility> // std::move
 #include <vector>
 

diff --git a/include/jsoncons_ext/cbor/cbor_reader.hpp b/include/jsoncons_ext/cbor/cbor_reader.hpp
@@ -4,8 +4,8 @@
 
 // See https://github.com/danielaparker/jsoncons for latest version
 
-#ifndef JSONCONS_EXT_CBOR_CBOR_READER_HPP
-#define JSONCONS_EXT_CBOR_CBOR_READER_HPP
+#ifndef JSONCONS_EXT_CBOR_CBOR_EVENT_READER_HPP
+#define JSONCONS_EXT_CBOR_CBOR_EVENT_READER_HPP
 
 #include <cstddef>
 #include <memory>
@@ -111,4 +111,4 @@ using cbor_bytes_reader = basic_cbor_reader<jsoncons::bytes_source>;
 } // namespace cbor_reader
 } // namespace jsoncons
 
-#endif
+#endif // JSONCONS_EXT_CBOR_CBOR_EVENT_READER_HPP
diff --git a/include/jsoncons_ext/csv/csv_error.hpp b/include/jsoncons_ext/csv/csv_error.hpp
@@ -9,6 +9,7 @@
 
 #include <string>
 #include <system_error>
+#include <type_traits>
 
 namespace jsoncons { namespace csv {
 

diff --git a/include/jsoncons_ext/csv/csv_parser.hpp b/include/jsoncons_ext/csv/csv_parser.hpp
@@ -16,6 +16,8 @@
 #include <system_error>
 #include <vector>
 
+#include <jsoncons/config/compiler_support.hpp>
+#include <jsoncons/config/jsoncons_config.hpp>
 #include <jsoncons/chunk_reader.hpp>
 #include <jsoncons/detail/parse_number.hpp>
 #include <jsoncons/json_exception.hpp>

diff --git a/include/jsoncons_ext/jmespath/jmespath_error.hpp b/include/jsoncons_ext/jmespath/jmespath_error.hpp
@@ -10,6 +10,7 @@
 #include <cstddef>
 #include <string>
 #include <system_error>
+#include <type_traits>
 
 #include <jsoncons/json_exception.hpp>
 

diff --git a/include/jsoncons_ext/jsonpatch/jsonpatch.hpp b/include/jsoncons_ext/jsonpatch/jsonpatch.hpp
@@ -11,6 +11,7 @@
 #include <cstddef>
 #include <string>
 #include <system_error>
+#include <type_traits>
 #include <utility> // std::move
 #include <vector> 
 

diff --git a/include/jsoncons_ext/jsonpath/expression.hpp b/include/jsoncons_ext/jsonpath/expression.hpp
@@ -12,6 +12,7 @@
 #include <set> // std::set
 #include <string> // std::basic_string
 #include <system_error>
+#include <type_traits>
 #include <unordered_map> // std::unordered_map
 #include <unordered_set> // std::unordered_set
 #include <utility> // std::move

diff --git a/include/jsoncons_ext/jsonpath/flatten.hpp b/include/jsoncons_ext/jsonpath/flatten.hpp
@@ -10,7 +10,7 @@
 #include <cstddef>
 #include <memory>
 
-#include <jsoncons/json_exception.hpp>
+#include <jsoncons/config/compiler_support.hpp>
 #include <jsoncons/json_type.hpp>
 #include <jsoncons/jsoncons_config.hpp>
 #include <jsoncons_ext/jsonpath/jsonpath_error.hpp>

diff --git a/include/jsoncons_ext/jsonpath/json_location.hpp b/include/jsoncons_ext/jsonpath/json_location.hpp
@@ -17,7 +17,6 @@
 #include <vector>
 
 #include <jsoncons/config/jsoncons_config.hpp>
-#include <jsoncons/json_exception.hpp>
 #include <jsoncons/utility/extension_traits.hpp>
 
 #include <jsoncons_ext/jsonpath/jsonpath_error.hpp>

diff --git a/include/jsoncons_ext/jsonpath/jsonpath_error.hpp b/include/jsoncons_ext/jsonpath/jsonpath_error.hpp
@@ -10,6 +10,7 @@
 #include <cstddef>
 #include <string>
 #include <system_error>
+#include <type_traits>
 
 #include <jsoncons/json_exception.hpp>
 

diff --git a/include/jsoncons_ext/jsonpath/jsonpath_expression.hpp b/include/jsoncons_ext/jsonpath/jsonpath_expression.hpp
@@ -4,8 +4,8 @@
 
 // See https://github.com/danielaparker/jsoncons for latest version
 
-#ifndef JSONCONS_EXT_JSONPATH_JSONPATH_EXPR_HPP
-#define JSONCONS_EXT_JSONPATH_JSONPATH_EXPR_HPP
+#ifndef JSONCONS_EXT_JSONPATH_JSONPATH_EXPRESSION_HPP
+#define JSONCONS_EXT_JSONPATH_JSONPATH_EXPRESSION_HPP
 
 #include <algorithm> // std::reverse
 #include <cstddef>
@@ -257,4 +257,4 @@ namespace jsonpath {
 } // namespace jsonpath
 } // namespace jsoncons
 
-#endif // JSONCONS_EXT_JSONPATH_JSONPATH_EXPR_HPP
+#endif // JSONCONS_EXT_JSONPATH_JSONPATH_EXPRESSION_HPP
diff --git a/include/jsoncons_ext/jsonpath/jsonpath_parser.hpp b/include/jsoncons_ext/jsonpath/jsonpath_parser.hpp
@@ -4,8 +4,8 @@
 
 // See https://github.com/danielaparker/jsoncons for latest version
 
-#ifndef JSONCONS_EXT_JSONPATH_JSONPATH_EXPRESSION_HPP
-#define JSONCONS_EXT_JSONPATH_JSONPATH_EXPRESSION_HPP
+#ifndef JSONCONS_EXT_JSONPATH_JSONPATH_PARSER_HPP
+#define JSONCONS_EXT_JSONPATH_JSONPATH_PARSER_HPP
 
 #include <algorithm> // std::reverse
 #include <cstddef>
@@ -20,7 +20,6 @@
 #include <jsoncons/json_parser.hpp>
 #include <jsoncons/tag_type.hpp>
 
-#include <jsoncons/json_exception.hpp>
 #include <jsoncons_ext/jsonpath/expression.hpp>
 #include <jsoncons_ext/jsonpath/jsonpath_error.hpp>
 #include <jsoncons_ext/jsonpath/jsonpath_selector.hpp>
@@ -2490,4 +2489,4 @@ namespace detail {
 } // namespace jsonpath
 } // namespace jsoncons
 
-#endif // JSONCONS_EXT_JSONPATH_JSONPATH_EXPRESSION_HPP
+#endif // JSONCONS_EXT_JSONPATH_JSONPATH_PARSER_HPP
diff --git a/include/jsoncons_ext/jsonpath/jsonpath_utilities.hpp b/include/jsoncons_ext/jsonpath/jsonpath_utilities.hpp
@@ -4,8 +4,8 @@
 
 // See https://github.com/danielaparker/jsoncons for latest version
 
-#ifndef JSONCONS_EXT_JSONPATH_UTILITIES_HPP
-#define JSONCONS_EXT_JSONPATH_UTILITIES_HPP
+#ifndef JSONCONS_EXT_JSONPATH_JSONPATH_UTILITIES_HPP
+#define JSONCONS_EXT_JSONPATH_JSONPATH_UTILITIES_HPP
 
 #include <cstddef>
 
@@ -69,4 +69,4 @@ namespace jsoncons { namespace jsonpath {
 } // namespace jsonpath
 } // namespace jsoncons
 
-#endif // JSONCONS_EXT_JSONPATH_UTILITIES_HPP
+#endif // JSONCONS_EXT_JSONPATH_JSONPATH_UTILITIES_HPP
diff --git a/include/jsoncons_ext/jsonpointer/jsonpointer_error.hpp b/include/jsoncons_ext/jsonpointer/jsonpointer_error.hpp
@@ -9,6 +9,7 @@
 
 #include <string>
 #include <system_error>
+#include <type_traits>
 
 #include <jsoncons/json_exception.hpp>
 

diff --git a/include/jsoncons_ext/jsonschema/common/uri_wrapper.hpp b/include/jsoncons_ext/jsonschema/common/uri_wrapper.hpp
@@ -4,8 +4,8 @@
 
 // See https://github.com/danielaparker/jsoncons for latest version
 
-#ifndef JSONCONS_EXT_JSONSCHEMA_COMMON_SCHEMA_IDENTIFIER_HPP
-#define JSONCONS_EXT_JSONSCHEMA_COMMON_SCHEMA_IDENTIFIER_HPP
+#ifndef JSONCONS_EXT_JSONSCHEMA_COMMON_URI_WRAPPER_HPP
+#define JSONCONS_EXT_JSONSCHEMA_COMMON_URI_WRAPPER_HPP
 
 #include <cstddef>
 #include <memory>
@@ -176,4 +176,4 @@ namespace jsonschema {
 } // namespace jsonschema
 } // namespace jsoncons
 
-#endif // JSONCONS_EXT_JSONSCHEMA_SCHEMA_LOCATION_HPP
+#endif // JSONCONS_EXT_JSONSCHEMA_COMMON_URI_WRAPPER_HPP
diff --git a/include/jsoncons_ext/jsonschema/draft201909/schema_draft201909.hpp b/include/jsoncons_ext/jsonschema/draft201909/schema_draft201909.hpp
@@ -4,8 +4,8 @@
 
 // See https://github.com/danielaparker/jsoncons for latest version
 
-#ifndef JSONCONS_EXT_JSONSCHEMA_SCHEMA_DRAFT201909_HPP
-#define JSONCONS_EXT_JSONSCHEMA_SCHEMA_DRAFT201909_HPP
+#ifndef JSONCONS_EXT_JSONSCHEMA_DRAFT201909_SCHEMA_DRAFT201909_HPP
+#define JSONCONS_EXT_JSONSCHEMA_DRAFT201909_SCHEMA_DRAFT201909_HPP
 
 namespace jsoncons {
 namespace jsonschema {
@@ -331,4 +331,4 @@ namespace draft201909 {
 } // namespace jsonschema
 } // namespace jsoncons
 
-#endif // JSONCONS_EXT_JSONSCHEMA_SCHEMA_DRAFT7_HPP
+#endif // JSONCONS_EXT_JSONSCHEMA_DRAFT201909_SCHEMA_DRAFT201909_HPP
diff --git a/include/jsoncons_ext/jsonschema/draft202012/schema_draft202012.hpp b/include/jsoncons_ext/jsonschema/draft202012/schema_draft202012.hpp
@@ -4,8 +4,8 @@
 
 // See https://github.com/danielaparker/jsoncons for latest version
 
-#ifndef JSONCONS_EXT_JSONSCHEMA_SCHEMA_202012_HPP
-#define JSONCONS_EXT_JSONSCHEMA_SCHEMA_202012_HPP
+#ifndef JSONCONS_EXT_JSONSCHEMA_DRAFT202012_SCHEMA_DRAFT202012_HPP
+#define JSONCONS_EXT_JSONSCHEMA_DRAFT202012_SCHEMA_DRAFT202012_HPP
 
 namespace jsoncons {
 namespace jsonschema {
@@ -359,4 +359,4 @@ namespace draft202012 {
 } // namespace jsonschema
 } // namespace jsoncons
 
-#endif // JSONCONS_EXT_JSONSCHEMA_SCHEMA_DRAFT7_HPP
+#endif // JSONCONS_EXT_JSONSCHEMA_DRAFT202012_SCHEMA_DRAFT202012_HPP
diff --git a/include/jsoncons_ext/jsonschema/draft4/schema_draft4.hpp b/include/jsoncons_ext/jsonschema/draft4/schema_draft4.hpp
@@ -4,8 +4,8 @@
 
 // See https://github.com/danielaparker/jsoncons for latest version
 
-#ifndef JSONCONS_EXT_JSONSCHEMA_SCHEMA_DRAFT4_HPP
-#define JSONCONS_EXT_JSONSCHEMA_SCHEMA_DRAFT4_HPP
+#ifndef JSONCONS_EXT_JSONSCHEMA_DRAFT4_SCHEMA_DRAFT4_HPP
+#define JSONCONS_EXT_JSONSCHEMA_DRAFT4_SCHEMA_DRAFT4_HPP
 
 
 namespace jsoncons {
@@ -177,4 +177,4 @@ namespace draft4 {
 } // namespace jsonschema
 } // namespace jsoncons
 
-#endif // JSONCONS_EXT_JSONSCHEMA_SCHEMA_DRAFT4_HPP
+#endif // JSONCONS_EXT_JSONSCHEMA_DRAFT4_SCHEMA_DRAFT4_HPP
diff --git a/include/jsoncons_ext/jsonschema/draft6/schema_draft6.hpp b/include/jsoncons_ext/jsonschema/draft6/schema_draft6.hpp
@@ -4,8 +4,8 @@
 
 // See https://github.com/danielaparker/jsoncons for latest version
 
-#ifndef JSONCONS_EXT_JSONSCHEMA_SCHEMA_DRAFT6_HPP
-#define JSONCONS_EXT_JSONSCHEMA_SCHEMA_DRAFT6_HPP
+#ifndef JSONCONS_EXT_JSONSCHEMA_DRAFT6_SCHEMA_DRAFT6_HPP
+#define JSONCONS_EXT_JSONSCHEMA_DRAFT6_SCHEMA_DRAFT6_HPP
 
 namespace jsoncons {
 namespace jsonschema {
@@ -180,4 +180,4 @@ namespace draft6 {
 } // namespace jsonschema
 } // namespace jsoncons
 
-#endif // JSONCONS_EXT_JSONSCHEMA_SCHEMA_DRAFT7_HPP
+#endif // JSONCONS_EXT_JSONSCHEMA_DRAFT6_SCHEMA_DRAFT6_HPP
diff --git a/include/jsoncons_ext/jsonschema/draft7/schema_draft7.hpp b/include/jsoncons_ext/jsonschema/draft7/schema_draft7.hpp
@@ -4,8 +4,8 @@
 
 // See https://github.com/danielaparker/jsoncons for latest version
 
-#ifndef JSONCONS_EXT_JSONSCHEMA_SCHEMA_DRAFT7_HPP
-#define JSONCONS_EXT_JSONSCHEMA_SCHEMA_DRAFT7_HPP
+#ifndef JSONCONS_EXT_JSONSCHEMA_DRAFT7_SCHEMA_DRAFT7_HPP
+#define JSONCONS_EXT_JSONSCHEMA_DRAFT7_SCHEMA_DRAFT7_HPP
 
 namespace jsoncons {
 namespace jsonschema {
@@ -195,4 +195,4 @@ namespace draft7 {
 } // namespace jsonschema
 } // namespace jsoncons
 
-#endif // JSONCONS_EXT_JSONSCHEMA_SCHEMA_DRAFT7_HPP
+#endif // JSONCONS_EXT_JSONSCHEMA_DRAFT7_SCHEMA_DRAFT7_HPP
diff --git a/include/jsoncons_ext/msgpack/msgpack_error.hpp b/include/jsoncons_ext/msgpack/msgpack_error.hpp
@@ -9,6 +9,7 @@
 
 #include <string>
 #include <system_error>
+#include <type_traits>
 
 #include <jsoncons/config/jsoncons_config.hpp>
 

diff --git a/include/jsoncons_ext/ubjson/ubjson_error.hpp b/include/jsoncons_ext/ubjson/ubjson_error.hpp
@@ -9,6 +9,7 @@
 
 #include <string>
 #include <system_error>
+#include <type_traits>
 
 #include <jsoncons/config/jsoncons_config.hpp>