From 4e64f4fa58c7e9503a20223df7de33a5137e39eb Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Tue, 12 Nov 2019 14:30:49 -0800 Subject: [PATCH] Refactor includes --- include/boost/json/basic_parser.hpp | 1 - include/boost/json/block_storage.hpp | 1 - include/boost/json/detail/assert.hpp | 21 --- include/boost/json/detail/buffer.hpp | 2 +- include/boost/json/detail/config.hpp | 148 +++++++++++++++++- include/boost/json/detail/exchange.hpp | 33 ---- include/boost/json/detail/inline_variable.hpp | 49 ------ include/boost/json/detail/is_specialized.hpp | 37 ----- include/boost/json/detail/make_void.hpp | 31 ---- include/boost/json/detail/number.ipp | 1 - include/boost/json/detail/raw_stack.hpp | 1 - .../boost/json/detail/ryu/detail/common.hpp | 2 +- include/boost/json/detail/ryu/detail/d2s.hpp | 2 +- .../json/detail/ryu/detail/d2s_full_table.hpp | 1 + .../json/detail/ryu/detail/d2s_intrinsics.hpp | 3 +- .../json/detail/ryu/detail/digit_table.hpp | 2 + include/boost/json/detail/ryu/impl/d2s.ipp | 1 - include/boost/json/detail/static_stack.hpp | 1 - include/boost/json/detail/string.hpp | 46 ------ include/boost/json/detail/system_error.hpp | 47 ------ include/boost/json/detail/value.hpp | 1 - include/boost/json/error.hpp | 1 - include/boost/json/impl/array.ipp | 2 - include/boost/json/impl/basic_parser.ipp | 1 - include/boost/json/impl/object.hpp | 2 - include/boost/json/impl/object.ipp | 2 - include/boost/json/impl/parser.ipp | 9 +- include/boost/json/impl/string.ipp | 1 - include/boost/json/impl/value.hpp | 1 - include/boost/json/kind.hpp | 1 - include/boost/json/object.hpp | 2 - include/boost/json/parser.hpp | 1 - include/boost/json/serializer.hpp | 1 - include/boost/json/storage_ptr.hpp | 2 - include/boost/json/string.hpp | 54 +++---- include/boost/json/value.hpp | 2 - test/number.cpp | 2 - test/object.cpp | 1 - test/ryu/d2s_test.cpp | 1 - 39 files changed, 185 insertions(+), 332 deletions(-) delete mode 100644 include/boost/json/detail/assert.hpp delete mode 100644 include/boost/json/detail/exchange.hpp delete mode 100644 include/boost/json/detail/inline_variable.hpp delete mode 100644 include/boost/json/detail/is_specialized.hpp delete mode 100644 include/boost/json/detail/make_void.hpp delete mode 100644 include/boost/json/detail/string.hpp delete mode 100644 include/boost/json/detail/system_error.hpp diff --git a/include/boost/json/basic_parser.hpp b/include/boost/json/basic_parser.hpp index 662af559..8ba6c8fb 100644 --- a/include/boost/json/basic_parser.hpp +++ b/include/boost/json/basic_parser.hpp @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include diff --git a/include/boost/json/block_storage.hpp b/include/boost/json/block_storage.hpp index e22fe141..4ce7b988 100644 --- a/include/boost/json/block_storage.hpp +++ b/include/boost/json/block_storage.hpp @@ -11,7 +11,6 @@ #define BOOST_JSON_BLOCK_STORAGE_HPP #include -#include #include #include #include diff --git a/include/boost/json/detail/assert.hpp b/include/boost/json/detail/assert.hpp deleted file mode 100644 index 90bd5235..00000000 --- a/include/boost/json/detail/assert.hpp +++ /dev/null @@ -1,21 +0,0 @@ -// -// Copyright (c) 2016-2019 Vinnie Falco (vinnie dot falco at gmail dot com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// -// Official repository: https://github.com/vinniefalco/json -// - -#ifndef BOOST_JSON_DETAIL_ASSERT_HPP -#define BOOST_JSON_DETAIL_ASSERT_HPP - -#ifndef BOOST_JSON_STANDALONE -# include -# define BOOST_JSON_ASSERT BOOST_ASSERT -#else -# include -# define BOOST_JSON_ASSERT assert -#endif - -#endif diff --git a/include/boost/json/detail/buffer.hpp b/include/boost/json/detail/buffer.hpp index eba7f278..5591c96f 100644 --- a/include/boost/json/detail/buffer.hpp +++ b/include/boost/json/detail/buffer.hpp @@ -10,7 +10,7 @@ #ifndef BOOST_JSON_DETAIL_BUFFER_HPP #define BOOST_JSON_DETAIL_BUFFER_HPP -#include +#include #include namespace boost { diff --git a/include/boost/json/detail/config.hpp b/include/boost/json/detail/config.hpp index 42a505b8..6226eb93 100644 --- a/include/boost/json/detail/config.hpp +++ b/include/boost/json/detail/config.hpp @@ -11,6 +11,16 @@ #define BOOST_JSON_DETAIL_CONFIG_HPP #include +#ifndef BOOST_JSON_STANDALONE +# include +# include +# include +# include +#else +# include +# include +# include +#endif #ifndef BOOST_JSON_STANDALONE # if defined(GENERATING_DOCUMENTATION) @@ -58,6 +68,12 @@ # define BOOST_JSON_THROW(x) do{}while(0) #endif +#ifndef BOOST_JSON_STANDALONE +# define BOOST_JSON_ASSERT BOOST_ASSERT +#else +# define BOOST_JSON_ASSERT assert +#endif + #define BOOST_JSON_STATIC_ASSERT( ... ) static_assert(__VA_ARGS__, #__VA_ARGS__) // optimizations @@ -95,7 +111,137 @@ namespace boost { namespace json { -using size_type = unsigned long; +namespace detail { + +template +struct make_void +{ + using type =void; +}; + +template +using void_t = typename + make_void::type; + +template +struct remove_const +{ + using type = T; +}; + +template +struct remove_const +{ + using type = T; +}; + +template +struct remove_reference +{ + using type = T; +}; + +template +struct remove_reference +{ + using type = T; +}; + +template +constexpr +typename remove_reference::type&& +move(T&& t) noexcept +{ + return static_cast::type&&>(t); +} + +template +inline +T +exchange(T& t, U u) noexcept +{ + T v = move(t); + t = move(u); + return v; +} + +template +using is_string_viewish = typename std::enable_if< + std::is_convertible< + T const&, string_view>::value && + ! std::is_convertible< + T const&, char const*>::value + >::type; + +/* This is a derivative work, original copyright: + + Copyright Eric Niebler 2013-present + + Use, modification and distribution is subject to the + Boost Software License, Version 1.0. (See accompanying + file LICENSE_1_0.txt or copy at + http://www.boost.org/LICENSE_1_0.txt) + + Project home: https://github.com/ericniebler/range-v3 +*/ +template +struct static_const +{ + static constexpr T value {}; +}; +template +constexpr T static_const::value; + +#define BOOST_JSON_INLINE_VARIABLE(name, type) \ + namespace \ + { \ + constexpr auto& name = \ + ::boost::json::detail::static_const::value; \ + } + +struct primary_template +{ +}; + +template +using is_specialized = + std::integral_constant::value>; + +template +using remove_cr = + typename remove_const< + typename remove_reference::type>::type; + +} // detail + +#ifndef BOOST_JSON_STANDALONE + +/// The type of string view used by the library +using string_view = boost::string_view; + +/// The type of error code used by the library +using error_code = boost::system::error_code; + +/// The type of system error thrown by the library +using system_error = boost::system::system_error; + +/// The type of error category used by the library +using error_category = boost::system::error_category; + +/// The type of error condition used by the library +using error_condition = boost::system::error_condition; + +#else + +using string_view = std::string_view; +using error_code = std::error_code; +using system_error = std::system_error; +using error_category = std::error_category; +using error_condition = std::error_condition; + +#endif } // json } // boost diff --git a/include/boost/json/detail/exchange.hpp b/include/boost/json/detail/exchange.hpp deleted file mode 100644 index ac2a246b..00000000 --- a/include/boost/json/detail/exchange.hpp +++ /dev/null @@ -1,33 +0,0 @@ -// -// Copyright (c) 2016-2019 Vinnie Falco (vinnie dot falco at gmail dot com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// -// Official repository: https://github.com/vinniefalco/json -// - -#ifndef BOOST_JSON_DETAIL_EXCHANGE_HPP -#define BOOST_JSON_DETAIL_EXCHANGE_HPP - -#include - -namespace boost { -namespace json { -namespace detail { - -template -inline -T -exchange(T& t, U u) noexcept -{ - T v = std::move(t); - t = std::move(u); - return v; -} - -} // detail -} // json -} // boost - -#endif diff --git a/include/boost/json/detail/inline_variable.hpp b/include/boost/json/detail/inline_variable.hpp deleted file mode 100644 index ba155b85..00000000 --- a/include/boost/json/detail/inline_variable.hpp +++ /dev/null @@ -1,49 +0,0 @@ -// -// Copyright (c) 2019 Vinnie Falco (vinnie dot falco at gmail dot com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// -// Official repository: https://github.com/vinniefalco/json -// - -#ifndef BOOST_JSON_DETAIL_INLINE_VARIABLE_HPP -#define BOOST_JSON_DETAIL_INLINE_VARIABLE_HPP - -/* This is a derivative work, original copyright: - - Copyright Eric Niebler 2013-present - - Use, modification and distribution is subject to the - Boost Software License, Version 1.0. (See accompanying - file LICENSE_1_0.txt or copy at - http://www.boost.org/LICENSE_1_0.txt) - - Project home: https://github.com/ericniebler/range-v3 -*/ - -namespace boost { -namespace json { -namespace detail { - -template -struct static_const -{ - static constexpr T value {}; -}; - -template -constexpr T static_const::value; - -#define BOOST_JSON_INLINE_VARIABLE(name, type) \ - namespace \ - { \ - constexpr auto& name = \ - ::boost::json::detail::static_const::value; \ - } - -} // detail -} // json -} // boost - -#endif \ No newline at end of file diff --git a/include/boost/json/detail/is_specialized.hpp b/include/boost/json/detail/is_specialized.hpp deleted file mode 100644 index 29cdbc10..00000000 --- a/include/boost/json/detail/is_specialized.hpp +++ /dev/null @@ -1,37 +0,0 @@ -// -// Copyright (c) 2018-2019 Vinnie Falco (vinnie dot falco at gmail dot com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// -// Official repository: https://github.com/vinniefalco/json -// - -#ifndef BOOST_JSON_DETAIL_IS_SPECIALIZED_HPP -#define BOOST_JSON_DETAIL_IS_SPECIALIZED_HPP - -#include - -namespace boost { -namespace json { -namespace detail { - -struct primary_template -{ -}; - -template -using is_specialized = - std::integral_constant::value>; - -template -using remove_cr = - typename std::remove_const< - typename std::remove_reference::type>::type; - -} // detail -} // json -} // boost - -#endif diff --git a/include/boost/json/detail/make_void.hpp b/include/boost/json/detail/make_void.hpp deleted file mode 100644 index f645cd53..00000000 --- a/include/boost/json/detail/make_void.hpp +++ /dev/null @@ -1,31 +0,0 @@ -// -// Copyright (c) 2016-2019 Vinnie Falco (vinnie dot falco at gmail dot com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// -// Official repository: https://github.com/vinniefalco/json -// - -#ifndef BOOST_JSON_DETAIL_MAKE_VOID_HPP -#define BOOST_JSON_DETAIL_MAKE_VOID_HPP - -namespace boost { -namespace json { -namespace detail { - -template -struct make_void -{ - using type =void; -}; - -template -using void_t = typename - make_void::type; - -} // detail -} // json -} // boost - -#endif diff --git a/include/boost/json/detail/number.ipp b/include/boost/json/detail/number.ipp index 9789df4a..2764e872 100644 --- a/include/boost/json/detail/number.ipp +++ b/include/boost/json/detail/number.ipp @@ -11,7 +11,6 @@ #define BOOST_JSON_DETAIL_NUMBER_IPP #include -#include #include namespace boost { diff --git a/include/boost/json/detail/raw_stack.hpp b/include/boost/json/detail/raw_stack.hpp index 62b503fb..579097fd 100644 --- a/include/boost/json/detail/raw_stack.hpp +++ b/include/boost/json/detail/raw_stack.hpp @@ -12,7 +12,6 @@ #include #include -#include #include #include diff --git a/include/boost/json/detail/ryu/detail/common.hpp b/include/boost/json/detail/ryu/detail/common.hpp index c7542f27..ed30deb9 100644 --- a/include/boost/json/detail/ryu/detail/common.hpp +++ b/include/boost/json/detail/ryu/detail/common.hpp @@ -22,7 +22,7 @@ #ifndef BOOST_JSON_DETAIL_RYU_DETAIL_COMMON_HPP #define BOOST_JSON_DETAIL_RYU_DETAIL_COMMON_HPP -#include +#include #include #include diff --git a/include/boost/json/detail/ryu/detail/d2s.hpp b/include/boost/json/detail/ryu/detail/d2s.hpp index 3b1e2968..fd31ab1c 100644 --- a/include/boost/json/detail/ryu/detail/d2s.hpp +++ b/include/boost/json/detail/ryu/detail/d2s.hpp @@ -22,8 +22,8 @@ #ifndef BOOST_JSON_DETAIL_RYU_DETAIL_D2S_HPP #define BOOST_JSON_DETAIL_RYU_DETAIL_D2S_HPP +#include #include -#include #include // Only include the full table if we're not optimizing for size. diff --git a/include/boost/json/detail/ryu/detail/d2s_full_table.hpp b/include/boost/json/detail/ryu/detail/d2s_full_table.hpp index 9d0c1dcc..778eb727 100644 --- a/include/boost/json/detail/ryu/detail/d2s_full_table.hpp +++ b/include/boost/json/detail/ryu/detail/d2s_full_table.hpp @@ -22,6 +22,7 @@ #ifndef BOOST_JSON_DETAIL_RYU_DETAIL_D2S_FULL_TABLE_HPP #define BOOST_JSON_DETAIL_RYU_DETAIL_D2S_FULL_TABLE_HPP +#include #include namespace boost { diff --git a/include/boost/json/detail/ryu/detail/d2s_intrinsics.hpp b/include/boost/json/detail/ryu/detail/d2s_intrinsics.hpp index 97a24523..f2fed62f 100644 --- a/include/boost/json/detail/ryu/detail/d2s_intrinsics.hpp +++ b/include/boost/json/detail/ryu/detail/d2s_intrinsics.hpp @@ -22,9 +22,10 @@ #ifndef BOOST_JSON_DETAIL_RYU_DETAIL_D2S_INTRINSICS_HPP #define BOOST_JSON_DETAIL_RYU_DETAIL_D2S_INTRINSICS_HPP +#include + // This sets BOOST_JSON_RYU_32_BIT_PLATFORM as a side effect if applicable. #include -#include #include #if defined(BOOST_JSON_RYU_HAS_64_BIT_INTRINSICS) diff --git a/include/boost/json/detail/ryu/detail/digit_table.hpp b/include/boost/json/detail/ryu/detail/digit_table.hpp index facf4369..80572fb4 100644 --- a/include/boost/json/detail/ryu/detail/digit_table.hpp +++ b/include/boost/json/detail/ryu/detail/digit_table.hpp @@ -22,6 +22,8 @@ #ifndef BOOST_JSON_DETAIL_RYU_DETAIL_DIGIT_TABLE_HPP #define BOOST_JSON_DETAIL_RYU_DETAIL_DIGIT_TABLE_HPP +#include + namespace boost { namespace json { namespace detail { diff --git a/include/boost/json/detail/ryu/impl/d2s.ipp b/include/boost/json/detail/ryu/impl/d2s.ipp index 83133c3e..964511f9 100644 --- a/include/boost/json/detail/ryu/impl/d2s.ipp +++ b/include/boost/json/detail/ryu/impl/d2s.ipp @@ -35,7 +35,6 @@ #define BOOST_JSON_DETAIL_RYU_IMPL_D2S_IPP #include -#include #include #include #include diff --git a/include/boost/json/detail/static_stack.hpp b/include/boost/json/detail/static_stack.hpp index 87416701..534de411 100644 --- a/include/boost/json/detail/static_stack.hpp +++ b/include/boost/json/detail/static_stack.hpp @@ -12,7 +12,6 @@ #include #include -#include #include #include diff --git a/include/boost/json/detail/string.hpp b/include/boost/json/detail/string.hpp deleted file mode 100644 index 6a6a9f61..00000000 --- a/include/boost/json/detail/string.hpp +++ /dev/null @@ -1,46 +0,0 @@ -// -// Copyright (c) 2016-2019 Vinnie Falco (vinnie dot falco at gmail dot com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// -// Official repository: https://github.com/vinniefalco/json -// - -#ifndef BOOST_JSON_DETAIL_STRING_HPP -#define BOOST_JSON_DETAIL_STRING_HPP - -#ifndef BOOST_JSON_STANDALONE -# include -#else -# include -#endif - -namespace boost { -namespace json { - -#ifndef BOOST_JSON_STANDALONE -/// The type of string view used by the library -using string_view = boost::string_view; - -#else -using string_view = std::string_view; - -#endif - -namespace detail { - -template -using is_viewy = typename std::enable_if< - std::is_convertible< - T const&, string_view>::value && - ! std::is_convertible< - T const&, char const*>::value - >::type; - -} // detail - -} // json -} // boost - -#endif diff --git a/include/boost/json/detail/system_error.hpp b/include/boost/json/detail/system_error.hpp deleted file mode 100644 index 32b7a00a..00000000 --- a/include/boost/json/detail/system_error.hpp +++ /dev/null @@ -1,47 +0,0 @@ -// -// Copyright (c) 2016-2019 Vinnie Falco (vinnie dot falco at gmail dot com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// -// Official repository: https://github.com/vinniefalco/json -// - -#ifndef BOOST_JSON_DETAIL_SYSTEM_ERROR_HPP -#define BOOST_JSON_DETAIL_SYSTEM_ERROR_HPP - -#ifndef BOOST_JSON_STANDALONE -# include -# include -#else -# include -#endif - -namespace boost { -namespace json { - -#ifndef BOOST_JSON_STANDALONE -/// The type of error code used by the library -using error_code = boost::system::error_code; - -/// The type of system error thrown by the library -using system_error = boost::system::system_error; - -/// The type of error category used by the library -using error_category = boost::system::error_category; - -/// The type of error condition used by the library -using error_condition = boost::system::error_condition; - -#else -using error_code = std::error_code; -using system_error = std::system_error; -using error_category = std::error_category; -using error_condition = std::error_condition; - -#endif - -} // json -} // boost - -#endif diff --git a/include/boost/json/detail/value.hpp b/include/boost/json/detail/value.hpp index 2b82c0b7..4a857a38 100644 --- a/include/boost/json/detail/value.hpp +++ b/include/boost/json/detail/value.hpp @@ -11,7 +11,6 @@ #define BOOST_JSON_DETAIL_VALUE_HPP #include -#include #include namespace boost { diff --git a/include/boost/json/error.hpp b/include/boost/json/error.hpp index 60f112d8..a5c8f52f 100644 --- a/include/boost/json/error.hpp +++ b/include/boost/json/error.hpp @@ -11,7 +11,6 @@ #define BOOST_JSON_ERROR_HPP #include -#include namespace boost { namespace json { diff --git a/include/boost/json/impl/array.ipp b/include/boost/json/impl/array.ipp index 4a630d06..27c53b25 100644 --- a/include/boost/json/impl/array.ipp +++ b/include/boost/json/impl/array.ipp @@ -11,9 +11,7 @@ #define BOOST_JSON_IMPL_ARRAY_IPP #include -#include #include -#include #include #include #include diff --git a/include/boost/json/impl/basic_parser.ipp b/include/boost/json/impl/basic_parser.ipp index 98f60603..a2b59202 100644 --- a/include/boost/json/impl/basic_parser.ipp +++ b/include/boost/json/impl/basic_parser.ipp @@ -12,7 +12,6 @@ #include #include -#include #include #include diff --git a/include/boost/json/impl/object.hpp b/include/boost/json/impl/object.hpp index 2683fdd7..4e5a042b 100644 --- a/include/boost/json/impl/object.hpp +++ b/include/boost/json/impl/object.hpp @@ -12,8 +12,6 @@ #include #include -#include -#include #include #include #include diff --git a/include/boost/json/impl/object.ipp b/include/boost/json/impl/object.ipp index df6f9057..bbeaa34f 100644 --- a/include/boost/json/impl/object.ipp +++ b/include/boost/json/impl/object.ipp @@ -11,9 +11,7 @@ #define BOOST_JSON_IMPL_OBJECT_IPP #include -#include #include -#include #include #include #include diff --git a/include/boost/json/impl/parser.ipp b/include/boost/json/impl/parser.ipp index b961615a..13722a42 100644 --- a/include/boost/json/impl/parser.ipp +++ b/include/boost/json/impl/parser.ipp @@ -12,7 +12,6 @@ #include #include -#include #include #include #include @@ -444,8 +443,8 @@ on_key_part( BOOST_JSON_THROW( detail::key_too_large_exception()); push_chars(s); - key_size_ += static_cast( - s.size()); + key_size_ += static_cast< + std::uint32_t>(s.size()); } void @@ -473,8 +472,8 @@ on_string_part( BOOST_JSON_THROW( detail::string_too_large_exception()); push_chars(s); - str_size_ += static_cast( - s.size()); + str_size_ += static_cast< + std::uint32_t>(s.size()); } void diff --git a/include/boost/json/impl/string.ipp b/include/boost/json/impl/string.ipp index 0ac6f496..ec79e7c3 100644 --- a/include/boost/json/impl/string.ipp +++ b/include/boost/json/impl/string.ipp @@ -10,7 +10,6 @@ #ifndef BOOST_JSON_IMPL_STRING_IPP #define BOOST_JSON_IMPL_STRING_IPP -#include #include #include #include diff --git a/include/boost/json/impl/value.hpp b/include/boost/json/impl/value.hpp index 15eca6ed..0c8bdbb6 100644 --- a/include/boost/json/impl/value.hpp +++ b/include/boost/json/impl/value.hpp @@ -12,7 +12,6 @@ #include #include -#include #include #include diff --git a/include/boost/json/kind.hpp b/include/boost/json/kind.hpp index 0daf2e4b..69de3985 100644 --- a/include/boost/json/kind.hpp +++ b/include/boost/json/kind.hpp @@ -11,7 +11,6 @@ #define BOOST_JSON_KIND_HPP #include -#include namespace boost { namespace json { diff --git a/include/boost/json/object.hpp b/include/boost/json/object.hpp index 425d5881..92538ba9 100644 --- a/include/boost/json/object.hpp +++ b/include/boost/json/object.hpp @@ -12,8 +12,6 @@ #include #include -#include -#include #include #include #include diff --git a/include/boost/json/parser.hpp b/include/boost/json/parser.hpp index 196f86a1..0ffb483e 100644 --- a/include/boost/json/parser.hpp +++ b/include/boost/json/parser.hpp @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include diff --git a/include/boost/json/serializer.hpp b/include/boost/json/serializer.hpp index edce044d..fe67d9a8 100644 --- a/include/boost/json/serializer.hpp +++ b/include/boost/json/serializer.hpp @@ -14,7 +14,6 @@ #include #include #include -#include #include namespace boost { diff --git a/include/boost/json/storage_ptr.hpp b/include/boost/json/storage_ptr.hpp index 3b938e35..fb13b90e 100644 --- a/include/boost/json/storage_ptr.hpp +++ b/include/boost/json/storage_ptr.hpp @@ -11,8 +11,6 @@ #define BOOST_JSON_STORAGE_PTR_HPP #include -#include -#include #include #include #include diff --git a/include/boost/json/string.hpp b/include/boost/json/string.hpp index 1ae664d3..43851469 100644 --- a/include/boost/json/string.hpp +++ b/include/boost/json/string.hpp @@ -12,8 +12,6 @@ #include #include -#include -#include #include #include #include @@ -1890,7 +1888,7 @@ public: template + ,class = detail::is_string_viewish #endif > string& @@ -1904,7 +1902,7 @@ public: template + ,class = detail::is_string_viewish #endif > string& @@ -2000,7 +1998,7 @@ public: template + ,class = detail::is_string_viewish #endif > string& @@ -2012,7 +2010,7 @@ public: template + ,class = detail::is_string_viewish #endif > string& @@ -2054,7 +2052,7 @@ public: template + ,class = detail::is_string_viewish #endif > string& @@ -2270,7 +2268,7 @@ public: template + ,class = detail::is_string_viewish #endif > string& @@ -2281,7 +2279,7 @@ public: template + ,class = detail::is_string_viewish #endif > string& @@ -2292,7 +2290,7 @@ public: template + ,class = detail::is_string_viewish #endif > string& @@ -2414,7 +2412,7 @@ public: template + ,class = detail::is_string_viewish #endif > size_type @@ -2462,7 +2460,7 @@ public: template + ,class = detail::is_string_viewish #endif > size_type @@ -2510,7 +2508,7 @@ public: template + ,class = detail::is_string_viewish #endif > size_type @@ -2558,7 +2556,7 @@ public: template + ,class = detail::is_string_viewish #endif > size_type @@ -2606,7 +2604,7 @@ public: template + ,class = detail::is_string_viewish #endif > size_type @@ -2654,7 +2652,7 @@ public: template + ,class = detail::is_string_viewish #endif > size_type @@ -2730,7 +2728,7 @@ operator==(string const& lhs, string const& rhs) template + ,class = detail::is_string_viewish #endif > bool operator==(string const& lhs, T const& rhs) @@ -2740,7 +2738,7 @@ bool operator==(string const& lhs, T const& rhs) template + ,class = detail::is_string_viewish #endif > bool operator==(T const& lhs, string const& rhs) @@ -2759,7 +2757,7 @@ operator!=(string const& lhs, string const& rhs) template + ,class = detail::is_string_viewish #endif > bool operator!=(string const& lhs, T const& rhs) @@ -2769,7 +2767,7 @@ bool operator!=(string const& lhs, T const& rhs) template + ,class = detail::is_string_viewish #endif > bool operator!=(T const& lhs, string const& rhs) @@ -2788,7 +2786,7 @@ operator<(string const& lhs, string const& rhs) template + ,class = detail::is_string_viewish #endif > bool operator<(string const& lhs, T const& rhs) @@ -2798,7 +2796,7 @@ bool operator<(string const& lhs, T const& rhs) template + ,class = detail::is_string_viewish #endif > bool operator<(T const& lhs, string const& rhs) @@ -2817,7 +2815,7 @@ operator<=(string const& lhs, string const& rhs) template + ,class = detail::is_string_viewish #endif > bool operator<=(string const& lhs, T const& rhs) @@ -2827,7 +2825,7 @@ bool operator<=(string const& lhs, T const& rhs) template + ,class = detail::is_string_viewish #endif > bool operator<=(T const& lhs, string const& rhs) @@ -2846,7 +2844,7 @@ operator>=(string const& lhs, string const& rhs) template + ,class = detail::is_string_viewish #endif > bool operator>=(string const& lhs, T const& rhs) @@ -2856,7 +2854,7 @@ bool operator>=(string const& lhs, T const& rhs) template + ,class = detail::is_string_viewish #endif > bool operator>=(T const& lhs, string const& rhs) @@ -2875,7 +2873,7 @@ operator>(string const& lhs, string const& rhs) template + ,class = detail::is_string_viewish #endif > bool operator>(string const& lhs, T const& rhs) @@ -2885,7 +2883,7 @@ bool operator>(string const& lhs, T const& rhs) template + ,class = detail::is_string_viewish #endif > bool operator>(T const& lhs, string const& rhs) diff --git a/include/boost/json/value.hpp b/include/boost/json/value.hpp index 240d6816..27e7bd29 100644 --- a/include/boost/json/value.hpp +++ b/include/boost/json/value.hpp @@ -17,9 +17,7 @@ #include #include #include -#include #include -#include #include #include #include diff --git a/test/number.cpp b/test/number.cpp index 675b095e..43148c79 100644 --- a/test/number.cpp +++ b/test/number.cpp @@ -10,8 +10,6 @@ // Test that header file is self-contained. #include -#include - #include #include diff --git a/test/object.cpp b/test/object.cpp index dd13b627..2e83e367 100644 --- a/test/object.cpp +++ b/test/object.cpp @@ -11,7 +11,6 @@ #include #include -#include #include #include diff --git a/test/ryu/d2s_test.cpp b/test/ryu/d2s_test.cpp index 162e0fac..2717e483 100644 --- a/test/ryu/d2s_test.cpp +++ b/test/ryu/d2s_test.cpp @@ -20,7 +20,6 @@ */ #include -#include #include #include "gtest.hpp"