diff --git a/include/xrpl/beast/test/fail_counter.h b/include/xrpl/beast/test/fail_counter.h index 65b4ac79c..d0cae77dd 100644 --- a/include/xrpl/beast/test/fail_counter.h +++ b/include/xrpl/beast/test/fail_counter.h @@ -8,8 +8,8 @@ #ifndef BEAST_TEST_FAIL_COUNTER_HPP #define BEAST_TEST_FAIL_COUNTER_HPP -#include #include +#include namespace beast { namespace test { diff --git a/include/xrpl/beast/test/fail_stream.h b/include/xrpl/beast/test/fail_stream.h index cc117f175..161e73ef0 100644 --- a/include/xrpl/beast/test/fail_stream.h +++ b/include/xrpl/beast/test/fail_stream.h @@ -8,13 +8,13 @@ #ifndef BEAST_TEST_FAIL_STREAM_HPP #define BEAST_TEST_FAIL_STREAM_HPP -#include #include #include #include #include #include #include +#include namespace beast { namespace test { diff --git a/include/xrpl/beast/test/pipe_stream.h b/include/xrpl/beast/test/pipe_stream.h index 20574e9a8..762419a53 100644 --- a/include/xrpl/beast/test/pipe_stream.h +++ b/include/xrpl/beast/test/pipe_stream.h @@ -8,10 +8,6 @@ #ifndef BEAST_TEST_PIPE_STREAM_HPP #define BEAST_TEST_PIPE_STREAM_HPP -#include -#include -#include -#include #include #include #include @@ -19,6 +15,10 @@ #include #include #include +#include +#include +#include +#include #include #include #include diff --git a/include/xrpl/beast/test/string_iostream.h b/include/xrpl/beast/test/string_iostream.h index 67822f81c..bed6299a2 100644 --- a/include/xrpl/beast/test/string_iostream.h +++ b/include/xrpl/beast/test/string_iostream.h @@ -8,14 +8,14 @@ #ifndef BEAST_TEST_STRING_IOSTREAM_HPP #define BEAST_TEST_STRING_IOSTREAM_HPP -#include -#include -#include #include #include #include #include #include +#include +#include +#include #include namespace beast { diff --git a/include/xrpl/beast/test/string_istream.h b/include/xrpl/beast/test/string_istream.h index ba0bf34cc..83cb3cfef 100644 --- a/include/xrpl/beast/test/string_istream.h +++ b/include/xrpl/beast/test/string_istream.h @@ -8,13 +8,13 @@ #ifndef BEAST_TEST_STRING_ISTREAM_HPP #define BEAST_TEST_STRING_ISTREAM_HPP -#include -#include -#include #include #include #include #include +#include +#include +#include #include namespace beast { diff --git a/include/xrpl/beast/test/string_ostream.h b/include/xrpl/beast/test/string_ostream.h index a14839c5c..9edf69be8 100644 --- a/include/xrpl/beast/test/string_ostream.h +++ b/include/xrpl/beast/test/string_ostream.h @@ -8,14 +8,14 @@ #ifndef BEAST_TEST_STRING_OSTREAM_HPP #define BEAST_TEST_STRING_OSTREAM_HPP -#include -#include -#include #include #include #include #include #include +#include +#include +#include #include namespace beast { diff --git a/src/libxrpl/protocol/PublicKey.cpp b/src/libxrpl/protocol/PublicKey.cpp index b2a5fc7ef..fdab288ce 100644 --- a/src/libxrpl/protocol/PublicKey.cpp +++ b/src/libxrpl/protocol/PublicKey.cpp @@ -20,8 +20,8 @@ #include #include #include -#include #include +#include #include #include diff --git a/src/libxrpl/protocol/SecretKey.cpp b/src/libxrpl/protocol/SecretKey.cpp index bc42c1e78..474c37ac8 100644 --- a/src/libxrpl/protocol/SecretKey.cpp +++ b/src/libxrpl/protocol/SecretKey.cpp @@ -23,8 +23,8 @@ #include #include #include -#include #include +#include #include #include diff --git a/src/libxrpl/protocol/tokens.cpp b/src/libxrpl/protocol/tokens.cpp index a757858fd..28fb6b249 100644 --- a/src/libxrpl/protocol/tokens.cpp +++ b/src/libxrpl/protocol/tokens.cpp @@ -28,8 +28,8 @@ #include #include -#include #include +#include #include #include diff --git a/src/magic/magic_enum.h b/src/magic/magic_enum.h index 78b1d17cf..125424e44 100644 --- a/src/magic/magic_enum.h +++ b/src/magic/magic_enum.h @@ -11,23 +11,23 @@ // SPDX-License-Identifier: MIT // Copyright (c) 2019 - 2024 Daniil Goncharov . // -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: // -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. // -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT +// OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef NEARGYE_MAGIC_ENUM_HPP #define NEARGYE_MAGIC_ENUM_HPP @@ -45,90 +45,110 @@ #include #if defined(MAGIC_ENUM_CONFIG_FILE) -# include MAGIC_ENUM_CONFIG_FILE +#include MAGIC_ENUM_CONFIG_FILE #endif #if !defined(MAGIC_ENUM_USING_ALIAS_OPTIONAL) -# include +#include #endif #if !defined(MAGIC_ENUM_USING_ALIAS_STRING) -# include +#include #endif #if !defined(MAGIC_ENUM_USING_ALIAS_STRING_VIEW) -# include +#include #endif #if defined(MAGIC_ENUM_NO_ASSERT) -# define MAGIC_ENUM_ASSERT(...) static_cast(0) +#define MAGIC_ENUM_ASSERT(...) static_cast(0) #elif !defined(MAGIC_ENUM_ASSERT) -# include -# define MAGIC_ENUM_ASSERT(...) assert((__VA_ARGS__)) +#include +#define MAGIC_ENUM_ASSERT(...) assert((__VA_ARGS__)) #endif #if defined(__clang__) -# pragma clang diagnostic push -# pragma clang diagnostic ignored "-Wunknown-warning-option" -# pragma clang diagnostic ignored "-Wenum-constexpr-conversion" -# pragma clang diagnostic ignored "-Wuseless-cast" // suppresses 'static_cast('\0')' for char_type = char (common on Linux). +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunknown-warning-option" +#pragma clang diagnostic ignored "-Wenum-constexpr-conversion" +#pragma clang diagnostic ignored \ + "-Wuseless-cast" // suppresses 'static_cast('\0')' for char_type + // = char (common on Linux). #elif defined(__GNUC__) -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wmaybe-uninitialized" // May be used uninitialized 'return {};'. -# pragma GCC diagnostic ignored "-Wuseless-cast" // suppresses 'static_cast('\0')' for char_type = char (common on Linux). +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored \ + "-Wmaybe-uninitialized" // May be used uninitialized 'return {};'. +#pragma GCC diagnostic ignored \ + "-Wuseless-cast" // suppresses 'static_cast('\0')' for char_type + // = char (common on Linux). #elif defined(_MSC_VER) -# pragma warning(push) -# pragma warning(disable : 26495) // Variable 'static_str::chars_' is uninitialized. -# pragma warning(disable : 28020) // Arithmetic overflow: Using operator '-' on a 4 byte value and then casting the result to a 8 byte value. -# pragma warning(disable : 26451) // The expression '0<=_Param_(1)&&_Param_(1)<=1-1' is not true at this call. -# pragma warning(disable : 4514) // Unreferenced inline function has been removed. +#pragma warning(push) +#pragma warning( \ + disable : 26495) // Variable 'static_str::chars_' is uninitialized. +#pragma warning( \ + disable : 28020) // Arithmetic overflow: Using operator '-' on a 4 byte + // value and then casting the result to a 8 byte value. +#pragma warning( \ + disable : 26451) // The expression '0<=_Param_(1)&&_Param_(1)<=1-1' is not + // true at this call. +#pragma warning( \ + disable : 4514) // Unreferenced inline function has been removed. #endif // Checks magic_enum compiler compatibility. -#if defined(__clang__) && __clang_major__ >= 5 || defined(__GNUC__) && __GNUC__ >= 9 || defined(_MSC_VER) && _MSC_VER >= 1910 || defined(__RESHARPER__) -# undef MAGIC_ENUM_SUPPORTED -# define MAGIC_ENUM_SUPPORTED 1 +#if defined(__clang__) && __clang_major__ >= 5 || \ + defined(__GNUC__) && __GNUC__ >= 9 || \ + defined(_MSC_VER) && _MSC_VER >= 1910 || defined(__RESHARPER__) +#undef MAGIC_ENUM_SUPPORTED +#define MAGIC_ENUM_SUPPORTED 1 #endif // Checks magic_enum compiler aliases compatibility. -#if defined(__clang__) && __clang_major__ >= 5 || defined(__GNUC__) && __GNUC__ >= 9 || defined(_MSC_VER) && _MSC_VER >= 1920 -# undef MAGIC_ENUM_SUPPORTED_ALIASES -# define MAGIC_ENUM_SUPPORTED_ALIASES 1 +#if defined(__clang__) && __clang_major__ >= 5 || \ + defined(__GNUC__) && __GNUC__ >= 9 || \ + defined(_MSC_VER) && _MSC_VER >= 1920 +#undef MAGIC_ENUM_SUPPORTED_ALIASES +#define MAGIC_ENUM_SUPPORTED_ALIASES 1 #endif -// Enum value must be greater or equals than MAGIC_ENUM_RANGE_MIN. By default MAGIC_ENUM_RANGE_MIN = -128. -// If need another min range for all enum types by default, redefine the macro MAGIC_ENUM_RANGE_MIN. +// Enum value must be greater or equals than MAGIC_ENUM_RANGE_MIN. By default +// MAGIC_ENUM_RANGE_MIN = -128. If need another min range for all enum types by +// default, redefine the macro MAGIC_ENUM_RANGE_MIN. #if !defined(MAGIC_ENUM_RANGE_MIN) -# define MAGIC_ENUM_RANGE_MIN -128 +#define MAGIC_ENUM_RANGE_MIN -128 #endif -// Enum value must be less or equals than MAGIC_ENUM_RANGE_MAX. By default MAGIC_ENUM_RANGE_MAX = 128. -// If need another max range for all enum types by default, redefine the macro MAGIC_ENUM_RANGE_MAX. +// Enum value must be less or equals than MAGIC_ENUM_RANGE_MAX. By default +// MAGIC_ENUM_RANGE_MAX = 128. If need another max range for all enum types by +// default, redefine the macro MAGIC_ENUM_RANGE_MAX. #if !defined(MAGIC_ENUM_RANGE_MAX) -# define MAGIC_ENUM_RANGE_MAX 127 +#define MAGIC_ENUM_RANGE_MAX 127 #endif -// Improve ReSharper C++ intellisense performance with builtins, avoiding unnecessary template instantiations. +// Improve ReSharper C++ intellisense performance with builtins, avoiding +// unnecessary template instantiations. #if defined(__RESHARPER__) -# undef MAGIC_ENUM_GET_ENUM_NAME_BUILTIN -# undef MAGIC_ENUM_GET_TYPE_NAME_BUILTIN -# if __RESHARPER__ >= 20230100 -# define MAGIC_ENUM_GET_ENUM_NAME_BUILTIN(V) __rscpp_enumerator_name(V) -# define MAGIC_ENUM_GET_TYPE_NAME_BUILTIN(T) __rscpp_type_name() -# else -# define MAGIC_ENUM_GET_ENUM_NAME_BUILTIN(V) nullptr -# define MAGIC_ENUM_GET_TYPE_NAME_BUILTIN(T) nullptr -# endif +#undef MAGIC_ENUM_GET_ENUM_NAME_BUILTIN +#undef MAGIC_ENUM_GET_TYPE_NAME_BUILTIN +#if __RESHARPER__ >= 20230100 +#define MAGIC_ENUM_GET_ENUM_NAME_BUILTIN(V) __rscpp_enumerator_name(V) +#define MAGIC_ENUM_GET_TYPE_NAME_BUILTIN(T) __rscpp_type_name() +#else +#define MAGIC_ENUM_GET_ENUM_NAME_BUILTIN(V) nullptr +#define MAGIC_ENUM_GET_TYPE_NAME_BUILTIN(T) nullptr +#endif #endif namespace magic_enum { -// If need another optional type, define the macro MAGIC_ENUM_USING_ALIAS_OPTIONAL. +// If need another optional type, define the macro +// MAGIC_ENUM_USING_ALIAS_OPTIONAL. #if defined(MAGIC_ENUM_USING_ALIAS_OPTIONAL) MAGIC_ENUM_USING_ALIAS_OPTIONAL #else using std::optional; #endif -// If need another string_view type, define the macro MAGIC_ENUM_USING_ALIAS_STRING_VIEW. +// If need another string_view type, define the macro +// MAGIC_ENUM_USING_ALIAS_STRING_VIEW. #if defined(MAGIC_ENUM_USING_ALIAS_STRING_VIEW) MAGIC_ENUM_USING_ALIAS_STRING_VIEW #else @@ -143,666 +163,1052 @@ using std::string; #endif using char_type = string_view::value_type; -static_assert(std::is_same_v, "magic_enum::customize requires same string_view::value_type and string::value_type"); -static_assert([] { - if constexpr (std::is_same_v) { - constexpr const char c[] = "abcdefghijklmnopqrstuvwxyz_ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789|"; - constexpr const wchar_t wc[] = L"abcdefghijklmnopqrstuvwxyz_ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789|"; - static_assert(std::size(c) == std::size(wc), "magic_enum::customize identifier characters are multichars in wchar_t."); +static_assert( + std::is_same_v, + "magic_enum::customize requires same string_view::value_type and " + "string::value_type"); +static_assert( + [] { + if constexpr (std::is_same_v) + { + constexpr const char c[] = + "abcdefghijklmnopqrstuvwxyz_" + "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789|"; + constexpr const wchar_t wc[] = + L"abcdefghijklmnopqrstuvwxyz_" + L"ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789|"; + static_assert( + std::size(c) == std::size(wc), + "magic_enum::customize identifier characters are multichars in " + "wchar_t."); - for (std::size_t i = 0; i < std::size(c); ++i) { - if (c[i] != wc[i]) { - return false; - } - } - } - return true; -} (), "magic_enum::customize wchar_t is not compatible with ASCII."); + for (std::size_t i = 0; i < std::size(c); ++i) + { + if (c[i] != wc[i]) + { + return false; + } + } + } + return true; + }(), + "magic_enum::customize wchar_t is not compatible with ASCII."); namespace customize { -// Enum value must be in range [MAGIC_ENUM_RANGE_MIN, MAGIC_ENUM_RANGE_MAX]. By default MAGIC_ENUM_RANGE_MIN = -128, MAGIC_ENUM_RANGE_MAX = 128. -// If need another range for all enum types by default, redefine the macro MAGIC_ENUM_RANGE_MIN and MAGIC_ENUM_RANGE_MAX. -// If need another range for specific enum type, add specialization enum_range for necessary enum type. +// Enum value must be in range [MAGIC_ENUM_RANGE_MIN, MAGIC_ENUM_RANGE_MAX]. By +// default MAGIC_ENUM_RANGE_MIN = -128, MAGIC_ENUM_RANGE_MAX = 128. If need +// another range for all enum types by default, redefine the macro +// MAGIC_ENUM_RANGE_MIN and MAGIC_ENUM_RANGE_MAX. If need another range for +// specific enum type, add specialization enum_range for necessary enum type. template -struct enum_range { - static constexpr int min = MAGIC_ENUM_RANGE_MIN; - static constexpr int max = MAGIC_ENUM_RANGE_MAX; +struct enum_range +{ + static constexpr int min = MAGIC_ENUM_RANGE_MIN; + static constexpr int max = MAGIC_ENUM_RANGE_MAX; }; -static_assert(MAGIC_ENUM_RANGE_MAX > MAGIC_ENUM_RANGE_MIN, "MAGIC_ENUM_RANGE_MAX must be greater than MAGIC_ENUM_RANGE_MIN."); +static_assert( + MAGIC_ENUM_RANGE_MAX > MAGIC_ENUM_RANGE_MIN, + "MAGIC_ENUM_RANGE_MAX must be greater than MAGIC_ENUM_RANGE_MIN."); namespace detail { -enum class customize_tag { - default_tag, - invalid_tag, - custom_tag -}; +enum class customize_tag { default_tag, invalid_tag, custom_tag }; -} // namespace magic_enum::customize::detail +} // namespace detail -class customize_t : public std::pair { - public: - constexpr customize_t(string_view srt) : std::pair{detail::customize_tag::custom_tag, srt} {} - constexpr customize_t(const char_type* srt) : customize_t{string_view{srt}} {} - constexpr customize_t(detail::customize_tag tag) : std::pair{tag, string_view{}} { - MAGIC_ENUM_ASSERT(tag != detail::customize_tag::custom_tag); - } +class customize_t : public std::pair +{ +public: + constexpr customize_t(string_view srt) + : std::pair{ + detail::customize_tag::custom_tag, + srt} + { + } + constexpr customize_t(const char_type* srt) : customize_t{string_view{srt}} + { + } + constexpr customize_t(detail::customize_tag tag) + : std::pair{tag, string_view{}} + { + MAGIC_ENUM_ASSERT(tag != detail::customize_tag::custom_tag); + } }; // Default customize. -inline constexpr auto default_tag = customize_t{detail::customize_tag::default_tag}; +inline constexpr auto default_tag = + customize_t{detail::customize_tag::default_tag}; // Invalid customize. -inline constexpr auto invalid_tag = customize_t{detail::customize_tag::invalid_tag}; +inline constexpr auto invalid_tag = + customize_t{detail::customize_tag::invalid_tag}; -// If need custom names for enum, add specialization enum_name for necessary enum type. +// If need custom names for enum, add specialization enum_name for necessary +// enum type. template -constexpr customize_t enum_name(E) noexcept { - return default_tag; +constexpr customize_t enum_name(E) noexcept +{ + return default_tag; } -// If need custom type name for enum, add specialization enum_type_name for necessary enum type. +// If need custom type name for enum, add specialization enum_type_name for +// necessary enum type. template -constexpr customize_t enum_type_name() noexcept { - return default_tag; +constexpr customize_t +enum_type_name() noexcept +{ + return default_tag; } -} // namespace magic_enum::customize +} // namespace customize namespace detail { template struct supported -#if defined(MAGIC_ENUM_SUPPORTED) && MAGIC_ENUM_SUPPORTED || defined(MAGIC_ENUM_NO_CHECK_SUPPORT) - : std::true_type {}; +#if defined(MAGIC_ENUM_SUPPORTED) && MAGIC_ENUM_SUPPORTED || \ + defined(MAGIC_ENUM_NO_CHECK_SUPPORT) + : std::true_type +{ +}; #else - : std::false_type {}; + : std::false_type +{ +}; #endif -template , std::enable_if_t, int> = 0> +template < + auto V, + typename E = std::decay_t, + std::enable_if_t, int> = 0> using enum_constant = std::integral_constant; template inline constexpr bool always_false_v = false; template -struct has_is_flags : std::false_type {}; +struct has_is_flags : std::false_type +{ +}; template -struct has_is_flags::is_flags)>> : std::bool_constant::is_flags)>>> {}; +struct has_is_flags< + T, + std::void_t::is_flags)>> + : std::bool_constant::is_flags)>>> +{ +}; template -struct range_min : std::integral_constant {}; +struct range_min : std::integral_constant +{ +}; template -struct range_min::min)>> : std::integral_constant::min), customize::enum_range::min> {}; +struct range_min::min)>> + : std::integral_constant< + decltype(customize::enum_range::min), + customize::enum_range::min> +{ +}; template -struct range_max : std::integral_constant {}; +struct range_max : std::integral_constant +{ +}; template -struct range_max::max)>> : std::integral_constant::max), customize::enum_range::max> {}; +struct range_max::max)>> + : std::integral_constant< + decltype(customize::enum_range::max), + customize::enum_range::max> +{ +}; -struct str_view { - const char* str_ = nullptr; - std::size_t size_ = 0; +struct str_view +{ + const char* str_ = nullptr; + std::size_t size_ = 0; }; template -class static_str { - public: - constexpr explicit static_str(str_view str) noexcept : static_str{str.str_, std::make_integer_sequence{}} { - MAGIC_ENUM_ASSERT(str.size_ == N); - } +class static_str +{ +public: + constexpr explicit static_str(str_view str) noexcept + : static_str{str.str_, std::make_integer_sequence{}} + { + MAGIC_ENUM_ASSERT(str.size_ == N); + } - constexpr explicit static_str(string_view str) noexcept : static_str{str.data(), std::make_integer_sequence{}} { - MAGIC_ENUM_ASSERT(str.size() == N); - } + constexpr explicit static_str(string_view str) noexcept + : static_str{str.data(), std::make_integer_sequence{}} + { + MAGIC_ENUM_ASSERT(str.size() == N); + } - constexpr const char_type* data() const noexcept { return chars_; } + constexpr const char_type* + data() const noexcept + { + return chars_; + } - constexpr std::uint16_t size() const noexcept { return N; } + constexpr std::uint16_t + size() const noexcept + { + return N; + } - constexpr operator string_view() const noexcept { return {data(), size()}; } + constexpr operator string_view() const noexcept + { + return {data(), size()}; + } - private: - template - constexpr static_str(const char* str, std::integer_sequence) noexcept : chars_{static_cast(str[I])..., static_cast('\0')} {} +private: + template + constexpr static_str( + const char* str, + std::integer_sequence) noexcept + : chars_{ + static_cast(str[I])..., + static_cast('\0')} + { + } - template - constexpr static_str(string_view str, std::integer_sequence) noexcept : chars_{str[I]..., static_cast('\0')} {} + template + constexpr static_str( + string_view str, + std::integer_sequence) noexcept + : chars_{str[I]..., static_cast('\0')} + { + } - char_type chars_[static_cast(N) + 1]; + char_type chars_[static_cast(N) + 1]; }; template <> -class static_str<0> { - public: - constexpr explicit static_str() = default; +class static_str<0> +{ +public: + constexpr explicit static_str() = default; - constexpr explicit static_str(str_view) noexcept {} + constexpr explicit static_str(str_view) noexcept + { + } - constexpr explicit static_str(string_view) noexcept {} + constexpr explicit static_str(string_view) noexcept + { + } - constexpr const char_type* data() const noexcept { return nullptr; } + constexpr const char_type* + data() const noexcept + { + return nullptr; + } - constexpr std::uint16_t size() const noexcept { return 0; } + constexpr std::uint16_t + size() const noexcept + { + return 0; + } - constexpr operator string_view() const noexcept { return {}; } + constexpr operator string_view() const noexcept + { + return {}; + } }; template > -class case_insensitive { - static constexpr char_type to_lower(char_type c) noexcept { - return (c >= static_cast('A') && c <= static_cast('Z')) ? static_cast(c + (static_cast('a') - static_cast('A'))) : c; - } +class case_insensitive +{ + static constexpr char_type + to_lower(char_type c) noexcept + { + return (c >= static_cast('A') && + c <= static_cast('Z')) + ? static_cast( + c + + (static_cast('a') - static_cast('A'))) + : c; + } - public: - template - constexpr auto operator()(L lhs, R rhs) const noexcept -> std::enable_if_t, char_type> && std::is_same_v, char_type>, bool> { - return Op{}(to_lower(lhs), to_lower(rhs)); - } +public: + template + constexpr auto + operator()(L lhs, R rhs) const noexcept -> std::enable_if_t< + std::is_same_v, char_type> && + std::is_same_v, char_type>, + bool> + { + return Op{}(to_lower(lhs), to_lower(rhs)); + } }; -constexpr std::size_t find(string_view str, char_type c) noexcept { -#if defined(__clang__) && __clang_major__ < 9 && defined(__GLIBCXX__) || defined(_MSC_VER) && _MSC_VER < 1920 && !defined(__clang__) -// https://stackoverflow.com/questions/56484834/constexpr-stdstring-viewfind-last-of-doesnt-work-on-clang-8-with-libstdc -// https://developercommunity.visualstudio.com/content/problem/360432/vs20178-regression-c-failed-in-test.html - constexpr bool workaround = true; +constexpr std::size_t +find(string_view str, char_type c) noexcept +{ +#if defined(__clang__) && __clang_major__ < 9 && defined(__GLIBCXX__) || \ + defined(_MSC_VER) && _MSC_VER < 1920 && !defined(__clang__) + // https://stackoverflow.com/questions/56484834/constexpr-stdstring-viewfind-last-of-doesnt-work-on-clang-8-with-libstdc + // https://developercommunity.visualstudio.com/content/problem/360432/vs20178-regression-c-failed-in-test.html + constexpr bool workaround = true; #else - constexpr bool workaround = false; + constexpr bool workaround = false; #endif - if constexpr (workaround) { - for (std::size_t i = 0; i < str.size(); ++i) { - if (str[i] == c) { - return i; - } + if constexpr (workaround) + { + for (std::size_t i = 0; i < str.size(); ++i) + { + if (str[i] == c) + { + return i; + } + } + + return string_view::npos; + } + else + { + return str.find(c); } - - return string_view::npos; - } else { - return str.find(c); - } } template -constexpr bool is_default_predicate() noexcept { - return std::is_same_v, std::equal_to> || - std::is_same_v, std::equal_to<>>; +constexpr bool +is_default_predicate() noexcept +{ + return std::is_same_v< + std::decay_t, + std::equal_to> || + std::is_same_v, std::equal_to<>>; } template -constexpr bool is_nothrow_invocable() { - return is_default_predicate() || - std::is_nothrow_invocable_r_v; +constexpr bool +is_nothrow_invocable() +{ + return is_default_predicate() || + std::is_nothrow_invocable_r_v< + bool, + BinaryPredicate, + char_type, + char_type>; } template -constexpr bool cmp_equal(string_view lhs, string_view rhs, [[maybe_unused]] BinaryPredicate&& p) noexcept(is_nothrow_invocable()) { +constexpr bool +cmp_equal( + string_view lhs, + string_view rhs, + [[maybe_unused]] BinaryPredicate&& + p) noexcept(is_nothrow_invocable()) +{ #if defined(_MSC_VER) && _MSC_VER < 1920 && !defined(__clang__) - // https://developercommunity.visualstudio.com/content/problem/360432/vs20178-regression-c-failed-in-test.html - // https://developercommunity.visualstudio.com/content/problem/232218/c-constexpr-string-view.html - constexpr bool workaround = true; + // https://developercommunity.visualstudio.com/content/problem/360432/vs20178-regression-c-failed-in-test.html + // https://developercommunity.visualstudio.com/content/problem/232218/c-constexpr-string-view.html + constexpr bool workaround = true; #else - constexpr bool workaround = false; + constexpr bool workaround = false; #endif - if constexpr (!is_default_predicate() || workaround) { - if (lhs.size() != rhs.size()) { - return false; - } + if constexpr (!is_default_predicate() || workaround) + { + if (lhs.size() != rhs.size()) + { + return false; + } - const auto size = lhs.size(); - for (std::size_t i = 0; i < size; ++i) { - if (!p(lhs[i], rhs[i])) { - return false; - } - } + const auto size = lhs.size(); + for (std::size_t i = 0; i < size; ++i) + { + if (!p(lhs[i], rhs[i])) + { + return false; + } + } - return true; - } else { - return lhs == rhs; - } + return true; + } + else + { + return lhs == rhs; + } } template -constexpr bool cmp_less(L lhs, R rhs) noexcept { - static_assert(std::is_integral_v && std::is_integral_v, "magic_enum::detail::cmp_less requires integral type."); +constexpr bool +cmp_less(L lhs, R rhs) noexcept +{ + static_assert( + std::is_integral_v && std::is_integral_v, + "magic_enum::detail::cmp_less requires integral type."); - if constexpr (std::is_signed_v == std::is_signed_v) { - // If same signedness (both signed or both unsigned). - return lhs < rhs; - } else if constexpr (std::is_same_v) { // bool special case - return static_cast(lhs) < rhs; - } else if constexpr (std::is_same_v) { // bool special case - return lhs < static_cast(rhs); - } else if constexpr (std::is_signed_v) { - // If 'right' is negative, then result is 'false', otherwise cast & compare. - return rhs > 0 && lhs < static_cast>(rhs); - } else { - // If 'left' is negative, then result is 'true', otherwise cast & compare. - return lhs < 0 || static_cast>(lhs) < rhs; - } + if constexpr (std::is_signed_v == std::is_signed_v) + { + // If same signedness (both signed or both unsigned). + return lhs < rhs; + } + else if constexpr (std::is_same_v) + { // bool special case + return static_cast(lhs) < rhs; + } + else if constexpr (std::is_same_v) + { // bool special case + return lhs < static_cast(rhs); + } + else if constexpr (std::is_signed_v) + { + // If 'right' is negative, then result is 'false', otherwise cast & + // compare. + return rhs > 0 && lhs < static_cast>(rhs); + } + else + { + // If 'left' is negative, then result is 'true', otherwise cast & + // compare. + return lhs < 0 || static_cast>(lhs) < rhs; + } } template -constexpr I log2(I value) noexcept { - static_assert(std::is_integral_v, "magic_enum::detail::log2 requires integral type."); +constexpr I +log2(I value) noexcept +{ + static_assert( + std::is_integral_v, + "magic_enum::detail::log2 requires integral type."); - if constexpr (std::is_same_v) { // bool special case - return MAGIC_ENUM_ASSERT(false), value; - } else { - auto ret = I{0}; - for (; value > I{1}; value >>= I{1}, ++ret) {} + if constexpr (std::is_same_v) + { // bool special case + return MAGIC_ENUM_ASSERT(false), value; + } + else + { + auto ret = I{0}; + for (; value > I{1}; value >>= I{1}, ++ret) + { + } - return ret; - } + return ret; + } } #if defined(__cpp_lib_array_constexpr) && __cpp_lib_array_constexpr >= 201603L -# define MAGIC_ENUM_ARRAY_CONSTEXPR 1 +#define MAGIC_ENUM_ARRAY_CONSTEXPR 1 #else template -constexpr std::array, N> to_array(T (&a)[N], std::index_sequence) noexcept { - return {{a[I]...}}; +constexpr std::array, N> to_array( + T (&a)[N], + std::index_sequence) noexcept +{ + return {{a[I]...}}; } #endif template -inline constexpr bool is_enum_v = std::is_enum_v && std::is_same_v>; +inline constexpr bool is_enum_v = + std::is_enum_v&& std::is_same_v>; template -constexpr auto n() noexcept { - static_assert(is_enum_v, "magic_enum::detail::n requires enum type."); +constexpr auto +n() noexcept +{ + static_assert(is_enum_v, "magic_enum::detail::n requires enum type."); - if constexpr (supported::value) { + if constexpr (supported::value) + { #if defined(MAGIC_ENUM_GET_TYPE_NAME_BUILTIN) - constexpr auto name_ptr = MAGIC_ENUM_GET_TYPE_NAME_BUILTIN(E); - constexpr auto name = name_ptr ? str_view{name_ptr, std::char_traits::length(name_ptr)} : str_view{}; + constexpr auto name_ptr = MAGIC_ENUM_GET_TYPE_NAME_BUILTIN(E); + constexpr auto name = name_ptr + ? str_view{name_ptr, std::char_traits::length(name_ptr)} + : str_view{}; #elif defined(__clang__) - str_view name; - if constexpr (sizeof(__PRETTY_FUNCTION__) == sizeof(__FUNCTION__)) { - static_assert(always_false_v, "magic_enum::detail::n requires __PRETTY_FUNCTION__."); - return str_view{}; - } else { - name.size_ = sizeof(__PRETTY_FUNCTION__) - 36; - name.str_ = __PRETTY_FUNCTION__ + 34; - } + str_view name; + if constexpr (sizeof(__PRETTY_FUNCTION__) == sizeof(__FUNCTION__)) + { + static_assert( + always_false_v, + "magic_enum::detail::n requires __PRETTY_FUNCTION__."); + return str_view{}; + } + else + { + name.size_ = sizeof(__PRETTY_FUNCTION__) - 36; + name.str_ = __PRETTY_FUNCTION__ + 34; + } #elif defined(__GNUC__) - auto name = str_view{__PRETTY_FUNCTION__, sizeof(__PRETTY_FUNCTION__) - 1}; - if constexpr (sizeof(__PRETTY_FUNCTION__) == sizeof(__FUNCTION__)) { - static_assert(always_false_v, "magic_enum::detail::n requires __PRETTY_FUNCTION__."); - return str_view{}; - } else if (name.str_[name.size_ - 1] == ']') { - name.size_ -= 50; - name.str_ += 49; - } else { - name.size_ -= 40; - name.str_ += 37; - } + auto name = + str_view{__PRETTY_FUNCTION__, sizeof(__PRETTY_FUNCTION__) - 1}; + if constexpr (sizeof(__PRETTY_FUNCTION__) == sizeof(__FUNCTION__)) + { + static_assert( + always_false_v, + "magic_enum::detail::n requires __PRETTY_FUNCTION__."); + return str_view{}; + } + else if (name.str_[name.size_ - 1] == ']') + { + name.size_ -= 50; + name.str_ += 49; + } + else + { + name.size_ -= 40; + name.str_ += 37; + } #elif defined(_MSC_VER) - // CLI/C++ workaround (see https://github.com/Neargye/magic_enum/issues/284). - str_view name; - name.str_ = __FUNCSIG__; - name.str_ += 40; - name.size_ += sizeof(__FUNCSIG__) - 57; + // CLI/C++ workaround (see + // https://github.com/Neargye/magic_enum/issues/284). + str_view name; + name.str_ = __FUNCSIG__; + name.str_ += 40; + name.size_ += sizeof(__FUNCSIG__) - 57; #else - auto name = str_view{}; + auto name = str_view{}; #endif - std::size_t p = 0; - for (std::size_t i = name.size_; i > 0; --i) { - if (name.str_[i] == ':') { - p = i + 1; - break; - } + std::size_t p = 0; + for (std::size_t i = name.size_; i > 0; --i) + { + if (name.str_[i] == ':') + { + p = i + 1; + break; + } + } + if (p > 0) + { + name.size_ -= p; + name.str_ += p; + } + return name; } - if (p > 0) { - name.size_ -= p; - name.str_ += p; + else + { + return str_view{}; // Unsupported compiler or Invalid customize. } - return name; - } else { - return str_view{}; // Unsupported compiler or Invalid customize. - } } template -constexpr auto type_name() noexcept { - [[maybe_unused]] constexpr auto custom = customize::enum_type_name(); - static_assert(std::is_same_v, customize::customize_t>, "magic_enum::customize requires customize_t type."); - if constexpr (custom.first == customize::detail::customize_tag::custom_tag) { - constexpr auto name = custom.second; - static_assert(!name.empty(), "magic_enum::customize requires not empty string."); - return static_str{name}; - } else if constexpr (custom.first == customize::detail::customize_tag::invalid_tag) { - return static_str<0>{}; - } else if constexpr (custom.first == customize::detail::customize_tag::default_tag) { - constexpr auto name = n(); - return static_str{name}; - } else { - static_assert(always_false_v, "magic_enum::customize invalid."); - } +constexpr auto +type_name() noexcept +{ + [[maybe_unused]] constexpr auto custom = customize::enum_type_name(); + static_assert( + std::is_same_v, customize::customize_t>, + "magic_enum::customize requires customize_t type."); + if constexpr (custom.first == customize::detail::customize_tag::custom_tag) + { + constexpr auto name = custom.second; + static_assert( + !name.empty(), "magic_enum::customize requires not empty string."); + return static_str{name}; + } + else if constexpr ( + custom.first == customize::detail::customize_tag::invalid_tag) + { + return static_str<0>{}; + } + else if constexpr ( + custom.first == customize::detail::customize_tag::default_tag) + { + constexpr auto name = n(); + return static_str{name}; + } + else + { + static_assert(always_false_v, "magic_enum::customize invalid."); + } } template inline constexpr auto type_name_v = type_name(); template -constexpr auto n() noexcept { - static_assert(is_enum_v, "magic_enum::detail::n requires enum type."); +constexpr auto +n() noexcept +{ + static_assert( + is_enum_v, "magic_enum::detail::n requires enum type."); - if constexpr (supported::value) { + if constexpr (supported::value) + { #if defined(MAGIC_ENUM_GET_ENUM_NAME_BUILTIN) - constexpr auto name_ptr = MAGIC_ENUM_GET_ENUM_NAME_BUILTIN(V); - auto name = name_ptr ? str_view{name_ptr, std::char_traits::length(name_ptr)} : str_view{}; + constexpr auto name_ptr = MAGIC_ENUM_GET_ENUM_NAME_BUILTIN(V); + auto name = name_ptr + ? str_view{name_ptr, std::char_traits::length(name_ptr)} + : str_view{}; #elif defined(__clang__) - str_view name; - if constexpr (sizeof(__PRETTY_FUNCTION__) == sizeof(__FUNCTION__)) { - static_assert(always_false_v, "magic_enum::detail::n requires __PRETTY_FUNCTION__."); - return str_view{}; - } else { - name.size_ = sizeof(__PRETTY_FUNCTION__) - 36; - name.str_ = __PRETTY_FUNCTION__ + 34; - } - if (name.size_ > 22 && name.str_[0] == '(' && name.str_[1] == 'a' && name.str_[10] == ' ' && name.str_[22] == ':') { - name.size_ -= 23; - name.str_ += 23; - } - if (name.str_[0] == '(' || name.str_[0] == '-' || (name.str_[0] >= '0' && name.str_[0] <= '9')) { - name = str_view{}; - } + str_view name; + if constexpr (sizeof(__PRETTY_FUNCTION__) == sizeof(__FUNCTION__)) + { + static_assert( + always_false_v, + "magic_enum::detail::n requires __PRETTY_FUNCTION__."); + return str_view{}; + } + else + { + name.size_ = sizeof(__PRETTY_FUNCTION__) - 36; + name.str_ = __PRETTY_FUNCTION__ + 34; + } + if (name.size_ > 22 && name.str_[0] == '(' && name.str_[1] == 'a' && + name.str_[10] == ' ' && name.str_[22] == ':') + { + name.size_ -= 23; + name.str_ += 23; + } + if (name.str_[0] == '(' || name.str_[0] == '-' || + (name.str_[0] >= '0' && name.str_[0] <= '9')) + { + name = str_view{}; + } #elif defined(__GNUC__) - auto name = str_view{__PRETTY_FUNCTION__, sizeof(__PRETTY_FUNCTION__) - 1}; - if constexpr (sizeof(__PRETTY_FUNCTION__) == sizeof(__FUNCTION__)) { - static_assert(always_false_v, "magic_enum::detail::n requires __PRETTY_FUNCTION__."); - return str_view{}; - } else if (name.str_[name.size_ - 1] == ']') { - name.size_ -= 55; - name.str_ += 54; - } else { - name.size_ -= 40; - name.str_ += 37; - } - if (name.str_[0] == '(') { - name = str_view{}; - } + auto name = + str_view{__PRETTY_FUNCTION__, sizeof(__PRETTY_FUNCTION__) - 1}; + if constexpr (sizeof(__PRETTY_FUNCTION__) == sizeof(__FUNCTION__)) + { + static_assert( + always_false_v, + "magic_enum::detail::n requires __PRETTY_FUNCTION__."); + return str_view{}; + } + else if (name.str_[name.size_ - 1] == ']') + { + name.size_ -= 55; + name.str_ += 54; + } + else + { + name.size_ -= 40; + name.str_ += 37; + } + if (name.str_[0] == '(') + { + name = str_view{}; + } #elif defined(_MSC_VER) - str_view name; - if ((__FUNCSIG__[5] == '_' && __FUNCSIG__[35] != '(') || (__FUNCSIG__[5] == 'c' && __FUNCSIG__[41] != '(')) { - // CLI/C++ workaround (see https://github.com/Neargye/magic_enum/issues/284). - name.str_ = __FUNCSIG__; - name.str_ += 35; - name.size_ = sizeof(__FUNCSIG__) - 52; - } + str_view name; + if ((__FUNCSIG__[5] == '_' && __FUNCSIG__[35] != '(') || + (__FUNCSIG__[5] == 'c' && __FUNCSIG__[41] != '(')) + { + // CLI/C++ workaround (see + // https://github.com/Neargye/magic_enum/issues/284). + name.str_ = __FUNCSIG__; + name.str_ += 35; + name.size_ = sizeof(__FUNCSIG__) - 52; + } #else - auto name = str_view{}; + auto name = str_view{}; #endif - std::size_t p = 0; - for (std::size_t i = name.size_; i > 0; --i) { - if (name.str_[i] == ':') { - p = i + 1; - break; - } + std::size_t p = 0; + for (std::size_t i = name.size_; i > 0; --i) + { + if (name.str_[i] == ':') + { + p = i + 1; + break; + } + } + if (p > 0) + { + name.size_ -= p; + name.str_ += p; + } + return name; } - if (p > 0) { - name.size_ -= p; - name.str_ += p; + else + { + return str_view{}; // Unsupported compiler or Invalid customize. } - return name; - } else { - return str_view{}; // Unsupported compiler or Invalid customize. - } } #if defined(_MSC_VER) && !defined(__clang__) && _MSC_VER < 1920 -# define MAGIC_ENUM_VS_2017_WORKAROUND 1 +#define MAGIC_ENUM_VS_2017_WORKAROUND 1 #endif #if defined(MAGIC_ENUM_VS_2017_WORKAROUND) template -constexpr auto n() noexcept { - static_assert(is_enum_v, "magic_enum::detail::n requires enum type."); +constexpr auto +n() noexcept +{ + static_assert(is_enum_v, "magic_enum::detail::n requires enum type."); -# if defined(MAGIC_ENUM_GET_ENUM_NAME_BUILTIN) - constexpr auto name_ptr = MAGIC_ENUM_GET_ENUM_NAME_BUILTIN(V); - auto name = name_ptr ? str_view{name_ptr, std::char_traits::length(name_ptr)} : str_view{}; -# else - // CLI/C++ workaround (see https://github.com/Neargye/magic_enum/issues/284). - str_view name; - name.str_ = __FUNCSIG__; - name.size_ = sizeof(__FUNCSIG__) - 17; - std::size_t p = 0; - for (std::size_t i = name.size_; i > 0; --i) { - if (name.str_[i] == ',' || name.str_[i] == ':') { - p = i + 1; - break; +#if defined(MAGIC_ENUM_GET_ENUM_NAME_BUILTIN) + constexpr auto name_ptr = MAGIC_ENUM_GET_ENUM_NAME_BUILTIN(V); + auto name = name_ptr + ? str_view{name_ptr, std::char_traits::length(name_ptr)} + : str_view{}; +#else + // CLI/C++ workaround (see + // https://github.com/Neargye/magic_enum/issues/284). + str_view name; + name.str_ = __FUNCSIG__; + name.size_ = sizeof(__FUNCSIG__) - 17; + std::size_t p = 0; + for (std::size_t i = name.size_; i > 0; --i) + { + if (name.str_[i] == ',' || name.str_[i] == ':') + { + p = i + 1; + break; + } } - } - if (p > 0) { - name.size_ -= p; - name.str_ += p; - } - if (name.str_[0] == '(' || name.str_[0] == '-' || (name.str_[0] >= '0' && name.str_[0] <= '9')) { - name = str_view{}; - } - return name; -# endif + if (p > 0) + { + name.size_ -= p; + name.str_ += p; + } + if (name.str_[0] == '(' || name.str_[0] == '-' || + (name.str_[0] >= '0' && name.str_[0] <= '9')) + { + name = str_view{}; + } + return name; +#endif } #endif template -constexpr auto enum_name() noexcept { - [[maybe_unused]] constexpr auto custom = customize::enum_name(V); - static_assert(std::is_same_v, customize::customize_t>, "magic_enum::customize requires customize_t type."); - if constexpr (custom.first == customize::detail::customize_tag::custom_tag) { - constexpr auto name = custom.second; - static_assert(!name.empty(), "magic_enum::customize requires not empty string."); - return static_str{name}; - } else if constexpr (custom.first == customize::detail::customize_tag::invalid_tag) { - return static_str<0>{}; - } else if constexpr (custom.first == customize::detail::customize_tag::default_tag) { +constexpr auto +enum_name() noexcept +{ + [[maybe_unused]] constexpr auto custom = customize::enum_name(V); + static_assert( + std::is_same_v, customize::customize_t>, + "magic_enum::customize requires customize_t type."); + if constexpr (custom.first == customize::detail::customize_tag::custom_tag) + { + constexpr auto name = custom.second; + static_assert( + !name.empty(), "magic_enum::customize requires not empty string."); + return static_str{name}; + } + else if constexpr ( + custom.first == customize::detail::customize_tag::invalid_tag) + { + return static_str<0>{}; + } + else if constexpr ( + custom.first == customize::detail::customize_tag::default_tag) + { #if defined(MAGIC_ENUM_VS_2017_WORKAROUND) - constexpr auto name = n(); + constexpr auto name = n(); #else - constexpr auto name = n(); + constexpr auto name = n(); #endif - return static_str{name}; - } else { - static_assert(always_false_v, "magic_enum::customize invalid."); - } + return static_str{name}; + } + else + { + static_assert(always_false_v, "magic_enum::customize invalid."); + } } template inline constexpr auto enum_name_v = enum_name(); template -constexpr bool is_valid() noexcept { +constexpr bool +is_valid() noexcept +{ #if defined(__clang__) && __clang_major__ >= 16 - // https://reviews.llvm.org/D130058, https://reviews.llvm.org/D131307 - constexpr E v = __builtin_bit_cast(E, V); + // https://reviews.llvm.org/D130058, https://reviews.llvm.org/D131307 + constexpr E v = __builtin_bit_cast(E, V); #else - constexpr E v = static_cast(V); + constexpr E v = static_cast(V); #endif - [[maybe_unused]] constexpr auto custom = customize::enum_name(v); - static_assert(std::is_same_v, customize::customize_t>, "magic_enum::customize requires customize_t type."); - if constexpr (custom.first == customize::detail::customize_tag::custom_tag) { - constexpr auto name = custom.second; - static_assert(!name.empty(), "magic_enum::customize requires not empty string."); - return name.size() != 0; - } else if constexpr (custom.first == customize::detail::customize_tag::default_tag) { + [[maybe_unused]] constexpr auto custom = customize::enum_name(v); + static_assert( + std::is_same_v, customize::customize_t>, + "magic_enum::customize requires customize_t type."); + if constexpr (custom.first == customize::detail::customize_tag::custom_tag) + { + constexpr auto name = custom.second; + static_assert( + !name.empty(), "magic_enum::customize requires not empty string."); + return name.size() != 0; + } + else if constexpr ( + custom.first == customize::detail::customize_tag::default_tag) + { #if defined(MAGIC_ENUM_VS_2017_WORKAROUND) - return n().size_ != 0; + return n().size_ != 0; #else - return n().size_ != 0; + return n().size_ != 0; #endif - } else { - return false; - } + } + else + { + return false; + } } -enum class enum_subtype { - common, - flags -}; +enum class enum_subtype { common, flags }; -template > -constexpr U ualue(std::size_t i) noexcept { - if constexpr (std::is_same_v) { // bool special case - static_assert(O == 0, "magic_enum::detail::ualue requires valid offset."); +template < + typename E, + int O, + enum_subtype S, + typename U = std::underlying_type_t> +constexpr U +ualue(std::size_t i) noexcept +{ + if constexpr (std::is_same_v) + { // bool special case + static_assert( + O == 0, "magic_enum::detail::ualue requires valid offset."); - return static_cast(i); - } else if constexpr (S == enum_subtype::flags) { - return static_cast(U{1} << static_cast(static_cast(i) + O)); - } else { - return static_cast(static_cast(i) + O); - } + return static_cast(i); + } + else if constexpr (S == enum_subtype::flags) + { + return static_cast(U{1} << static_cast(static_cast(i) + O)); + } + else + { + return static_cast(static_cast(i) + O); + } } -template > -constexpr E value(std::size_t i) noexcept { - return static_cast(ualue(i)); +template < + typename E, + int O, + enum_subtype S, + typename U = std::underlying_type_t> +constexpr E +value(std::size_t i) noexcept +{ + return static_cast(ualue(i)); } template > -constexpr int reflected_min() noexcept { - if constexpr (S == enum_subtype::flags) { - return 0; - } else { - constexpr auto lhs = range_min::value; - constexpr auto rhs = (std::numeric_limits::min)(); - - if constexpr (cmp_less(rhs, lhs)) { - return lhs; - } else { - return rhs; +constexpr int +reflected_min() noexcept +{ + if constexpr (S == enum_subtype::flags) + { + return 0; + } + else + { + constexpr auto lhs = range_min::value; + constexpr auto rhs = (std::numeric_limits::min)(); + + if constexpr (cmp_less(rhs, lhs)) + { + return lhs; + } + else + { + return rhs; + } } - } } template > -constexpr int reflected_max() noexcept { - if constexpr (S == enum_subtype::flags) { - return std::numeric_limits::digits - 1; - } else { - constexpr auto lhs = range_max::value; - constexpr auto rhs = (std::numeric_limits::max)(); - - if constexpr (cmp_less(lhs, rhs)) { - return lhs; - } else { - return rhs; +constexpr int +reflected_max() noexcept +{ + if constexpr (S == enum_subtype::flags) + { + return std::numeric_limits::digits - 1; + } + else + { + constexpr auto lhs = range_max::value; + constexpr auto rhs = (std::numeric_limits::max)(); + + if constexpr (cmp_less(lhs, rhs)) + { + return lhs; + } + else + { + return rhs; + } } - } } -#define MAGIC_ENUM_FOR_EACH_256(T) \ - T( 0)T( 1)T( 2)T( 3)T( 4)T( 5)T( 6)T( 7)T( 8)T( 9)T( 10)T( 11)T( 12)T( 13)T( 14)T( 15)T( 16)T( 17)T( 18)T( 19)T( 20)T( 21)T( 22)T( 23)T( 24)T( 25)T( 26)T( 27)T( 28)T( 29)T( 30)T( 31) \ - T( 32)T( 33)T( 34)T( 35)T( 36)T( 37)T( 38)T( 39)T( 40)T( 41)T( 42)T( 43)T( 44)T( 45)T( 46)T( 47)T( 48)T( 49)T( 50)T( 51)T( 52)T( 53)T( 54)T( 55)T( 56)T( 57)T( 58)T( 59)T( 60)T( 61)T( 62)T( 63) \ - T( 64)T( 65)T( 66)T( 67)T( 68)T( 69)T( 70)T( 71)T( 72)T( 73)T( 74)T( 75)T( 76)T( 77)T( 78)T( 79)T( 80)T( 81)T( 82)T( 83)T( 84)T( 85)T( 86)T( 87)T( 88)T( 89)T( 90)T( 91)T( 92)T( 93)T( 94)T( 95) \ - T( 96)T( 97)T( 98)T( 99)T(100)T(101)T(102)T(103)T(104)T(105)T(106)T(107)T(108)T(109)T(110)T(111)T(112)T(113)T(114)T(115)T(116)T(117)T(118)T(119)T(120)T(121)T(122)T(123)T(124)T(125)T(126)T(127) \ - T(128)T(129)T(130)T(131)T(132)T(133)T(134)T(135)T(136)T(137)T(138)T(139)T(140)T(141)T(142)T(143)T(144)T(145)T(146)T(147)T(148)T(149)T(150)T(151)T(152)T(153)T(154)T(155)T(156)T(157)T(158)T(159) \ - T(160)T(161)T(162)T(163)T(164)T(165)T(166)T(167)T(168)T(169)T(170)T(171)T(172)T(173)T(174)T(175)T(176)T(177)T(178)T(179)T(180)T(181)T(182)T(183)T(184)T(185)T(186)T(187)T(188)T(189)T(190)T(191) \ - T(192)T(193)T(194)T(195)T(196)T(197)T(198)T(199)T(200)T(201)T(202)T(203)T(204)T(205)T(206)T(207)T(208)T(209)T(210)T(211)T(212)T(213)T(214)T(215)T(216)T(217)T(218)T(219)T(220)T(221)T(222)T(223) \ - T(224)T(225)T(226)T(227)T(228)T(229)T(230)T(231)T(232)T(233)T(234)T(235)T(236)T(237)T(238)T(239)T(240)T(241)T(242)T(243)T(244)T(245)T(246)T(247)T(248)T(249)T(250)T(251)T(252)T(253)T(254)T(255) +#define MAGIC_ENUM_FOR_EACH_256(T) \ + T(0) \ + T(1) T(2) T(3) T(4) T(5) T(6) T(7) T(8) T(9) T(10) T(11) T(12) T(13) T(14) \ + T(15) T(16) T(17) T(18) T(19) T(20) T(21) T(22) T(23) T(24) T(25) T( \ + 26) T(27) T(28) T(29) T(30) T(31) T(32) T(33) T(34) T(35) T(36) \ + T(37) T(38) T(39) T(40) T(41) T(42) T(43) T(44) T(45) T(46) T(47) \ + T(48) T(49) T(50) T(51) T(52) T(53) T(54) T(55) T(56) T(57) \ + T(58) T(59) T(60) T(61) T(62) T(63) T(64) T(65) T(66) \ + T(67) T(68) T(69) T(70) T(71) T(72) T(73) T(74) T(75) \ + T(76) T(77) T(78) T(79) T(80) T(81) T(82) T(83) \ + T(84) T(85) T(86) T(87) T(88) T(89) T(90) T( \ + 91) T(92) T(93) \ + T(94) T( \ + 95) T(96) T(97) \ + T(98) T( \ + 99) T(100) T(101) T(102) \ + T(103) T(104) T(105) T( \ + 106) T(107) T(108) T(109) T(110) \ + T(111) T(112) T(113) T( \ + 114) T(115) T(116) T(117) \ + T(118) T(119) T(120) T(121) T(122) T(123) T( \ + 124) T(125) T(126) T(127) T(128) \ + T(129) T(130) T(131) T( \ + 132) T(133) T(134) T(135) T(136) \ + T(137) T(138) T(139) T( \ + 140) T(141) T(142) T(143) T(144) \ + T(145) T(146) T(147) T( \ + 148) T(149) T(150) T(151) T(152) \ + T(153) T(154) T(155) T( \ + 156) T(157) T(158) T(159) \ + T(160) T(161) T(162) T( \ + 163) T(164) T(165) \ + T(166) T(167) T(168) T( \ + 169) T(170) T(171) \ + T(172) T(173) T( \ + 174) T(175) \ + T(176) T( \ + 177) T(178) \ + T(179) T( \ + 180) \ + T(181) T(182) T(183) T(184) T(185) T(186) T(187) T(188) T(189) T(190) T(191) T(192) T(193) T(194) T(195) T(196) T(197) T(198) T(199) T(200) T(201) T(202) T(203) T(204) T(205) T(206) T(207) T(208) T(209) T(210) T(211) T(212) T(213) T(214) T(215) T(216) T(217) T(218) T(219) T(220) T(221) T(222) T(223) T(224) T(225) T(226) T( \ + 227) T(228) \ + T(229) T( \ + 230) \ + T( \ + 231) T(232) T(233) T(234) T(235) T(236) T(237) T(238) T(239) T(240) T(241) T(242) T(243) T(244) T(245) T(246) T(247) T(248) T(249) T(250) T(251) T(252) \ + T(253) T( \ + 254) \ + T(255) template -constexpr void valid_count(bool* valid, std::size_t& count) noexcept { -#define MAGIC_ENUM_V(O) \ - if constexpr ((I + O) < Size) { \ - if constexpr (is_valid(I + O)>()) { \ - valid[I + O] = true; \ - ++count; \ - } \ - } +constexpr void +valid_count(bool* valid, std::size_t& count) noexcept +{ +#define MAGIC_ENUM_V(O) \ + if constexpr ((I + O) < Size) \ + { \ + if constexpr (is_valid(I + O)>()) \ + { \ + valid[I + O] = true; \ + ++count; \ + } \ + } - MAGIC_ENUM_FOR_EACH_256(MAGIC_ENUM_V) + MAGIC_ENUM_FOR_EACH_256(MAGIC_ENUM_V) - if constexpr ((I + 256) < Size) { - valid_count(valid, count); - } + if constexpr ((I + 256) < Size) + { + valid_count(valid, count); + } #undef MAGIC_ENUM_V } template -struct valid_count_t { - std::size_t count = 0; - bool valid[N] = {}; +struct valid_count_t +{ + std::size_t count = 0; + bool valid[N] = {}; }; template -constexpr auto valid_count() noexcept { - valid_count_t vc; - valid_count(vc.valid, vc.count); - return vc; +constexpr auto +valid_count() noexcept +{ + valid_count_t vc; + valid_count(vc.valid, vc.count); + return vc; } template -constexpr auto values() noexcept { - constexpr auto vc = valid_count(); +constexpr auto +values() noexcept +{ + constexpr auto vc = valid_count(); - if constexpr (vc.count > 0) { + if constexpr (vc.count > 0) + { #if defined(MAGIC_ENUM_ARRAY_CONSTEXPR) - std::array values = {}; + std::array values = {}; #else - E values[vc.count] = {}; + E values[vc.count] = {}; +#endif + for (std::size_t i = 0, v = 0; v < vc.count; ++i) + { + if (vc.valid[i]) + { + values[v++] = value(i); + } + } +#if defined(MAGIC_ENUM_ARRAY_CONSTEXPR) + return values; +#else + return to_array(values, std::make_index_sequence{}); #endif - for (std::size_t i = 0, v = 0; v < vc.count; ++i) { - if (vc.valid[i]) { - values[v++] = value(i); - } } -#if defined(MAGIC_ENUM_ARRAY_CONSTEXPR) - return values; -#else - return to_array(values, std::make_index_sequence{}); -#endif - } else { - return std::array{}; - } + else + { + return std::array{}; + } } template > -constexpr auto values() noexcept { - constexpr auto min = reflected_min(); - constexpr auto max = reflected_max(); - constexpr auto range_size = max - min + 1; - static_assert(range_size > 0, "magic_enum::enum_range requires valid size."); +constexpr auto +values() noexcept +{ + constexpr auto min = reflected_min(); + constexpr auto max = reflected_max(); + constexpr auto range_size = max - min + 1; + static_assert( + range_size > 0, "magic_enum::enum_range requires valid size."); - return values(); + return values(); } template > -constexpr enum_subtype subtype(std::true_type) noexcept { - if constexpr (std::is_same_v) { // bool special case - return enum_subtype::common; - } else if constexpr (has_is_flags::value) { - return customize::enum_range::is_flags ? enum_subtype::flags : enum_subtype::common; - } else { -#if defined(MAGIC_ENUM_AUTO_IS_FLAGS) - constexpr auto flags_values = values(); - constexpr auto default_values = values(); - if (flags_values.size() == 0 || default_values.size() > flags_values.size()) { - return enum_subtype::common; - } - for (std::size_t i = 0; i < default_values.size(); ++i) { - const auto v = static_cast(default_values[i]); - if (v != 0 && (v & (v - 1)) != 0) { +constexpr enum_subtype subtype(std::true_type) noexcept +{ + if constexpr (std::is_same_v) + { // bool special case return enum_subtype::common; - } } - return enum_subtype::flags; + else if constexpr (has_is_flags::value) + { + return customize::enum_range::is_flags ? enum_subtype::flags + : enum_subtype::common; + } + else + { +#if defined(MAGIC_ENUM_AUTO_IS_FLAGS) + constexpr auto flags_values = values(); + constexpr auto default_values = values(); + if (flags_values.size() == 0 || + default_values.size() > flags_values.size()) + { + return enum_subtype::common; + } + for (std::size_t i = 0; i < default_values.size(); ++i) + { + const auto v = static_cast(default_values[i]); + if (v != 0 && (v & (v - 1)) != 0) + { + return enum_subtype::common; + } + } + return enum_subtype::flags; #else - return enum_subtype::common; + return enum_subtype::common; #endif - } + } } template -constexpr enum_subtype subtype(std::false_type) noexcept { - // For non-enum type return default common subtype. - return enum_subtype::common; +constexpr enum_subtype subtype(std::false_type) noexcept +{ + // For non-enum type return default common subtype. + return enum_subtype::common; } template > @@ -818,48 +1224,68 @@ template inline constexpr auto count_v = values_v.size(); template > -inline constexpr auto min_v = (count_v > 0) ? static_cast(values_v.front()) : U{0}; +inline constexpr auto min_v = (count_v > 0) + ? static_cast(values_v.front()) + : U{0}; template > -inline constexpr auto max_v = (count_v > 0) ? static_cast(values_v.back()) : U{0}; +inline constexpr auto max_v = (count_v > 0) + ? static_cast(values_v.back()) + : U{0}; template -constexpr auto names(std::index_sequence) noexcept { - constexpr auto names = std::array{{enum_name_v[I]>...}}; - return names; +constexpr auto names(std::index_sequence) noexcept +{ + constexpr auto names = std::array{ + {enum_name_v[I]>...}}; + return names; } template -inline constexpr auto names_v = names(std::make_index_sequence>{}); +inline constexpr auto names_v = + names(std::make_index_sequence>{}); template > using names_t = decltype((names_v)); template -constexpr auto entries(std::index_sequence) noexcept { - constexpr auto entries = std::array, sizeof...(I)>{{{values_v[I], enum_name_v[I]>}...}}; - return entries; +constexpr auto entries(std::index_sequence) noexcept +{ + constexpr auto entries = + std::array, sizeof...(I)>{ + {{values_v[I], enum_name_v[I]>}...}}; + return entries; } template -inline constexpr auto entries_v = entries(std::make_index_sequence>{}); +inline constexpr auto entries_v = + entries(std::make_index_sequence>{}); template > using entries_t = decltype((entries_v)); template > -constexpr bool is_sparse() noexcept { - if constexpr (count_v == 0) { - return false; - } else if constexpr (std::is_same_v) { // bool special case - return false; - } else { - constexpr auto max = (S == enum_subtype::flags) ? log2(max_v) : max_v; - constexpr auto min = (S == enum_subtype::flags) ? log2(min_v) : min_v; - constexpr auto range_size = max - min + 1; +constexpr bool +is_sparse() noexcept +{ + if constexpr (count_v == 0) + { + return false; + } + else if constexpr (std::is_same_v) + { // bool special case + return false; + } + else + { + constexpr auto max = + (S == enum_subtype::flags) ? log2(max_v) : max_v; + constexpr auto min = + (S == enum_subtype::flags) ? log2(min_v) : min_v; + constexpr auto range_size = max - min + 1; - return range_size != count_v; - } + return range_size != count_v; + } } template > @@ -868,46 +1294,79 @@ inline constexpr bool is_sparse_v = is_sparse(); template struct is_reflected #if defined(MAGIC_ENUM_NO_CHECK_REFLECTED_ENUM) - : std::true_type {}; + : std::true_type +{ +}; #else - : std::bool_constant && (count_v != 0)> {}; + : std::bool_constant && (count_v != 0)> +{ +}; #endif template inline constexpr bool is_reflected_v = is_reflected, S>{}; template -struct enable_if_enum {}; - -template -struct enable_if_enum { - using type = R; - static_assert(supported::value, "magic_enum unsupported compiler (https://github.com/Neargye/magic_enum#compiler-compatibility)."); +struct enable_if_enum +{ }; -template , typename D = std::decay_t> -using enable_if_t = typename enable_if_enum && std::is_invocable_r_v, R>::type; +template +struct enable_if_enum +{ + using type = R; + static_assert( + supported::value, + "magic_enum unsupported compiler " + "(https://github.com/Neargye/magic_enum#compiler-compatibility)."); +}; -template >, int> = 0> +template < + typename T, + typename R, + typename BinaryPredicate = std::equal_to<>, + typename D = std::decay_t> +using enable_if_t = typename enable_if_enum< + std::is_enum_v && + std::is_invocable_r_v, + R>::type; + +template < + typename T, + std::enable_if_t>, int> = 0> using enum_concept = T; template > -struct is_scoped_enum : std::false_type {}; +struct is_scoped_enum : std::false_type +{ +}; template -struct is_scoped_enum : std::bool_constant>> {}; +struct is_scoped_enum + : std::bool_constant>> +{ +}; template > -struct is_unscoped_enum : std::false_type {}; +struct is_unscoped_enum : std::false_type +{ +}; template -struct is_unscoped_enum : std::bool_constant>> {}; +struct is_unscoped_enum + : std::bool_constant>> +{ +}; template >> -struct underlying_type {}; +struct underlying_type +{ +}; template -struct underlying_type : std::underlying_type> {}; +struct underlying_type : std::underlying_type> +{ +}; #if defined(MAGIC_ENUM_ENABLE_HASH) || defined(MAGIC_ENUM_ENABLE_HASH_SWITCH) @@ -915,212 +1374,330 @@ template struct constexpr_hash_t; template -struct constexpr_hash_t>> { - constexpr auto operator()(Value value) const noexcept { - using U = typename underlying_type::type; - if constexpr (std::is_same_v) { // bool special case - return static_cast(value); - } else { - return static_cast(value); +struct constexpr_hash_t>> +{ + constexpr auto + operator()(Value value) const noexcept + { + using U = typename underlying_type::type; + if constexpr (std::is_same_v) + { // bool special case + return static_cast(value); + } + else + { + return static_cast(value); + } } - } - using secondary_hash = constexpr_hash_t; + using secondary_hash = constexpr_hash_t; }; template -struct constexpr_hash_t>> { - static constexpr std::uint32_t crc_table[256] { - 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L, 0x706af48fL, 0xe963a535L, 0x9e6495a3L, - 0x0edb8832L, 0x79dcb8a4L, 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L, 0x90bf1d91L, - 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL, 0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, - 0x136c9856L, 0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L, 0xfa0f3d63L, 0x8d080df5L, - 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L, 0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL, - 0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L, 0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, - 0x26d930acL, 0x51de003aL, 0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L, 0xb8bda50fL, - 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L, 0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, - 0x76dc4190L, 0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL, 0x9fbfe4a5L, 0xe8b8d433L, - 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL, 0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L, - 0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL, 0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, - 0x65b0d9c6L, 0x12b7e950L, 0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L, 0xfbd44c65L, - 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L, 0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, - 0x4369e96aL, 0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L, 0xaa0a4c5fL, 0xdd0d7cc9L, - 0x5005713cL, 0x270241aaL, 0xbe0b1010L, 0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL, - 0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L, 0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, - 0xedb88320L, 0x9abfb3b6L, 0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L, 0x73dc1683L, - 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L, 0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, - 0xf00f9344L, 0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL, 0x196c3671L, 0x6e6b06e7L, - 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL, 0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L, - 0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L, 0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, - 0xd80d2bdaL, 0xaf0a1b4cL, 0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL, 0x4669be79L, - 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L, 0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, - 0xc5ba3bbeL, 0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L, 0x2cd99e8bL, 0x5bdeae1dL, - 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL, 0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L, - 0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL, 0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, - 0x86d3d2d4L, 0xf1d4e242L, 0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L, 0x18b74777L, - 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL, 0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, - 0xa00ae278L, 0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L, 0x4969474dL, 0x3e6e77dbL, - 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L, 0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L, - 0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L, 0xcdd70693L, 0x54de5729L, 0x23d967bfL, - 0xb3667a2eL, 0xc4614ab8L, 0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL, 0x2d02ef8dL - }; - constexpr std::uint32_t operator()(string_view value) const noexcept { - auto crc = static_cast(0xffffffffL); - for (const auto c : value) { - crc = (crc >> 8) ^ crc_table[(crc ^ static_cast(c)) & 0xff]; +struct constexpr_hash_t< + Value, + std::enable_if_t>> +{ + static constexpr std::uint32_t crc_table[256]{ + 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L, + 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L, + 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L, + 0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL, + 0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L, + 0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L, + 0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L, + 0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL, + 0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L, + 0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL, + 0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L, + 0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L, + 0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L, + 0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL, + 0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL, + 0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L, + 0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL, + 0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L, + 0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L, + 0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L, + 0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL, + 0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L, + 0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L, + 0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL, + 0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L, + 0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L, + 0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L, + 0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L, + 0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L, + 0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL, + 0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL, + 0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L, + 0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L, + 0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL, + 0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL, + 0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L, + 0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL, + 0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L, + 0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL, + 0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L, + 0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL, + 0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L, + 0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L, + 0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL, + 0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L, + 0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L, + 0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L, + 0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L, + 0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L, + 0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L, + 0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL, + 0x2d02ef8dL}; + constexpr std::uint32_t + operator()(string_view value) const noexcept + { + auto crc = static_cast(0xffffffffL); + for (const auto c : value) + { + crc = (crc >> 8) ^ + crc_table[(crc ^ static_cast(c)) & 0xff]; + } + return crc ^ 0xffffffffL; } - return crc ^ 0xffffffffL; - } - struct secondary_hash { - constexpr std::uint32_t operator()(string_view value) const noexcept { - auto acc = static_cast(2166136261ULL); - for (const auto c : value) { - acc = ((acc ^ static_cast(c)) * static_cast(16777619ULL)) & (std::numeric_limits::max)(); - } - return static_cast(acc); - } - }; + struct secondary_hash + { + constexpr std::uint32_t + operator()(string_view value) const noexcept + { + auto acc = static_cast(2166136261ULL); + for (const auto c : value) + { + acc = ((acc ^ static_cast(c)) * + static_cast(16777619ULL)) & + (std::numeric_limits::max)(); + } + return static_cast(acc); + } + }; }; template inline constexpr Hash hash_v{}; template -constexpr auto calculate_cases(std::size_t Page) noexcept { - constexpr std::array values = *GlobValues; - constexpr std::size_t size = values.size(); +constexpr auto +calculate_cases(std::size_t Page) noexcept +{ + constexpr std::array values = *GlobValues; + constexpr std::size_t size = values.size(); - using switch_t = std::invoke_result_t; - static_assert(std::is_integral_v && !std::is_same_v); - const std::size_t values_to = (std::min)(static_cast(256), size - Page); + using switch_t = + std::invoke_result_t; + static_assert( + std::is_integral_v && !std::is_same_v); + const std::size_t values_to = + (std::min)(static_cast(256), size - Page); - std::array result{}; - auto fill = result.begin(); - { - auto first = values.begin() + static_cast(Page); - auto last = values.begin() + static_cast(Page + values_to); - while (first != last) { - *fill++ = hash_v(*first++); + std::array result{}; + auto fill = result.begin(); + { + auto first = values.begin() + static_cast(Page); + auto last = + values.begin() + static_cast(Page + values_to); + while (first != last) + { + *fill++ = hash_v(*first++); + } } - } - // dead cases, try to avoid case collisions - for (switch_t last_value = result[values_to - 1]; fill != result.end() && last_value != (std::numeric_limits::max)(); *fill++ = ++last_value) { - } - - { - auto it = result.begin(); - auto last_value = (std::numeric_limits::min)(); - for (; fill != result.end(); *fill++ = last_value++) { - while (last_value == *it) { - ++last_value, ++it; - } + // dead cases, try to avoid case collisions + for (switch_t last_value = result[values_to - 1]; fill != result.end() && + last_value != (std::numeric_limits::max)(); + *fill++ = ++last_value) + { } - } - return result; + { + auto it = result.begin(); + auto last_value = (std::numeric_limits::min)(); + for (; fill != result.end(); *fill++ = last_value++) + { + while (last_value == *it) + { + ++last_value, ++it; + } + } + } + + return result; } template -constexpr R invoke_r(F&& f, Args&&... args) noexcept(std::is_nothrow_invocable_r_v) { - if constexpr (std::is_void_v) { - std::forward(f)(std::forward(args)...); - } else { - return static_cast(std::forward(f)(std::forward(args)...)); - } +constexpr R +invoke_r(F&& f, Args&&... args) noexcept( + std::is_nothrow_invocable_r_v) +{ + if constexpr (std::is_void_v) + { + std::forward(f)(std::forward(args)...); + } + else + { + return static_cast(std::forward(f)(std::forward(args)...)); + } } -enum class case_call_t { - index, - value -}; +enum class case_call_t { index, value }; template -inline constexpr auto default_result_type_lambda = []() noexcept(std::is_nothrow_default_constructible_v) { return T{}; }; +inline constexpr auto default_result_type_lambda = + []() noexcept(std::is_nothrow_default_constructible_v) { return T{}; }; template <> inline constexpr auto default_result_type_lambda = []() noexcept {}; template -constexpr bool has_duplicate() noexcept { - using value_t = std::decay_t; - using hash_value_t = std::invoke_result_t; - std::arraysize()> hashes{}; - std::size_t size = 0; - for (auto elem : *Arr) { - hashes[size] = hash_v(elem); - for (auto i = size++; i > 0; --i) { - if (hashes[i] < hashes[i - 1]) { - auto tmp = hashes[i]; - hashes[i] = hashes[i - 1]; - hashes[i - 1] = tmp; - } else if (hashes[i] == hashes[i - 1]) { - return false; - } else { - break; - } +constexpr bool +has_duplicate() noexcept +{ + using value_t = std::decay_t; + using hash_value_t = std::invoke_result_t; + std::arraysize()> hashes{}; + std::size_t size = 0; + for (auto elem : *Arr) + { + hashes[size] = hash_v(elem); + for (auto i = size++; i > 0; --i) + { + if (hashes[i] < hashes[i - 1]) + { + auto tmp = hashes[i]; + hashes[i] = hashes[i - 1]; + hashes[i - 1] = tmp; + } + else if (hashes[i] == hashes[i - 1]) + { + return false; + } + else + { + break; + } + } } - } - return true; + return true; } -#define MAGIC_ENUM_CASE(val) \ - case cases[val]: \ - if constexpr ((val) + Page < size) { \ - if (!pred(values[val + Page], searched)) { \ - break; \ - } \ - if constexpr (CallValue == case_call_t::index) { \ - if constexpr (std::is_invocable_r_v>) { \ - return detail::invoke_r(std::forward(lambda), std::integral_constant{}); \ - } else if constexpr (std::is_invocable_v>) { \ - MAGIC_ENUM_ASSERT(false && "magic_enum::detail::constexpr_switch wrong result type."); \ - } \ - } else if constexpr (CallValue == case_call_t::value) { \ - if constexpr (std::is_invocable_r_v>) { \ - return detail::invoke_r(std::forward(lambda), enum_constant{}); \ - } else if constexpr (std::is_invocable_r_v>) { \ - MAGIC_ENUM_ASSERT(false && "magic_enum::detail::constexpr_switch wrong result type."); \ - } \ - } \ - break; \ - } else [[fallthrough]]; +#define MAGIC_ENUM_CASE(val) \ + case cases[val]: \ + if constexpr ((val) + Page < size) \ + { \ + if (!pred(values[val + Page], searched)) \ + { \ + break; \ + } \ + if constexpr (CallValue == case_call_t::index) \ + { \ + if constexpr ( \ + std::is_invocable_r_v< \ + result_t, \ + Lambda, \ + std::integral_constant>) \ + { \ + return detail::invoke_r( \ + std::forward(lambda), \ + std::integral_constant{}); \ + } \ + else if constexpr ( \ + std::is_invocable_v< \ + Lambda, \ + std::integral_constant>) \ + { \ + MAGIC_ENUM_ASSERT( \ + false && \ + "magic_enum::detail::constexpr_switch wrong result " \ + "type."); \ + } \ + } \ + else if constexpr (CallValue == case_call_t::value) \ + { \ + if constexpr (std::is_invocable_r_v< \ + result_t, \ + Lambda, \ + enum_constant>) \ + { \ + return detail::invoke_r( \ + std::forward(lambda), \ + enum_constant{}); \ + } \ + else if constexpr (std::is_invocable_r_v< \ + result_t, \ + Lambda, \ + enum_constant>) \ + { \ + MAGIC_ENUM_ASSERT( \ + false && \ + "magic_enum::detail::constexpr_switch wrong result " \ + "type."); \ + } \ + } \ + break; \ + } \ + else \ + [[fallthrough]]; -template ::value_type>, - typename BinaryPredicate = std::equal_to<>, - typename Lambda, - typename ResultGetterType> -constexpr decltype(auto) constexpr_switch( +template < + auto* GlobValues, + case_call_t CallValue, + std::size_t Page = 0, + typename Hash = constexpr_hash_t< + typename std::decay_t::value_type>, + typename BinaryPredicate = std::equal_to<>, + typename Lambda, + typename ResultGetterType> +constexpr decltype(auto) +constexpr_switch( Lambda&& lambda, typename std::decay_t::value_type searched, ResultGetterType&& def, - BinaryPredicate&& pred = {}) { - using result_t = std::invoke_result_t; - using hash_t = std::conditional_t(), Hash, typename Hash::secondary_hash>; - static_assert(has_duplicate(), "magic_enum::detail::constexpr_switch duplicated hash found, please report it: https://github.com/Neargye/magic_enum/issues."); - constexpr std::array values = *GlobValues; - constexpr std::size_t size = values.size(); - constexpr std::array cases = calculate_cases(Page); + BinaryPredicate&& pred = {}) +{ + using result_t = std::invoke_result_t; + using hash_t = std::conditional_t< + has_duplicate(), + Hash, + typename Hash::secondary_hash>; + static_assert( + has_duplicate(), + "magic_enum::detail::constexpr_switch duplicated hash found, please " + "report it: https://github.com/Neargye/magic_enum/issues."); + constexpr std::array values = *GlobValues; + constexpr std::size_t size = values.size(); + constexpr std::array cases = calculate_cases(Page); - switch (hash_v(searched)) { - MAGIC_ENUM_FOR_EACH_256(MAGIC_ENUM_CASE) - default: - if constexpr (size > 256 + Page) { - return constexpr_switch(std::forward(lambda), searched, std::forward(def)); - } - break; - } - return def(); + switch (hash_v(searched)) + { + MAGIC_ENUM_FOR_EACH_256(MAGIC_ENUM_CASE) + default: + if constexpr (size > 256 + Page) + { + return constexpr_switch< + GlobValues, + CallValue, + Page + 256, + Hash>( + std::forward(lambda), + searched, + std::forward(def)); + } + break; + } + return def(); } #undef MAGIC_ENUM_CASE #endif -} // namespace magic_enum::detail +} // namespace detail // Checks is magic_enum supported compiler. inline constexpr bool is_magic_enum_supported = detail::supported::value; @@ -1129,25 +1706,38 @@ template using Enum = detail::enum_concept; // Checks whether T is an Unscoped enumeration type. -// Provides the member constant value which is equal to true, if T is an [Unscoped enumeration](https://en.cppreference.com/w/cpp/language/enum#Unscoped_enumeration) type. Otherwise, value is equal to false. +// Provides the member constant value which is equal to true, if T is an +// [Unscoped +// enumeration](https://en.cppreference.com/w/cpp/language/enum#Unscoped_enumeration) +// type. Otherwise, value is equal to false. template -struct is_unscoped_enum : detail::is_unscoped_enum {}; +struct is_unscoped_enum : detail::is_unscoped_enum +{ +}; template inline constexpr bool is_unscoped_enum_v = is_unscoped_enum::value; // Checks whether T is an Scoped enumeration type. -// Provides the member constant value which is equal to true, if T is an [Scoped enumeration](https://en.cppreference.com/w/cpp/language/enum#Scoped_enumerations) type. Otherwise, value is equal to false. +// Provides the member constant value which is equal to true, if T is an [Scoped +// enumeration](https://en.cppreference.com/w/cpp/language/enum#Scoped_enumerations) +// type. Otherwise, value is equal to false. template -struct is_scoped_enum : detail::is_scoped_enum {}; +struct is_scoped_enum : detail::is_scoped_enum +{ +}; template inline constexpr bool is_scoped_enum_v = is_scoped_enum::value; -// If T is a complete enumeration type, provides a member typedef type that names the underlying type of T. -// Otherwise, if T is not an enumeration type, there is no member type. Otherwise (T is an incomplete enumeration type), the program is ill-formed. +// If T is a complete enumeration type, provides a member typedef type that +// names the underlying type of T. Otherwise, if T is not an enumeration type, +// there is no member type. Otherwise (T is an incomplete enumeration type), the +// program is ill-formed. template -struct underlying_type : detail::underlying_type {}; +struct underlying_type : detail::underlying_type +{ +}; template using underlying_type_t = typename underlying_type::type; @@ -1157,312 +1747,464 @@ using enum_constant = detail::enum_constant; // Returns type name of enum. template -[[nodiscard]] constexpr auto enum_type_name() noexcept -> detail::enable_if_t { - constexpr string_view name = detail::type_name_v>; - static_assert(!name.empty(), "magic_enum::enum_type_name enum type does not have a name."); +[[nodiscard]] constexpr auto +enum_type_name() noexcept -> detail::enable_if_t +{ + constexpr string_view name = detail::type_name_v>; + static_assert( + !name.empty(), + "magic_enum::enum_type_name enum type does not have a name."); - return name; + return name; } // Returns number of enum values. template > -[[nodiscard]] constexpr auto enum_count() noexcept -> detail::enable_if_t { - return detail::count_v, S>; +[[nodiscard]] constexpr auto +enum_count() noexcept -> detail::enable_if_t +{ + return detail::count_v, S>; } // Returns enum value at specified index. -// No bounds checking is performed: the behavior is undefined if index >= number of enum values. +// No bounds checking is performed: the behavior is undefined if index >= number +// of enum values. template > -[[nodiscard]] constexpr auto enum_value(std::size_t index) noexcept -> detail::enable_if_t> { - using D = std::decay_t; - static_assert(detail::is_reflected_v, "magic_enum requires enum implementation and valid max and min."); +[[nodiscard]] constexpr auto +enum_value(std::size_t index) noexcept + -> detail::enable_if_t> +{ + using D = std::decay_t; + static_assert( + detail::is_reflected_v, + "magic_enum requires enum implementation and valid max and min."); - if constexpr (detail::is_sparse_v) { - return MAGIC_ENUM_ASSERT(index < detail::count_v), detail::values_v[index]; - } else { - constexpr auto min = (S == detail::enum_subtype::flags) ? detail::log2(detail::min_v) : detail::min_v; + if constexpr (detail::is_sparse_v) + { + return MAGIC_ENUM_ASSERT(index < detail::count_v), + detail::values_v[index]; + } + else + { + constexpr auto min = (S == detail::enum_subtype::flags) + ? detail::log2(detail::min_v) + : detail::min_v; - return MAGIC_ENUM_ASSERT(index < detail::count_v), detail::value(index); - } + return MAGIC_ENUM_ASSERT(index < detail::count_v), + detail::value(index); + } } // Returns enum value at specified index. -template > -[[nodiscard]] constexpr auto enum_value() noexcept -> detail::enable_if_t> { - using D = std::decay_t; - static_assert(detail::is_reflected_v, "magic_enum requires enum implementation and valid max and min."); - static_assert(I < detail::count_v, "magic_enum::enum_value out of range."); +template < + typename E, + std::size_t I, + detail::enum_subtype S = detail::subtype_v> +[[nodiscard]] constexpr auto +enum_value() noexcept -> detail::enable_if_t> +{ + using D = std::decay_t; + static_assert( + detail::is_reflected_v, + "magic_enum requires enum implementation and valid max and min."); + static_assert( + I < detail::count_v, "magic_enum::enum_value out of range."); - return enum_value(I); + return enum_value(I); } // Returns std::array with enum values, sorted by enum value. template > -[[nodiscard]] constexpr auto enum_values() noexcept -> detail::enable_if_t> { - using D = std::decay_t; - static_assert(detail::is_reflected_v, "magic_enum requires enum implementation and valid max and min."); +[[nodiscard]] constexpr auto +enum_values() noexcept -> detail::enable_if_t> +{ + using D = std::decay_t; + static_assert( + detail::is_reflected_v, + "magic_enum requires enum implementation and valid max and min."); - return detail::values_v; + return detail::values_v; } // Returns integer value from enum value. template -[[nodiscard]] constexpr auto enum_integer(E value) noexcept -> detail::enable_if_t> { - return static_cast>(value); +[[nodiscard]] constexpr auto +enum_integer(E value) noexcept -> detail::enable_if_t> +{ + return static_cast>(value); } // Returns underlying value from enum value. template -[[nodiscard]] constexpr auto enum_underlying(E value) noexcept -> detail::enable_if_t> { - return static_cast>(value); +[[nodiscard]] constexpr auto +enum_underlying(E value) noexcept + -> detail::enable_if_t> +{ + return static_cast>(value); } // Obtains index in enum values from enum value. // Returns optional with index. template > -[[nodiscard]] constexpr auto enum_index(E value) noexcept -> detail::enable_if_t> { - using D = std::decay_t; - using U = underlying_type_t; - static_assert(detail::is_reflected_v, "magic_enum requires enum implementation and valid max and min."); +[[nodiscard]] constexpr auto +enum_index(E value) noexcept -> detail::enable_if_t> +{ + using D = std::decay_t; + using U = underlying_type_t; + static_assert( + detail::is_reflected_v, + "magic_enum requires enum implementation and valid max and min."); - if constexpr (detail::is_sparse_v || (S == detail::enum_subtype::flags)) { + if constexpr ( + detail::is_sparse_v || (S == detail::enum_subtype::flags)) + { #if defined(MAGIC_ENUM_ENABLE_HASH) - return detail::constexpr_switch<&detail::values_v, detail::case_call_t::index>( - [](std::size_t i) { return optional{i}; }, - value, - detail::default_result_type_lambda>); + return detail::constexpr_switch< + &detail::values_v, + detail::case_call_t::index>( + [](std::size_t i) { return optional{i}; }, + value, + detail::default_result_type_lambda>); #else - for (std::size_t i = 0; i < detail::count_v; ++i) { - if (enum_value(i) == value) { - return i; - } - } - return {}; // Invalid value or out of range. + for (std::size_t i = 0; i < detail::count_v; ++i) + { + if (enum_value(i) == value) + { + return i; + } + } + return {}; // Invalid value or out of range. #endif - } else { - const auto v = static_cast(value); - if (v >= detail::min_v && v <= detail::max_v) { - return static_cast(v - detail::min_v); } - return {}; // Invalid value or out of range. - } + else + { + const auto v = static_cast(value); + if (v >= detail::min_v && v <= detail::max_v) + { + return static_cast(v - detail::min_v); + } + return {}; // Invalid value or out of range. + } } // Obtains index in enum values from enum value. // Returns optional with index. template -[[nodiscard]] constexpr auto enum_index(E value) noexcept -> detail::enable_if_t> { - using D = std::decay_t; - static_assert(detail::is_reflected_v, "magic_enum requires enum implementation and valid max and min."); +[[nodiscard]] constexpr auto +enum_index(E value) noexcept -> detail::enable_if_t> +{ + using D = std::decay_t; + static_assert( + detail::is_reflected_v, + "magic_enum requires enum implementation and valid max and min."); - return enum_index(value); + return enum_index(value); } // Obtains index in enum values from static storage enum variable. -template >> -[[nodiscard]] constexpr auto enum_index() noexcept -> detail::enable_if_t {\ - using D = std::decay_t; - static_assert(detail::is_reflected_v, "magic_enum requires enum implementation and valid max and min."); - constexpr auto index = enum_index(V); - static_assert(index, "magic_enum::enum_index enum value does not have a index."); +template < + auto V, + detail::enum_subtype S = detail::subtype_v>> +[[nodiscard]] constexpr auto +enum_index() noexcept -> detail::enable_if_t +{ + using D = std::decay_t; + static_assert( + detail::is_reflected_v, + "magic_enum requires enum implementation and valid max and min."); + constexpr auto index = enum_index(V); + static_assert( + index, "magic_enum::enum_index enum value does not have a index."); - return *index; + return *index; } // Returns name from static storage enum variable. -// This version is much lighter on the compile times and is not restricted to the enum_range limitation. +// This version is much lighter on the compile times and is not restricted to +// the enum_range limitation. template -[[nodiscard]] constexpr auto enum_name() noexcept -> detail::enable_if_t { - constexpr string_view name = detail::enum_name_v, V>; - static_assert(!name.empty(), "magic_enum::enum_name enum value does not have a name."); +[[nodiscard]] constexpr auto +enum_name() noexcept -> detail::enable_if_t +{ + constexpr string_view name = + detail::enum_name_v, V>; + static_assert( + !name.empty(), + "magic_enum::enum_name enum value does not have a name."); - return name; + return name; } // Returns name from enum value. // If enum value does not have name or value out of range, returns empty string. template > -[[nodiscard]] constexpr auto enum_name(E value) noexcept -> detail::enable_if_t { - using D = std::decay_t; - static_assert(detail::is_reflected_v, "magic_enum requires enum implementation and valid max and min."); +[[nodiscard]] constexpr auto +enum_name(E value) noexcept -> detail::enable_if_t +{ + using D = std::decay_t; + static_assert( + detail::is_reflected_v, + "magic_enum requires enum implementation and valid max and min."); - if (const auto i = enum_index(value)) { - return detail::names_v[*i]; - } - return {}; + if (const auto i = enum_index(value)) + { + return detail::names_v[*i]; + } + return {}; } // Returns name from enum value. // If enum value does not have name or value out of range, returns empty string. template -[[nodiscard]] constexpr auto enum_name(E value) -> detail::enable_if_t { - using D = std::decay_t; - static_assert(detail::is_reflected_v, "magic_enum requires enum implementation and valid max and min."); +[[nodiscard]] constexpr auto +enum_name(E value) -> detail::enable_if_t +{ + using D = std::decay_t; + static_assert( + detail::is_reflected_v, + "magic_enum requires enum implementation and valid max and min."); - return enum_name(value); + return enum_name(value); } // Returns std::array with names, sorted by enum value. template > -[[nodiscard]] constexpr auto enum_names() noexcept -> detail::enable_if_t> { - using D = std::decay_t; - static_assert(detail::is_reflected_v, "magic_enum requires enum implementation and valid max and min."); +[[nodiscard]] constexpr auto +enum_names() noexcept -> detail::enable_if_t> +{ + using D = std::decay_t; + static_assert( + detail::is_reflected_v, + "magic_enum requires enum implementation and valid max and min."); - return detail::names_v; + return detail::names_v; } // Returns std::array with pairs (value, name), sorted by enum value. template > -[[nodiscard]] constexpr auto enum_entries() noexcept -> detail::enable_if_t> { - using D = std::decay_t; - static_assert(detail::is_reflected_v, "magic_enum requires enum implementation and valid max and min."); +[[nodiscard]] constexpr auto +enum_entries() noexcept -> detail::enable_if_t> +{ + using D = std::decay_t; + static_assert( + detail::is_reflected_v, + "magic_enum requires enum implementation and valid max and min."); - return detail::entries_v; + return detail::entries_v; } -// Allows you to write magic_enum::enum_cast("bar", magic_enum::case_insensitive); +// Allows you to write magic_enum::enum_cast("bar", +// magic_enum::case_insensitive); inline constexpr auto case_insensitive = detail::case_insensitive<>{}; // Obtains enum value from integer value. // Returns optional with enum value. template > -[[nodiscard]] constexpr auto enum_cast(underlying_type_t value) noexcept -> detail::enable_if_t>> { - using D = std::decay_t; - static_assert(detail::is_reflected_v, "magic_enum requires enum implementation and valid max and min."); +[[nodiscard]] constexpr auto +enum_cast(underlying_type_t value) noexcept + -> detail::enable_if_t>> +{ + using D = std::decay_t; + static_assert( + detail::is_reflected_v, + "magic_enum requires enum implementation and valid max and min."); - if constexpr (detail::is_sparse_v || (S == detail::enum_subtype::flags)) { + if constexpr ( + detail::is_sparse_v || (S == detail::enum_subtype::flags)) + { #if defined(MAGIC_ENUM_ENABLE_HASH) - return detail::constexpr_switch<&detail::values_v, detail::case_call_t::value>( - [](D v) { return optional{v}; }, - static_cast(value), - detail::default_result_type_lambda>); + return detail::constexpr_switch< + &detail::values_v, + detail::case_call_t::value>( + [](D v) { return optional{v}; }, + static_cast(value), + detail::default_result_type_lambda>); #else - for (std::size_t i = 0; i < detail::count_v; ++i) { - if (value == static_cast>(enum_value(i))) { - return static_cast(value); - } - } - return {}; // Invalid value or out of range. + for (std::size_t i = 0; i < detail::count_v; ++i) + { + if (value == static_cast>(enum_value(i))) + { + return static_cast(value); + } + } + return {}; // Invalid value or out of range. #endif - } else { - if (value >= detail::min_v && value <= detail::max_v) { - return static_cast(value); } - return {}; // Invalid value or out of range. - } + else + { + if (value >= detail::min_v && value <= detail::max_v) + { + return static_cast(value); + } + return {}; // Invalid value or out of range. + } } // Obtains enum value from name. // Returns optional with enum value. -template , typename BinaryPredicate = std::equal_to<>> -[[nodiscard]] constexpr auto enum_cast(string_view value, [[maybe_unused]] BinaryPredicate p = {}) noexcept(detail::is_nothrow_invocable()) -> detail::enable_if_t>, BinaryPredicate> { - using D = std::decay_t; - static_assert(detail::is_reflected_v, "magic_enum requires enum implementation and valid max and min."); +template < + typename E, + detail::enum_subtype S = detail::subtype_v, + typename BinaryPredicate = std::equal_to<>> +[[nodiscard]] constexpr auto +enum_cast(string_view value, [[maybe_unused]] BinaryPredicate p = {}) noexcept( + detail::is_nothrow_invocable()) + -> detail::enable_if_t>, BinaryPredicate> +{ + using D = std::decay_t; + static_assert( + detail::is_reflected_v, + "magic_enum requires enum implementation and valid max and min."); #if defined(MAGIC_ENUM_ENABLE_HASH) - if constexpr (detail::is_default_predicate()) { - return detail::constexpr_switch<&detail::names_v, detail::case_call_t::index>( - [](std::size_t i) { return optional{detail::values_v[i]}; }, - value, - detail::default_result_type_lambda>, - [&p](string_view lhs, string_view rhs) { return detail::cmp_equal(lhs, rhs, p); }); - } -#endif - for (std::size_t i = 0; i < detail::count_v; ++i) { - if (detail::cmp_equal(value, detail::names_v[i], p)) { - return enum_value(i); + if constexpr (detail::is_default_predicate()) + { + return detail::constexpr_switch< + &detail::names_v, + detail::case_call_t::index>( + [](std::size_t i) { + return optional{detail::values_v[i]}; + }, + value, + detail::default_result_type_lambda>, + [&p](string_view lhs, string_view rhs) { + return detail::cmp_equal(lhs, rhs, p); + }); } - } - return {}; // Invalid value or out of range. +#endif + for (std::size_t i = 0; i < detail::count_v; ++i) + { + if (detail::cmp_equal(value, detail::names_v[i], p)) + { + return enum_value(i); + } + } + return {}; // Invalid value or out of range. } // Checks whether enum contains value with such value. template > -[[nodiscard]] constexpr auto enum_contains(E value) noexcept -> detail::enable_if_t { - using D = std::decay_t; - using U = underlying_type_t; +[[nodiscard]] constexpr auto +enum_contains(E value) noexcept -> detail::enable_if_t +{ + using D = std::decay_t; + using U = underlying_type_t; - return static_cast(enum_cast(static_cast(value))); + return static_cast(enum_cast(static_cast(value))); } // Checks whether enum contains value with such value. template -[[nodiscard]] constexpr auto enum_contains(E value) noexcept -> detail::enable_if_t { - using D = std::decay_t; - using U = underlying_type_t; +[[nodiscard]] constexpr auto +enum_contains(E value) noexcept -> detail::enable_if_t +{ + using D = std::decay_t; + using U = underlying_type_t; - return static_cast(enum_cast(static_cast(value))); + return static_cast(enum_cast(static_cast(value))); } // Checks whether enum contains value with such integer value. template > -[[nodiscard]] constexpr auto enum_contains(underlying_type_t value) noexcept -> detail::enable_if_t { - using D = std::decay_t; +[[nodiscard]] constexpr auto +enum_contains(underlying_type_t value) noexcept + -> detail::enable_if_t +{ + using D = std::decay_t; - return static_cast(enum_cast(value)); + return static_cast(enum_cast(value)); } // Checks whether enum contains enumerator with such name. -template , typename BinaryPredicate = std::equal_to<>> -[[nodiscard]] constexpr auto enum_contains(string_view value, BinaryPredicate p = {}) noexcept(detail::is_nothrow_invocable()) -> detail::enable_if_t { - using D = std::decay_t; +template < + typename E, + detail::enum_subtype S = detail::subtype_v, + typename BinaryPredicate = std::equal_to<>> +[[nodiscard]] constexpr auto +enum_contains(string_view value, BinaryPredicate p = {}) noexcept( + detail::is_nothrow_invocable()) + -> detail::enable_if_t +{ + using D = std::decay_t; - return static_cast(enum_cast(value, std::move(p))); + return static_cast(enum_cast(value, std::move(p))); } template -inline constexpr auto as_flags = AsFlags ? detail::enum_subtype::flags : detail::enum_subtype::common; +inline constexpr auto as_flags = + AsFlags ? detail::enum_subtype::flags : detail::enum_subtype::common; template -inline constexpr auto as_common = AsFlags ? detail::enum_subtype::common : detail::enum_subtype::flags; +inline constexpr auto as_common = + AsFlags ? detail::enum_subtype::common : detail::enum_subtype::flags; namespace bitwise_operators { template = 0> -constexpr E operator~(E rhs) noexcept { - return static_cast(~static_cast>(rhs)); +constexpr E +operator~(E rhs) noexcept +{ + return static_cast(~static_cast>(rhs)); } template = 0> -constexpr E operator|(E lhs, E rhs) noexcept { - return static_cast(static_cast>(lhs) | static_cast>(rhs)); +constexpr E +operator|(E lhs, E rhs) noexcept +{ + return static_cast( + static_cast>(lhs) | + static_cast>(rhs)); } template = 0> -constexpr E operator&(E lhs, E rhs) noexcept { - return static_cast(static_cast>(lhs) & static_cast>(rhs)); +constexpr E +operator&(E lhs, E rhs) noexcept +{ + return static_cast( + static_cast>(lhs) & + static_cast>(rhs)); } template = 0> -constexpr E operator^(E lhs, E rhs) noexcept { - return static_cast(static_cast>(lhs) ^ static_cast>(rhs)); +constexpr E +operator^(E lhs, E rhs) noexcept +{ + return static_cast( + static_cast>(lhs) ^ + static_cast>(rhs)); } template = 0> -constexpr E& operator|=(E& lhs, E rhs) noexcept { - return lhs = (lhs | rhs); +constexpr E& +operator|=(E& lhs, E rhs) noexcept +{ + return lhs = (lhs | rhs); } template = 0> -constexpr E& operator&=(E& lhs, E rhs) noexcept { - return lhs = (lhs & rhs); +constexpr E& +operator&=(E& lhs, E rhs) noexcept +{ + return lhs = (lhs & rhs); } template = 0> -constexpr E& operator^=(E& lhs, E rhs) noexcept { - return lhs = (lhs ^ rhs); +constexpr E& +operator^=(E& lhs, E rhs) noexcept +{ + return lhs = (lhs ^ rhs); } -} // namespace magic_enum::bitwise_operators +} // namespace bitwise_operators -} // namespace magic_enum +} // namespace magic_enum #if defined(__clang__) -# pragma clang diagnostic pop +#pragma clang diagnostic pop #elif defined(__GNUC__) -# pragma GCC diagnostic pop +#pragma GCC diagnostic pop #elif defined(_MSC_VER) -# pragma warning(pop) +#pragma warning(pop) #endif #undef MAGIC_ENUM_GET_ENUM_NAME_BUILTIN @@ -1471,4 +2213,4 @@ constexpr E& operator^=(E& lhs, E rhs) noexcept { #undef MAGIC_ENUM_ARRAY_CONSTEXPR #undef MAGIC_ENUM_FOR_EACH_256 -#endif // NEARGYE_MAGIC_ENUM_HPP \ No newline at end of file +#endif // NEARGYE_MAGIC_ENUM_HPP \ No newline at end of file diff --git a/src/test/app/AMMCalc_test.cpp b/src/test/app/AMMCalc_test.cpp index c16541797..058cdfd1d 100644 --- a/src/test/app/AMMCalc_test.cpp +++ b/src/test/app/AMMCalc_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include #include diff --git a/src/test/app/AMMExtended_test.cpp b/src/test/app/AMMExtended_test.cpp index 16a7bd10a..e09b14e89 100644 --- a/src/test/app/AMMExtended_test.cpp +++ b/src/test/app/AMMExtended_test.cpp @@ -16,6 +16,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== +#include +#include +#include +#include +#include +#include #include #include #include @@ -23,18 +29,12 @@ #include #include #include +#include +#include #include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include #include #include diff --git a/src/test/app/AMM_test.cpp b/src/test/app/AMM_test.cpp index 453847b44..999b41c28 100644 --- a/src/test/app/AMM_test.cpp +++ b/src/test/app/AMM_test.cpp @@ -16,23 +16,23 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/test/app/AccountDelete_test.cpp b/src/test/app/AccountDelete_test.cpp index 938ef9c2e..11a9ee513 100644 --- a/src/test/app/AccountDelete_test.cpp +++ b/src/test/app/AccountDelete_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/app/AccountTxPaging_test.cpp b/src/test/app/AccountTxPaging_test.cpp index 16477108a..70c90f2ef 100644 --- a/src/test/app/AccountTxPaging_test.cpp +++ b/src/test/app/AccountTxPaging_test.cpp @@ -16,15 +16,15 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== +#include #include #include #include #include -#include +#include #include #include -#include namespace ripple { diff --git a/src/test/app/AmendmentTable_test.cpp b/src/test/app/AmendmentTable_test.cpp index b41eea079..2f95fc028 100644 --- a/src/test/app/AmendmentTable_test.cpp +++ b/src/test/app/AmendmentTable_test.cpp @@ -17,12 +17,14 @@ */ //============================================================================== +#include +#include #include +#include #include #include #include #include -#include #include #include #include @@ -30,8 +32,6 @@ #include #include #include -#include -#include namespace ripple { diff --git a/src/test/app/BaseFee_test.cpp b/src/test/app/BaseFee_test.cpp index 13c5273d6..b6600e40f 100644 --- a/src/test/app/BaseFee_test.cpp +++ b/src/test/app/BaseFee_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include #include #include #include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/app/Check_test.cpp b/src/test/app/Check_test.cpp index 6b2deb237..31b45abf4 100644 --- a/src/test/app/Check_test.cpp +++ b/src/test/app/Check_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/app/ClaimReward_test.cpp b/src/test/app/ClaimReward_test.cpp index 907786d85..b23b29fc7 100644 --- a/src/test/app/ClaimReward_test.cpp +++ b/src/test/app/ClaimReward_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== +#include #include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/app/Clawback_test.cpp b/src/test/app/Clawback_test.cpp index e765504f4..a6909bb2f 100644 --- a/src/test/app/Clawback_test.cpp +++ b/src/test/app/Clawback_test.cpp @@ -17,14 +17,14 @@ */ //============================================================================== +#include +#include +#include #include #include -#include #include #include #include -#include -#include namespace ripple { diff --git a/src/test/app/CrossingLimits_test.cpp b/src/test/app/CrossingLimits_test.cpp index 83b891743..6f6a7eb3e 100644 --- a/src/test/app/CrossingLimits_test.cpp +++ b/src/test/app/CrossingLimits_test.cpp @@ -15,9 +15,9 @@ */ //============================================================================== +#include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/app/DID_test.cpp b/src/test/app/DID_test.cpp index a44f79c90..207345188 100644 --- a/src/test/app/DID_test.cpp +++ b/src/test/app/DID_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== +#include #include #include #include #include #include -#include #include #include diff --git a/src/test/app/DNS_test.cpp b/src/test/app/DNS_test.cpp index 48e72d285..7a39c5f07 100644 --- a/src/test/app/DNS_test.cpp +++ b/src/test/app/DNS_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include #include #include diff --git a/src/test/app/DeliverMin_test.cpp b/src/test/app/DeliverMin_test.cpp index 5edfcd1b7..3c62a47a4 100644 --- a/src/test/app/DeliverMin_test.cpp +++ b/src/test/app/DeliverMin_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/app/DepositAuth_test.cpp b/src/test/app/DepositAuth_test.cpp index 0a400053a..ecba2d0da 100644 --- a/src/test/app/DepositAuth_test.cpp +++ b/src/test/app/DepositAuth_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/app/Discrepancy_test.cpp b/src/test/app/Discrepancy_test.cpp index 6d72240dd..fd03d907b 100644 --- a/src/test/app/Discrepancy_test.cpp +++ b/src/test/app/Discrepancy_test.cpp @@ -17,14 +17,14 @@ */ //============================================================================== +#include +#include +#include #include #include #include #include #include -#include -#include -#include namespace ripple { diff --git a/src/test/app/Escrow_test.cpp b/src/test/app/Escrow_test.cpp index 5ec73f6bd..60a6fedd9 100644 --- a/src/test/app/Escrow_test.cpp +++ b/src/test/app/Escrow_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== +#include #include #include #include #include #include #include -#include #include #include diff --git a/src/test/app/FeeVote_test.cpp b/src/test/app/FeeVote_test.cpp index 03ee8fa48..289ce2a71 100644 --- a/src/test/app/FeeVote_test.cpp +++ b/src/test/app/FeeVote_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/app/Flow_test.cpp b/src/test/app/Flow_test.cpp index 9ae34933b..9d1257d16 100644 --- a/src/test/app/Flow_test.cpp +++ b/src/test/app/Flow_test.cpp @@ -17,17 +17,17 @@ */ //============================================================================== +#include +#include #include #include -#include #include #include #include #include +#include #include #include -#include -#include namespace ripple { namespace test { diff --git a/src/test/app/Freeze_test.cpp b/src/test/app/Freeze_test.cpp index 07c104301..66a9cd335 100644 --- a/src/test/app/Freeze_test.cpp +++ b/src/test/app/Freeze_test.cpp @@ -16,12 +16,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== +#include #include #include #include #include #include -#include namespace ripple { diff --git a/src/test/app/GenesisMint_test.cpp b/src/test/app/GenesisMint_test.cpp index edaa7954b..4e428450b 100644 --- a/src/test/app/GenesisMint_test.cpp +++ b/src/test/app/GenesisMint_test.cpp @@ -15,10 +15,10 @@ */ //============================================================================== +#include #include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/app/Import_test.cpp b/src/test/app/Import_test.cpp index 972fcb3eb..ff678a881 100644 --- a/src/test/app/Import_test.cpp +++ b/src/test/app/Import_test.cpp @@ -17,19 +17,19 @@ */ //============================================================================== +#include +#include #include #include #include #include #include +#include #include #include -#include #include #include #include -#include -#include #define BEAST_REQUIRE(x) \ { \ diff --git a/src/test/app/Invoke_test.cpp b/src/test/app/Invoke_test.cpp index 0a57c1b68..3c322532c 100644 --- a/src/test/app/Invoke_test.cpp +++ b/src/test/app/Invoke_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/app/LedgerHistory_test.cpp b/src/test/app/LedgerHistory_test.cpp index 7117c778a..e1a837a9c 100644 --- a/src/test/app/LedgerHistory_test.cpp +++ b/src/test/app/LedgerHistory_test.cpp @@ -17,17 +17,17 @@ */ //============================================================================== +#include +#include #include #include #include +#include #include #include -#include #include #include #include -#include -#include namespace ripple { namespace test { diff --git a/src/test/app/LedgerLoad_test.cpp b/src/test/app/LedgerLoad_test.cpp index 843c844f3..c645c9c85 100644 --- a/src/test/app/LedgerLoad_test.cpp +++ b/src/test/app/LedgerLoad_test.cpp @@ -17,14 +17,14 @@ */ //============================================================================== +#include +#include #include #include #include #include #include #include -#include -#include #include #include diff --git a/src/test/app/LedgerMaster_test.cpp b/src/test/app/LedgerMaster_test.cpp index 065a54408..8a1f90857 100644 --- a/src/test/app/LedgerMaster_test.cpp +++ b/src/test/app/LedgerMaster_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include #include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/app/LedgerReplay_test.cpp b/src/test/app/LedgerReplay_test.cpp index cc5e8fc8e..009ae4d73 100644 --- a/src/test/app/LedgerReplay_test.cpp +++ b/src/test/app/LedgerReplay_test.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +#include +#include #include #include #include @@ -25,11 +27,9 @@ #include #include #include -#include #include #include -#include -#include +#include #include #include diff --git a/src/test/app/LoadFeeTrack_test.cpp b/src/test/app/LoadFeeTrack_test.cpp index 23154edb4..fa7489bf1 100644 --- a/src/test/app/LoadFeeTrack_test.cpp +++ b/src/test/app/LoadFeeTrack_test.cpp @@ -18,9 +18,9 @@ //============================================================================== #include -#include #include #include +#include namespace ripple { diff --git a/src/test/app/Manifest_test.cpp b/src/test/app/Manifest_test.cpp index bede33cd1..0e2530041 100644 --- a/src/test/app/Manifest_test.cpp +++ b/src/test/app/Manifest_test.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include #include #include #include @@ -30,7 +31,6 @@ #include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/app/MultiSign_test.cpp b/src/test/app/MultiSign_test.cpp index 6f71af9eb..5aa3717ca 100644 --- a/src/test/app/MultiSign_test.cpp +++ b/src/test/app/MultiSign_test.cpp @@ -15,10 +15,10 @@ */ //============================================================================== +#include #include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/app/NFTokenBurn_test.cpp b/src/test/app/NFTokenBurn_test.cpp index a28a798ae..55212e66f 100644 --- a/src/test/app/NFTokenBurn_test.cpp +++ b/src/test/app/NFTokenBurn_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== +#include #include #include #include -#include #include diff --git a/src/test/app/NFTokenDir_test.cpp b/src/test/app/NFTokenDir_test.cpp index a9ba51345..23e4c6715 100644 --- a/src/test/app/NFTokenDir_test.cpp +++ b/src/test/app/NFTokenDir_test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== +#include #include #include #include #include -#include #include diff --git a/src/test/app/NFToken_test.cpp b/src/test/app/NFToken_test.cpp index 3ff351b8d..dca59fc86 100644 --- a/src/test/app/NFToken_test.cpp +++ b/src/test/app/NFToken_test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== +#include #include #include #include #include -#include #include diff --git a/src/test/app/NetworkID_test.cpp b/src/test/app/NetworkID_test.cpp index db8ccbd83..4cb0b1265 100644 --- a/src/test/app/NetworkID_test.cpp +++ b/src/test/app/NetworkID_test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include #include #include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/app/Offer_test.cpp b/src/test/app/Offer_test.cpp index cc1e06903..d8d9ce1cc 100644 --- a/src/test/app/Offer_test.cpp +++ b/src/test/app/Offer_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include #include #include #include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/app/Oracle_test.cpp b/src/test/app/Oracle_test.cpp index bed58fe23..c2f3c2712 100644 --- a/src/test/app/Oracle_test.cpp +++ b/src/test/app/Oracle_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/app/OversizeMeta_test.cpp b/src/test/app/OversizeMeta_test.cpp index 0ea19c9ab..0a7f42e18 100644 --- a/src/test/app/OversizeMeta_test.cpp +++ b/src/test/app/OversizeMeta_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/app/Path_test.cpp b/src/test/app/Path_test.cpp index f10f5232b..1db15388f 100644 --- a/src/test/app/Path_test.cpp +++ b/src/test/app/Path_test.cpp @@ -17,25 +17,25 @@ */ //============================================================================== +#include +#include #include +#include +#include +#include +#include +#include #include #include -#include #include #include #include #include #include #include -#include -#include -#include -#include #include #include #include -#include -#include #include namespace ripple { diff --git a/src/test/app/PayChan_test.cpp b/src/test/app/PayChan_test.cpp index 16a5cf66c..31d698b8d 100644 --- a/src/test/app/PayChan_test.cpp +++ b/src/test/app/PayChan_test.cpp @@ -17,16 +17,16 @@ */ //============================================================================== -#include +#include #include +#include +#include #include #include #include #include #include -#include #include -#include namespace ripple { namespace test { diff --git a/src/test/app/PayStrand_test.cpp b/src/test/app/PayStrand_test.cpp index 3c5cdf18c..e6029919e 100644 --- a/src/test/app/PayStrand_test.cpp +++ b/src/test/app/PayStrand_test.cpp @@ -15,20 +15,20 @@ */ //============================================================================== +#include +#include #include #include #include #include -#include -#include #include #include #include #include +#include +#include #include #include -#include -#include namespace ripple { namespace test { diff --git a/src/test/app/PseudoTx_test.cpp b/src/test/app/PseudoTx_test.cpp index ad3df1fa9..238041a17 100644 --- a/src/test/app/PseudoTx_test.cpp +++ b/src/test/app/PseudoTx_test.cpp @@ -15,11 +15,11 @@ */ //============================================================================== +#include #include #include #include #include -#include #include namespace ripple { diff --git a/src/test/app/RCLValidations_test.cpp b/src/test/app/RCLValidations_test.cpp index e9f0cfa12..540d98bc1 100644 --- a/src/test/app/RCLValidations_test.cpp +++ b/src/test/app/RCLValidations_test.cpp @@ -17,14 +17,14 @@ */ //============================================================================== +#include #include #include +#include #include #include #include #include -#include -#include namespace ripple { namespace test { diff --git a/src/test/app/ReducedOffer_test.cpp b/src/test/app/ReducedOffer_test.cpp index a2a9ccf64..a070051e4 100644 --- a/src/test/app/ReducedOffer_test.cpp +++ b/src/test/app/ReducedOffer_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== +#include #include #include #include -#include #include diff --git a/src/test/app/Regression_test.cpp b/src/test/app/Regression_test.cpp index c4f338d67..5110a1d1b 100644 --- a/src/test/app/Regression_test.cpp +++ b/src/test/app/Regression_test.cpp @@ -15,13 +15,13 @@ */ //============================================================================== +#include +#include #include #include #include #include #include -#include -#include namespace ripple { namespace test { diff --git a/src/test/app/Remit_test.cpp b/src/test/app/Remit_test.cpp index 221d12bd0..fe1342b1c 100644 --- a/src/test/app/Remit_test.cpp +++ b/src/test/app/Remit_test.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include +#include #include #include +#include #include #include #include #include -#include #include diff --git a/src/test/app/SHAMapStore_test.cpp b/src/test/app/SHAMapStore_test.cpp index 441073714..376cb4eb7 100644 --- a/src/test/app/SHAMapStore_test.cpp +++ b/src/test/app/SHAMapStore_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== +#include +#include #include #include #include #include #include -#include -#include namespace ripple { namespace test { diff --git a/src/test/app/SetAuth_test.cpp b/src/test/app/SetAuth_test.cpp index f9f4fbef4..adb909314 100644 --- a/src/test/app/SetAuth_test.cpp +++ b/src/test/app/SetAuth_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/app/SetHookTSH_test.cpp b/src/test/app/SetHookTSH_test.cpp index c5f2ce6a8..9fc7d435d 100644 --- a/src/test/app/SetHookTSH_test.cpp +++ b/src/test/app/SetHookTSH_test.cpp @@ -18,6 +18,9 @@ */ //============================================================================== +#include +#include +#include #include #include #include @@ -25,9 +28,6 @@ #include #include #include -#include -#include -#include #include namespace ripple { diff --git a/src/test/app/SetHook_test.cpp b/src/test/app/SetHook_test.cpp index c9cf89cad..d00317f8b 100644 --- a/src/test/app/SetHook_test.cpp +++ b/src/test/app/SetHook_test.cpp @@ -16,6 +16,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== +#include +#include +#include +#include #include #include #include @@ -23,10 +27,6 @@ #include #include #include -#include -#include -#include -#include #include namespace ripple { diff --git a/src/test/app/SetRegularKey_test.cpp b/src/test/app/SetRegularKey_test.cpp index 13dea01cf..024d8de13 100644 --- a/src/test/app/SetRegularKey_test.cpp +++ b/src/test/app/SetRegularKey_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include namespace ripple { diff --git a/src/test/app/SetRemarks_test.cpp b/src/test/app/SetRemarks_test.cpp index b1deb4716..f9fa37191 100644 --- a/src/test/app/SetRemarks_test.cpp +++ b/src/test/app/SetRemarks_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== +#include #include #include #include #include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/app/SetTrust_test.cpp b/src/test/app/SetTrust_test.cpp index a6420a3f6..57e18d712 100644 --- a/src/test/app/SetTrust_test.cpp +++ b/src/test/app/SetTrust_test.cpp @@ -16,9 +16,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== +#include #include #include -#include namespace ripple { diff --git a/src/test/app/TheoreticalQuality_test.cpp b/src/test/app/TheoreticalQuality_test.cpp index 3099d02eb..917d23377 100644 --- a/src/test/app/TheoreticalQuality_test.cpp +++ b/src/test/app/TheoreticalQuality_test.cpp @@ -17,20 +17,20 @@ */ //============================================================================== +#include +#include #include #include #include #include -#include -#include #include #include #include #include +#include +#include #include #include -#include -#include namespace ripple { namespace test { diff --git a/src/test/app/Ticket_test.cpp b/src/test/app/Ticket_test.cpp index e18af99fc..cc73dd585 100644 --- a/src/test/app/Ticket_test.cpp +++ b/src/test/app/Ticket_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== +#include #include #include #include -#include namespace ripple { diff --git a/src/test/app/Touch_test.cpp b/src/test/app/Touch_test.cpp index e5f9850f9..269c898f2 100644 --- a/src/test/app/Touch_test.cpp +++ b/src/test/app/Touch_test.cpp @@ -18,15 +18,15 @@ */ //============================================================================== +#include +#include +#include #include #include #include #include #include #include -#include -#include -#include namespace ripple { namespace test { diff --git a/src/test/app/Transaction_ordering_test.cpp b/src/test/app/Transaction_ordering_test.cpp index 595624b2f..928fcdb83 100644 --- a/src/test/app/Transaction_ordering_test.cpp +++ b/src/test/app/Transaction_ordering_test.cpp @@ -15,9 +15,9 @@ */ //============================================================================== +#include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/app/TrustAndBalance_test.cpp b/src/test/app/TrustAndBalance_test.cpp index 72863a4fe..0b8d30d56 100644 --- a/src/test/app/TrustAndBalance_test.cpp +++ b/src/test/app/TrustAndBalance_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== +#include +#include #include #include #include #include -#include -#include namespace ripple { diff --git a/src/test/app/TxQ_test.cpp b/src/test/app/TxQ_test.cpp index 7f881bb2d..990e48235 100644 --- a/src/test/app/TxQ_test.cpp +++ b/src/test/app/TxQ_test.cpp @@ -17,6 +17,11 @@ */ //============================================================================== +#include +#include +#include +#include +#include #include #include #include @@ -25,11 +30,6 @@ #include #include #include -#include -#include -#include -#include -#include #define DEBUG_TX_QTEST 0 diff --git a/src/test/app/URIToken_test.cpp b/src/test/app/URIToken_test.cpp index 14aba561f..40b8fcf59 100644 --- a/src/test/app/URIToken_test.cpp +++ b/src/test/app/URIToken_test.cpp @@ -17,14 +17,14 @@ */ //============================================================================== -#include +#include #include #include +#include #include #include #include #include -#include #include diff --git a/src/test/app/ValidatorKeys_test.cpp b/src/test/app/ValidatorKeys_test.cpp index ed3eadb25..9281ec4bd 100644 --- a/src/test/app/ValidatorKeys_test.cpp +++ b/src/test/app/ValidatorKeys_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== +#include #include #include -#include -#include #include #include -#include +#include +#include #include diff --git a/src/test/app/ValidatorList_test.cpp b/src/test/app/ValidatorList_test.cpp index 212bffd83..05989c0f6 100644 --- a/src/test/app/ValidatorList_test.cpp +++ b/src/test/app/ValidatorList_test.cpp @@ -17,11 +17,12 @@ */ //============================================================================== +#include #include +#include #include #include #include -#include #include #include #include @@ -29,7 +30,6 @@ #include #include #include -#include #include diff --git a/src/test/app/ValidatorSite_test.cpp b/src/test/app/ValidatorSite_test.cpp index 1cbb14a73..c2c663665 100644 --- a/src/test/app/ValidatorSite_test.cpp +++ b/src/test/app/ValidatorSite_test.cpp @@ -17,6 +17,9 @@ */ //============================================================================== +#include +#include +#include #include #include #include @@ -33,9 +36,6 @@ #include #include #include -#include -#include -#include namespace ripple { namespace test { diff --git a/src/test/app/Wildcard_test.cpp b/src/test/app/Wildcard_test.cpp index 7656ed6d0..4ce847fc1 100644 --- a/src/test/app/Wildcard_test.cpp +++ b/src/test/app/Wildcard_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/app/XahauGenesis_test.cpp b/src/test/app/XahauGenesis_test.cpp index 4a67e75f2..c619dd1a2 100644 --- a/src/test/app/XahauGenesis_test.cpp +++ b/src/test/app/XahauGenesis_test.cpp @@ -15,6 +15,8 @@ */ //============================================================================== +#include +#include #include #include #include @@ -27,8 +29,6 @@ #include #include #include -#include -#include #include #define BEAST_REQUIRE(x) \ diff --git a/src/test/app/tx/apply_test.cpp b/src/test/app/tx/apply_test.cpp index 033154c78..df76e839a 100644 --- a/src/test/app/tx/apply_test.cpp +++ b/src/test/app/tx/apply_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== +#include #include #include #include -#include namespace ripple { diff --git a/src/test/basics/FileUtilities_test.cpp b/src/test/basics/FileUtilities_test.cpp index 386226459..9314ecea4 100644 --- a/src/test/basics/FileUtilities_test.cpp +++ b/src/test/basics/FileUtilities_test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== +#include #include #include #include #include -#include namespace ripple { diff --git a/src/test/basics/KeyCache_test.cpp b/src/test/basics/KeyCache_test.cpp index 4b2e50838..eab0e87d0 100644 --- a/src/test/basics/KeyCache_test.cpp +++ b/src/test/basics/KeyCache_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== +#include #include #include #include #include #include #include -#include namespace ripple { diff --git a/src/test/basics/PerfLog_test.cpp b/src/test/basics/PerfLog_test.cpp index 65cb95244..756988cbd 100644 --- a/src/test/basics/PerfLog_test.cpp +++ b/src/test/basics/PerfLog_test.cpp @@ -17,15 +17,15 @@ */ //============================================================================== +#include +#include #include +#include #include #include #include #include #include -#include -#include -#include #include #include diff --git a/src/test/basics/TaggedCache_test.cpp b/src/test/basics/TaggedCache_test.cpp index 1fe47dd7d..6fbba1a47 100644 --- a/src/test/basics/TaggedCache_test.cpp +++ b/src/test/basics/TaggedCache_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== +#include #include #include #include #include #include -#include namespace ripple { diff --git a/src/test/beast/IPEndpoint_test.cpp b/src/test/beast/IPEndpoint_test.cpp index 6f41096d3..1ad49443d 100644 --- a/src/test/beast/IPEndpoint_test.cpp +++ b/src/test/beast/IPEndpoint_test.cpp @@ -20,13 +20,13 @@ // MODULES: ../impl/IPEndpoint.cpp ../impl/IPAddressV4.cpp // ../impl/IPAddressV6.cpp +#include #include #include #include #include #include #include -#include #include namespace beast { diff --git a/src/test/conditions/PreimageSha256_test.cpp b/src/test/conditions/PreimageSha256_test.cpp index b10e6daa8..9a6840b11 100644 --- a/src/test/conditions/PreimageSha256_test.cpp +++ b/src/test/conditions/PreimageSha256_test.cpp @@ -17,14 +17,14 @@ */ //============================================================================== +#include +#include +#include #include #include #include #include #include -#include -#include -#include #include #include #include diff --git a/src/test/consensus/ByzantineFailureSim_test.cpp b/src/test/consensus/ByzantineFailureSim_test.cpp index 3b4d707e5..ce59adbe9 100644 --- a/src/test/consensus/ByzantineFailureSim_test.cpp +++ b/src/test/consensus/ByzantineFailureSim_test.cpp @@ -16,9 +16,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== +#include #include #include -#include #include namespace ripple { diff --git a/src/test/consensus/Consensus_test.cpp b/src/test/consensus/Consensus_test.cpp index 671737251..88280994c 100644 --- a/src/test/consensus/Consensus_test.cpp +++ b/src/test/consensus/Consensus_test.cpp @@ -16,12 +16,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include -#include -#include -#include #include #include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/test/consensus/DistributedValidatorsSim_test.cpp b/src/test/consensus/DistributedValidatorsSim_test.cpp index 9bec7fc63..3abac36b4 100644 --- a/src/test/consensus/DistributedValidatorsSim_test.cpp +++ b/src/test/consensus/DistributedValidatorsSim_test.cpp @@ -16,9 +16,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== +#include #include #include -#include #include #include diff --git a/src/test/consensus/LedgerTiming_test.cpp b/src/test/consensus/LedgerTiming_test.cpp index 965deb204..95e27f5c8 100644 --- a/src/test/consensus/LedgerTiming_test.cpp +++ b/src/test/consensus/LedgerTiming_test.cpp @@ -16,8 +16,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/consensus/LedgerTrie_test.cpp b/src/test/consensus/LedgerTrie_test.cpp index dff309084..6f13db43b 100644 --- a/src/test/consensus/LedgerTrie_test.cpp +++ b/src/test/consensus/LedgerTrie_test.cpp @@ -16,10 +16,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include -#include -#include #include +#include +#include +#include #include namespace ripple { diff --git a/src/test/consensus/NegativeUNL_test.cpp b/src/test/consensus/NegativeUNL_test.cpp index 05f8fd6ac..9b7a67d50 100644 --- a/src/test/consensus/NegativeUNL_test.cpp +++ b/src/test/consensus/NegativeUNL_test.cpp @@ -17,15 +17,15 @@ */ //============================================================================== +#include #include #include #include #include #include +#include #include #include -#include -#include namespace ripple { namespace test { diff --git a/src/test/consensus/ScaleFreeSim_test.cpp b/src/test/consensus/ScaleFreeSim_test.cpp index 92a8dd74a..3e3cec976 100644 --- a/src/test/consensus/ScaleFreeSim_test.cpp +++ b/src/test/consensus/ScaleFreeSim_test.cpp @@ -16,10 +16,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include -#include #include #include +#include +#include #include namespace ripple { diff --git a/src/test/consensus/UNLReport_test.cpp b/src/test/consensus/UNLReport_test.cpp index ad1ccc912..a9729ec54 100644 --- a/src/test/consensus/UNLReport_test.cpp +++ b/src/test/consensus/UNLReport_test.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +#include +#include #include #include #include @@ -24,15 +26,13 @@ #include #include #include +#include +#include #include #include #include -#include -#include #include #include -#include -#include #include namespace ripple { diff --git a/src/test/consensus/Validations_test.cpp b/src/test/consensus/Validations_test.cpp index 57cee9d7c..0279d6330 100644 --- a/src/test/consensus/Validations_test.cpp +++ b/src/test/consensus/Validations_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== +#include +#include +#include #include #include #include -#include #include -#include -#include #include #include #include diff --git a/src/test/core/ClosureCounter_test.cpp b/src/test/core/ClosureCounter_test.cpp index 922779476..83d2fdb6e 100644 --- a/src/test/core/ClosureCounter_test.cpp +++ b/src/test/core/ClosureCounter_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include #include #include diff --git a/src/test/core/Config_test.cpp b/src/test/core/Config_test.cpp index e4a640fa9..b1a233d88 100644 --- a/src/test/core/Config_test.cpp +++ b/src/test/core/Config_test.cpp @@ -17,16 +17,16 @@ */ //============================================================================== -#include +#include +#include #include #include +#include #include #include #include #include #include -#include -#include namespace ripple { namespace detail { diff --git a/src/test/core/Coroutine_test.cpp b/src/test/core/Coroutine_test.cpp index fa694b6d2..0fdc5a4f4 100644 --- a/src/test/core/Coroutine_test.cpp +++ b/src/test/core/Coroutine_test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== +#include #include #include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/core/CryptoPRNG_test.cpp b/src/test/core/CryptoPRNG_test.cpp index 962da7406..303a21763 100644 --- a/src/test/core/CryptoPRNG_test.cpp +++ b/src/test/core/CryptoPRNG_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== +#include #include #include #include #include #include -#include namespace ripple { diff --git a/src/test/core/JobQueue_test.cpp b/src/test/core/JobQueue_test.cpp index e484a4f9c..42338063d 100644 --- a/src/test/core/JobQueue_test.cpp +++ b/src/test/core/JobQueue_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/core/SociDB_test.cpp b/src/test/core/SociDB_test.cpp index 8e5c8530f..82d0cbe90 100644 --- a/src/test/core/SociDB_test.cpp +++ b/src/test/core/SociDB_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include +#include #include #include +#include +#include #include #include -#include namespace ripple { class SociDB_test final : public TestSuite diff --git a/src/test/core/Workers_test.cpp b/src/test/core/Workers_test.cpp index 5cdc340aa..3fac4808f 100644 --- a/src/test/core/Workers_test.cpp +++ b/src/test/core/Workers_test.cpp @@ -17,10 +17,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include -#include #include #include +#include +#include #include #include #include diff --git a/src/test/csf/BasicNetwork_test.cpp b/src/test/csf/BasicNetwork_test.cpp index 0eba8f06c..61660ae4c 100644 --- a/src/test/csf/BasicNetwork_test.cpp +++ b/src/test/csf/BasicNetwork_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include #include #include +#include +#include #include namespace ripple { diff --git a/src/test/csf/Digraph_test.cpp b/src/test/csf/Digraph_test.cpp index 37677e7bb..80319445c 100644 --- a/src/test/csf/Digraph_test.cpp +++ b/src/test/csf/Digraph_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include #include namespace ripple { diff --git a/src/test/csf/Histogram_test.cpp b/src/test/csf/Histogram_test.cpp index c2d5f96e7..ea8b86478 100644 --- a/src/test/csf/Histogram_test.cpp +++ b/src/test/csf/Histogram_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/csf/Peer.h b/src/test/csf/Peer.h index 612ce27b4..5eed78569 100644 --- a/src/test/csf/Peer.h +++ b/src/test/csf/Peer.h @@ -19,13 +19,6 @@ #ifndef RIPPLE_TEST_CSF_PEER_H_INCLUDED #define RIPPLE_TEST_CSF_PEER_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include #include #include #include @@ -33,6 +26,13 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/csf/PeerGroup.h b/src/test/csf/PeerGroup.h index 1f3421a4a..b59bfa676 100644 --- a/src/test/csf/PeerGroup.h +++ b/src/test/csf/PeerGroup.h @@ -19,9 +19,9 @@ #ifndef RIPPLE_TEST_CSF_PEERGROUP_H_INCLUDED #define RIPPLE_TEST_CSF_PEERGROUP_H_INCLUDED -#include #include #include +#include #include namespace ripple { diff --git a/src/test/csf/Proposal.h b/src/test/csf/Proposal.h index ba53eabce..1d70464ba 100644 --- a/src/test/csf/Proposal.h +++ b/src/test/csf/Proposal.h @@ -19,10 +19,10 @@ #ifndef RIPPLE_TEST_CSF_PROPOSAL_H_INCLUDED #define RIPPLE_TEST_CSF_PROPOSAL_H_INCLUDED -#include #include #include #include +#include namespace ripple { namespace test { diff --git a/src/test/csf/Scheduler_test.cpp b/src/test/csf/Scheduler_test.cpp index 8d56d0b82..931150bbe 100644 --- a/src/test/csf/Scheduler_test.cpp +++ b/src/test/csf/Scheduler_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include #include diff --git a/src/test/csf/TrustGraph.h b/src/test/csf/TrustGraph.h index 31bb85340..649f21064 100644 --- a/src/test/csf/TrustGraph.h +++ b/src/test/csf/TrustGraph.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TEST_CSF_UNL_H_INCLUDED #define RIPPLE_TEST_CSF_UNL_H_INCLUDED -#include #include +#include #include #include diff --git a/src/test/csf/Validation.h b/src/test/csf/Validation.h index 3ae5167a0..57c2bc666 100644 --- a/src/test/csf/Validation.h +++ b/src/test/csf/Validation.h @@ -19,8 +19,8 @@ #ifndef RIPPLE_TEST_CSF_VALIDATION_H_INCLUDED #define RIPPLE_TEST_CSF_VALIDATION_H_INCLUDED -#include #include +#include #include #include diff --git a/src/test/csf/collectors.h b/src/test/csf/collectors.h index 6a5a28904..511fb2c4b 100644 --- a/src/test/csf/collectors.h +++ b/src/test/csf/collectors.h @@ -19,10 +19,10 @@ #ifndef RIPPLE_TEST_CSF_COLLECTORS_H_INCLUDED #define RIPPLE_TEST_CSF_COLLECTORS_H_INCLUDED -#include #include #include #include +#include #include #include diff --git a/src/test/csf/events.h b/src/test/csf/events.h index cdda88cd0..37d1b4b0b 100644 --- a/src/test/csf/events.h +++ b/src/test/csf/events.h @@ -19,11 +19,11 @@ #ifndef RIPPLE_TEST_CSF_EVENTS_H_INCLUDED #define RIPPLE_TEST_CSF_EVENTS_H_INCLUDED -#include #include #include #include #include +#include namespace ripple { namespace test { diff --git a/src/test/csf/impl/ledgers.cpp b/src/test/csf/impl/ledgers.cpp index ccc767008..775ec2e58 100644 --- a/src/test/csf/impl/ledgers.cpp +++ b/src/test/csf/impl/ledgers.cpp @@ -16,8 +16,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include #include +#include #include diff --git a/src/test/csf/ledgers.h b/src/test/csf/ledgers.h index ba5b73161..1c8d4eb54 100644 --- a/src/test/csf/ledgers.h +++ b/src/test/csf/ledgers.h @@ -19,16 +19,16 @@ #ifndef RIPPLE_TEST_CSF_LEDGERS_H_INCLUDED #define RIPPLE_TEST_CSF_LEDGERS_H_INCLUDED +#include +#include #include #include #include #include -#include #include #include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/csf/timers.h b/src/test/csf/timers.h index b2a2b5a2d..7e5d88c66 100644 --- a/src/test/csf/timers.h +++ b/src/test/csf/timers.h @@ -19,10 +19,10 @@ #ifndef RIPPLE_TEST_CSF_TIMERS_H_INCLUDED #define RIPPLE_TEST_CSF_TIMERS_H_INCLUDED -#include -#include #include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/json/Object_test.cpp b/src/test/json/Object_test.cpp index 142532a7d..4a64d6538 100644 --- a/src/test/json/Object_test.cpp +++ b/src/test/json/Object_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include namespace Json { diff --git a/src/test/json/Output_test.cpp b/src/test/json/Output_test.cpp index ec5857c6d..ddc5f0899 100644 --- a/src/test/json/Output_test.cpp +++ b/src/test/json/Output_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include namespace Json { diff --git a/src/test/json/TestOutputSuite.h b/src/test/json/TestOutputSuite.h index a14c70540..a4f36dac4 100644 --- a/src/test/json/TestOutputSuite.h +++ b/src/test/json/TestOutputSuite.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_RPC_TESTOUTPUTSUITE_H_INCLUDED #define RIPPLE_RPC_TESTOUTPUTSUITE_H_INCLUDED +#include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/json/Writer_test.cpp b/src/test/json/Writer_test.cpp index b7bc61675..97d4297c9 100644 --- a/src/test/json/Writer_test.cpp +++ b/src/test/json/Writer_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== +#include #include #include #include -#include namespace Json { diff --git a/src/test/jtx.h b/src/test/jtx.h index 0df74f6e3..121130745 100644 --- a/src/test/jtx.h +++ b/src/test/jtx.h @@ -22,7 +22,6 @@ // Convenience header that includes everything -#include #include #include #include @@ -77,5 +76,6 @@ #include #include #include +#include #endif diff --git a/src/test/jtx/AMM.h b/src/test/jtx/AMM.h index 8d19600ea..77b9c8c9e 100644 --- a/src/test/jtx/AMM.h +++ b/src/test/jtx/AMM.h @@ -20,15 +20,15 @@ #ifndef RIPPLE_TEST_JTX_AMM_H_INCLUDED #define RIPPLE_TEST_JTX_AMM_H_INCLUDED -#include -#include -#include -#include #include #include #include #include #include +#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/AMMTest.h b/src/test/jtx/AMMTest.h index b0ffabd0d..0481dc98a 100644 --- a/src/test/jtx/AMMTest.h +++ b/src/test/jtx/AMMTest.h @@ -19,11 +19,11 @@ #ifndef RIPPLE_TEST_JTX_AMMTEST_H_INCLUDED #define RIPPLE_TEST_JTX_AMMTEST_H_INCLUDED -#include -#include #include #include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/Env.h b/src/test/jtx/Env.h index 1c98b69ff..5d12b0312 100644 --- a/src/test/jtx/Env.h +++ b/src/test/jtx/Env.h @@ -20,25 +20,6 @@ #ifndef RIPPLE_TEST_JTX_ENV_H_INCLUDED #define RIPPLE_TEST_JTX_ENV_H_INCLUDED -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include @@ -48,6 +29,25 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/test/jtx/Env_test.cpp b/src/test/jtx/Env_test.cpp index 522e876d7..46f1d61c5 100644 --- a/src/test/jtx/Env_test.cpp +++ b/src/test/jtx/Env_test.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include #include #include #include @@ -25,7 +26,6 @@ #include #include #include -#include #include #include diff --git a/src/test/jtx/JSONRPCClient.h b/src/test/jtx/JSONRPCClient.h index 7a57a7df2..bbffc7266 100644 --- a/src/test/jtx/JSONRPCClient.h +++ b/src/test/jtx/JSONRPCClient.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_TEST_HTTPCLIENT_H_INCLUDED #define RIPPLE_TEST_HTTPCLIENT_H_INCLUDED +#include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/JTx.h b/src/test/jtx/JTx.h index 5fe541d2a..a5a4a9eb1 100644 --- a/src/test/jtx/JTx.h +++ b/src/test/jtx/JTx.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_TEST_JTX_JTX_H_INCLUDED #define RIPPLE_TEST_JTX_JTX_H_INCLUDED +#include +#include #include #include #include #include -#include -#include #include #include diff --git a/src/test/jtx/Oracle.h b/src/test/jtx/Oracle.h index ac46b32d0..32ec0b2e8 100644 --- a/src/test/jtx/Oracle.h +++ b/src/test/jtx/Oracle.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TEST_JTX_ORACLE_H_INCLUDED #define RIPPLE_TEST_JTX_ORACLE_H_INCLUDED -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/PathSet.h b/src/test/jtx/PathSet.h index f844432e6..0f4c4ddd3 100644 --- a/src/test/jtx/PathSet.h +++ b/src/test/jtx/PathSet.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_LEDGER_TESTS_PATHSET_H_INCLUDED #define RIPPLE_LEDGER_TESTS_PATHSET_H_INCLUDED +#include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/TestHelpers.h b/src/test/jtx/TestHelpers.h index dc33c72ff..4dc58570d 100644 --- a/src/test/jtx/TestHelpers.h +++ b/src/test/jtx/TestHelpers.h @@ -19,13 +19,13 @@ #ifndef RIPPLE_TEST_JTX_TESTHELPERS_H_INCLUDED #define RIPPLE_TEST_JTX_TESTHELPERS_H_INCLUDED +#include #include #include #include #include #include #include -#include #include diff --git a/src/test/jtx/TrustedPublisherServer.h b/src/test/jtx/TrustedPublisherServer.h index 460797977..2daa57f4f 100644 --- a/src/test/jtx/TrustedPublisherServer.h +++ b/src/test/jtx/TrustedPublisherServer.h @@ -19,6 +19,7 @@ #ifndef RIPPLE_TEST_TRUSTED_PUBLISHER_SERVER_H_INCLUDED #define RIPPLE_TEST_TRUSTED_PUBLISHER_SERVER_H_INCLUDED +#include #include #include #include @@ -34,7 +35,6 @@ #include #include #include -#include #include #include diff --git a/src/test/jtx/WSClient.h b/src/test/jtx/WSClient.h index ec5b21eba..d0356dbcb 100644 --- a/src/test/jtx/WSClient.h +++ b/src/test/jtx/WSClient.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TEST_WSCLIENT_H_INCLUDED #define RIPPLE_TEST_WSCLIENT_H_INCLUDED -#include #include +#include #include #include diff --git a/src/test/jtx/WSClient_test.cpp b/src/test/jtx/WSClient_test.cpp index 1dffd6fe1..18dadb0bf 100644 --- a/src/test/jtx/WSClient_test.cpp +++ b/src/test/jtx/WSClient_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include #include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/amount.h b/src/test/jtx/amount.h index 2fecf13b6..c8e0d0c37 100644 --- a/src/test/jtx/amount.h +++ b/src/test/jtx/amount.h @@ -20,6 +20,9 @@ #ifndef RIPPLE_TEST_JTX_AMOUNT_H_INCLUDED #define RIPPLE_TEST_JTX_AMOUNT_H_INCLUDED +#include +#include +#include #include #include #include @@ -27,9 +30,6 @@ #include #include #include -#include -#include -#include #include namespace ripple { diff --git a/src/test/jtx/delivermin.h b/src/test/jtx/delivermin.h index f44e84c4a..46e633dab 100644 --- a/src/test/jtx/delivermin.h +++ b/src/test/jtx/delivermin.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TEST_JTX_DELIVERMIN_H_INCLUDED #define RIPPLE_TEST_JTX_DELIVERMIN_H_INCLUDED -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/fee.h b/src/test/jtx/fee.h index fe74db31f..c671e0b2a 100644 --- a/src/test/jtx/fee.h +++ b/src/test/jtx/fee.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_TEST_JTX_FEE_H_INCLUDED #define RIPPLE_TEST_JTX_FEE_H_INCLUDED -#include -#include #include #include +#include +#include #include diff --git a/src/test/jtx/flags.h b/src/test/jtx/flags.h index c9df429e8..c8887cdee 100644 --- a/src/test/jtx/flags.h +++ b/src/test/jtx/flags.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_TEST_JTX_FLAGS_H_INCLUDED #define RIPPLE_TEST_JTX_FLAGS_H_INCLUDED +#include #include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/hook.h b/src/test/jtx/hook.h index fe232098d..049e8d268 100644 --- a/src/test/jtx/hook.h +++ b/src/test/jtx/hook.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_TEST_JTX_HOOK_H_INCLUDED #define RIPPLE_TEST_JTX_HOOK_H_INCLUDED +#include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/AMM.cpp b/src/test/jtx/impl/AMM.cpp index 16902f922..c083b6df3 100644 --- a/src/test/jtx/impl/AMM.cpp +++ b/src/test/jtx/impl/AMM.cpp @@ -19,12 +19,12 @@ #include +#include #include +#include #include #include #include -#include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/AMMTest.cpp b/src/test/jtx/impl/AMMTest.cpp index 184a6352b..575e2e1d8 100644 --- a/src/test/jtx/impl/AMMTest.cpp +++ b/src/test/jtx/impl/AMMTest.cpp @@ -19,13 +19,13 @@ #include -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/Account.cpp b/src/test/jtx/impl/Account.cpp index b005f436d..9d41456ef 100644 --- a/src/test/jtx/impl/Account.cpp +++ b/src/test/jtx/impl/Account.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include #include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/Env.cpp b/src/test/jtx/impl/Env.cpp index 7d2eb019e..f65200fcc 100644 --- a/src/test/jtx/impl/Env.cpp +++ b/src/test/jtx/impl/Env.cpp @@ -17,15 +17,26 @@ */ //============================================================================== +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include -#include #include -#include #include #include +#include +#include +#include #include #include #include @@ -38,17 +49,6 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/JSONRPCClient.cpp b/src/test/jtx/impl/JSONRPCClient.cpp index 50c07f141..20f2149e4 100644 --- a/src/test/jtx/impl/JSONRPCClient.cpp +++ b/src/test/jtx/impl/JSONRPCClient.cpp @@ -16,6 +16,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== +#include #include #include #include @@ -27,7 +28,6 @@ #include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/Oracle.cpp b/src/test/jtx/impl/Oracle.cpp index efde9e43f..df9483cba 100644 --- a/src/test/jtx/impl/Oracle.cpp +++ b/src/test/jtx/impl/Oracle.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include #include #include diff --git a/src/test/jtx/impl/TestHelpers.cpp b/src/test/jtx/impl/TestHelpers.cpp index abaa61e4f..352b2e2f0 100644 --- a/src/test/jtx/impl/TestHelpers.cpp +++ b/src/test/jtx/impl/TestHelpers.cpp @@ -19,9 +19,9 @@ #include -#include #include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/WSClient.cpp b/src/test/jtx/impl/WSClient.cpp index 4f7e57508..185d0ea5d 100644 --- a/src/test/jtx/impl/WSClient.cpp +++ b/src/test/jtx/impl/WSClient.cpp @@ -17,14 +17,14 @@ */ //============================================================================== +#include +#include #include #include #include #include #include #include -#include -#include #include #include diff --git a/src/test/jtx/impl/acctdelete.cpp b/src/test/jtx/impl/acctdelete.cpp index e548d4c7a..f79661530 100644 --- a/src/test/jtx/impl/acctdelete.cpp +++ b/src/test/jtx/impl/acctdelete.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include #include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/amount.cpp b/src/test/jtx/impl/amount.cpp index 12f953f16..01fa53695 100644 --- a/src/test/jtx/impl/amount.cpp +++ b/src/test/jtx/impl/amount.cpp @@ -17,12 +17,12 @@ */ //============================================================================== +#include +#include #include #include #include #include -#include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/check.cpp b/src/test/jtx/impl/check.cpp index 3856d6b09..21af6c9cc 100644 --- a/src/test/jtx/impl/check.cpp +++ b/src/test/jtx/impl/check.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/delivermin.cpp b/src/test/jtx/impl/delivermin.cpp index 1c32aa1b3..6e4838c7c 100644 --- a/src/test/jtx/impl/delivermin.cpp +++ b/src/test/jtx/impl/delivermin.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/deposit.cpp b/src/test/jtx/impl/deposit.cpp index 4d0352273..09f0cb704 100644 --- a/src/test/jtx/impl/deposit.cpp +++ b/src/test/jtx/impl/deposit.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/did.cpp b/src/test/jtx/impl/did.cpp index 74bc97238..a9a6e974e 100644 --- a/src/test/jtx/impl/did.cpp +++ b/src/test/jtx/impl/did.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/envconfig.cpp b/src/test/jtx/impl/envconfig.cpp index ab60daa87..855c16a2a 100644 --- a/src/test/jtx/impl/envconfig.cpp +++ b/src/test/jtx/impl/envconfig.cpp @@ -19,8 +19,8 @@ #include -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/fee.cpp b/src/test/jtx/impl/fee.cpp index 8e80b5132..e390136a3 100644 --- a/src/test/jtx/impl/fee.cpp +++ b/src/test/jtx/impl/fee.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/flags.cpp b/src/test/jtx/impl/flags.cpp index ccbffea34..992e1a88b 100644 --- a/src/test/jtx/impl/flags.cpp +++ b/src/test/jtx/impl/flags.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/genesis.cpp b/src/test/jtx/impl/genesis.cpp index 7b1d54f09..a4e898f44 100644 --- a/src/test/jtx/impl/genesis.cpp +++ b/src/test/jtx/impl/genesis.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/hook.cpp b/src/test/jtx/impl/hook.cpp index 0e3e42e6e..3b4ad33eb 100644 --- a/src/test/jtx/impl/hook.cpp +++ b/src/test/jtx/impl/hook.cpp @@ -17,11 +17,11 @@ */ //============================================================================== +#include #include #include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/import.cpp b/src/test/jtx/impl/import.cpp index 7333ff7b5..7ba068923 100644 --- a/src/test/jtx/impl/import.cpp +++ b/src/test/jtx/impl/import.cpp @@ -17,10 +17,10 @@ */ //============================================================================== +#include #include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/invoke.cpp b/src/test/jtx/impl/invoke.cpp index 573caed15..6b3665a94 100644 --- a/src/test/jtx/impl/invoke.cpp +++ b/src/test/jtx/impl/invoke.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/jtx_json.cpp b/src/test/jtx/impl/jtx_json.cpp index 64614cda2..c9cf6636c 100644 --- a/src/test/jtx/impl/jtx_json.cpp +++ b/src/test/jtx/impl/jtx_json.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include #include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/last_ledger_sequence.cpp b/src/test/jtx/impl/last_ledger_sequence.cpp index 77a428df7..57742bab2 100644 --- a/src/test/jtx/impl/last_ledger_sequence.cpp +++ b/src/test/jtx/impl/last_ledger_sequence.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/memo.cpp b/src/test/jtx/impl/memo.cpp index d03242f31..6469748b4 100644 --- a/src/test/jtx/impl/memo.cpp +++ b/src/test/jtx/impl/memo.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/multisign.cpp b/src/test/jtx/impl/multisign.cpp index c76d62221..42c3bfc78 100644 --- a/src/test/jtx/impl/multisign.cpp +++ b/src/test/jtx/impl/multisign.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +#include +#include #include #include #include @@ -24,8 +26,6 @@ #include #include #include -#include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/network.cpp b/src/test/jtx/impl/network.cpp index 935cf34c1..8b4fb1285 100644 --- a/src/test/jtx/impl/network.cpp +++ b/src/test/jtx/impl/network.cpp @@ -17,14 +17,14 @@ */ //============================================================================== +#include +#include #include #include #include #include #include #include -#include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/offer.cpp b/src/test/jtx/impl/offer.cpp index 96ea6da5e..8f43728d4 100644 --- a/src/test/jtx/impl/offer.cpp +++ b/src/test/jtx/impl/offer.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/paths.cpp b/src/test/jtx/impl/paths.cpp index c7d68cf99..393e36e9d 100644 --- a/src/test/jtx/impl/paths.cpp +++ b/src/test/jtx/impl/paths.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/pay.cpp b/src/test/jtx/impl/pay.cpp index f912cfbce..2a627223f 100644 --- a/src/test/jtx/impl/pay.cpp +++ b/src/test/jtx/impl/pay.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/paychan.cpp b/src/test/jtx/impl/paychan.cpp index c640261df..a2e056ff2 100644 --- a/src/test/jtx/impl/paychan.cpp +++ b/src/test/jtx/impl/paychan.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/quality2.cpp b/src/test/jtx/impl/quality2.cpp index a7eb52b95..dd10b3c61 100644 --- a/src/test/jtx/impl/quality2.cpp +++ b/src/test/jtx/impl/quality2.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/rate.cpp b/src/test/jtx/impl/rate.cpp index 9f8ae5d1b..f95170537 100644 --- a/src/test/jtx/impl/rate.cpp +++ b/src/test/jtx/impl/rate.cpp @@ -17,10 +17,10 @@ */ //============================================================================== +#include #include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/regkey.cpp b/src/test/jtx/impl/regkey.cpp index 23194ae57..9fc260d2d 100644 --- a/src/test/jtx/impl/regkey.cpp +++ b/src/test/jtx/impl/regkey.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/remarks.cpp b/src/test/jtx/impl/remarks.cpp index d303609ea..6b05be219 100644 --- a/src/test/jtx/impl/remarks.cpp +++ b/src/test/jtx/impl/remarks.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/remit.cpp b/src/test/jtx/impl/remit.cpp index 27ca5a8c0..bcee071ce 100644 --- a/src/test/jtx/impl/remit.cpp +++ b/src/test/jtx/impl/remit.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/reward.cpp b/src/test/jtx/impl/reward.cpp index 34e3075c1..49714200c 100644 --- a/src/test/jtx/impl/reward.cpp +++ b/src/test/jtx/impl/reward.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/sendmax.cpp b/src/test/jtx/impl/sendmax.cpp index 404c78634..9514b9231 100644 --- a/src/test/jtx/impl/sendmax.cpp +++ b/src/test/jtx/impl/sendmax.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/seq.cpp b/src/test/jtx/impl/seq.cpp index 843a989cb..3a3de002d 100644 --- a/src/test/jtx/impl/seq.cpp +++ b/src/test/jtx/impl/seq.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/tag.cpp b/src/test/jtx/impl/tag.cpp index 44fedfb7f..be456a1e0 100644 --- a/src/test/jtx/impl/tag.cpp +++ b/src/test/jtx/impl/tag.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/ticket.cpp b/src/test/jtx/impl/ticket.cpp index 3b62dd7f3..69bcab4d9 100644 --- a/src/test/jtx/impl/ticket.cpp +++ b/src/test/jtx/impl/ticket.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/trust.cpp b/src/test/jtx/impl/trust.cpp index 0d1fef2ea..641a0f79f 100644 --- a/src/test/jtx/impl/trust.cpp +++ b/src/test/jtx/impl/trust.cpp @@ -17,10 +17,10 @@ */ //============================================================================== +#include #include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/txflags.cpp b/src/test/jtx/impl/txflags.cpp index e5ebb5f54..7bc59876a 100644 --- a/src/test/jtx/impl/txflags.cpp +++ b/src/test/jtx/impl/txflags.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/unl.cpp b/src/test/jtx/impl/unl.cpp index 7630c9cb1..646290b4a 100644 --- a/src/test/jtx/impl/unl.cpp +++ b/src/test/jtx/impl/unl.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/uritoken.cpp b/src/test/jtx/impl/uritoken.cpp index f6230c96e..445d7cd1f 100644 --- a/src/test/jtx/impl/uritoken.cpp +++ b/src/test/jtx/impl/uritoken.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/utility.cpp b/src/test/jtx/impl/utility.cpp index 0367e6d87..c10fb9185 100644 --- a/src/test/jtx/impl/utility.cpp +++ b/src/test/jtx/impl/utility.cpp @@ -17,9 +17,10 @@ */ //============================================================================== +#include +#include #include #include -#include #include #include #include @@ -27,7 +28,6 @@ #include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/impl/xchain_bridge.cpp b/src/test/jtx/impl/xchain_bridge.cpp index ecd606f23..43b0e7c2f 100644 --- a/src/test/jtx/impl/xchain_bridge.cpp +++ b/src/test/jtx/impl/xchain_bridge.cpp @@ -19,6 +19,8 @@ #include +#include +#include #include #include #include @@ -28,8 +30,6 @@ #include #include #include -#include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/jtx_json.h b/src/test/jtx/jtx_json.h index 730ef0c6a..837d65247 100644 --- a/src/test/jtx/jtx_json.h +++ b/src/test/jtx/jtx_json.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TEST_JTX_JSON_H_INCLUDED #define RIPPLE_TEST_JTX_JSON_H_INCLUDED -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/multisign.h b/src/test/jtx/multisign.h index fd04ada66..e1e93eac2 100644 --- a/src/test/jtx/multisign.h +++ b/src/test/jtx/multisign.h @@ -20,13 +20,13 @@ #ifndef RIPPLE_TEST_JTX_MULTISIGN_H_INCLUDED #define RIPPLE_TEST_JTX_MULTISIGN_H_INCLUDED -#include -#include -#include #include #include #include #include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/offer.h b/src/test/jtx/offer.h index d929b7e78..d5c946635 100644 --- a/src/test/jtx/offer.h +++ b/src/test/jtx/offer.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_TEST_JTX_OFFER_H_INCLUDED #define RIPPLE_TEST_JTX_OFFER_H_INCLUDED -#include -#include #include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/owners.h b/src/test/jtx/owners.h index f7ee6b22a..2299af2d7 100644 --- a/src/test/jtx/owners.h +++ b/src/test/jtx/owners.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_TEST_JTX_OWNERS_H_INCLUDED #define RIPPLE_TEST_JTX_OWNERS_H_INCLUDED +#include #include #include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/paths.h b/src/test/jtx/paths.h index fc80a3df7..cc9caf3af 100644 --- a/src/test/jtx/paths.h +++ b/src/test/jtx/paths.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TEST_JTX_PATHS_H_INCLUDED #define RIPPLE_TEST_JTX_PATHS_H_INCLUDED -#include #include +#include #include namespace ripple { diff --git a/src/test/jtx/pay.h b/src/test/jtx/pay.h index 1b06d6628..6294b5b30 100644 --- a/src/test/jtx/pay.h +++ b/src/test/jtx/pay.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_TEST_JTX_PAY_H_INCLUDED #define RIPPLE_TEST_JTX_PAY_H_INCLUDED -#include #include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/paychan.h b/src/test/jtx/paychan.h index f33ed15f1..4867d5e9e 100644 --- a/src/test/jtx/paychan.h +++ b/src/test/jtx/paychan.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_TEST_JTX_PAYCHAN_H_INCLUDED #define RIPPLE_TEST_JTX_PAYCHAN_H_INCLUDED +#include #include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/prop.h b/src/test/jtx/prop.h index 6724ebf80..8dc5f2191 100644 --- a/src/test/jtx/prop.h +++ b/src/test/jtx/prop.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TEST_JTX_PROP_H_INCLUDED #define RIPPLE_TEST_JTX_PROP_H_INCLUDED -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/rate.h b/src/test/jtx/rate.h index 36606216d..0f8186acc 100644 --- a/src/test/jtx/rate.h +++ b/src/test/jtx/rate.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TEST_JTX_RATE_H_INCLUDED #define RIPPLE_TEST_JTX_RATE_H_INCLUDED -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/regkey.h b/src/test/jtx/regkey.h index 7a1f0e2e0..7d021e4f2 100644 --- a/src/test/jtx/regkey.h +++ b/src/test/jtx/regkey.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_TEST_JTX_REGKEY_H_INCLUDED #define RIPPLE_TEST_JTX_REGKEY_H_INCLUDED -#include #include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/remit.h b/src/test/jtx/remit.h index 5c455df0b..4db4b24c2 100644 --- a/src/test/jtx/remit.h +++ b/src/test/jtx/remit.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_TEST_JTX_REMIT_H_INCLUDED #define RIPPLE_TEST_JTX_REMIT_H_INCLUDED -#include #include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/require.h b/src/test/jtx/require.h index 64b1f36b5..271419e51 100644 --- a/src/test/jtx/require.h +++ b/src/test/jtx/require.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TEST_JTX_REQUIRE_H_INCLUDED #define RIPPLE_TEST_JTX_REQUIRE_H_INCLUDED -#include #include +#include #include namespace ripple { diff --git a/src/test/jtx/sendmax.h b/src/test/jtx/sendmax.h index 27c0b763b..495c61c33 100644 --- a/src/test/jtx/sendmax.h +++ b/src/test/jtx/sendmax.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TEST_JTX_SENDMAX_H_INCLUDED #define RIPPLE_TEST_JTX_SENDMAX_H_INCLUDED -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/trust.h b/src/test/jtx/trust.h index 22400295a..f9fddf487 100644 --- a/src/test/jtx/trust.h +++ b/src/test/jtx/trust.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_TEST_JTX_TRUST_H_INCLUDED #define RIPPLE_TEST_JTX_TRUST_H_INCLUDED +#include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/unl.h b/src/test/jtx/unl.h index 32b92c1cd..102067238 100644 --- a/src/test/jtx/unl.h +++ b/src/test/jtx/unl.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_TEST_JTX_UNL_H_INCLUDED #define RIPPLE_TEST_JTX_UNL_H_INCLUDED -#include #include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/uritoken.h b/src/test/jtx/uritoken.h index 7c0ddf411..c03a580e5 100644 --- a/src/test/jtx/uritoken.h +++ b/src/test/jtx/uritoken.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_TEST_JTX_URITOKEN_H_INCLUDED #define RIPPLE_TEST_JTX_URITOKEN_H_INCLUDED -#include #include #include +#include namespace ripple { namespace test { diff --git a/src/test/jtx/utility.h b/src/test/jtx/utility.h index 249b397a7..6d34452cd 100644 --- a/src/test/jtx/utility.h +++ b/src/test/jtx/utility.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_TEST_JTX_UTILITY_H_INCLUDED #define RIPPLE_TEST_JTX_UTILITY_H_INCLUDED +#include #include +#include #include #include -#include #include -#include namespace ripple { namespace test { diff --git a/src/test/jtx/xchain_bridge.h b/src/test/jtx/xchain_bridge.h index 1ffbae843..9968317c8 100644 --- a/src/test/jtx/xchain_bridge.h +++ b/src/test/jtx/xchain_bridge.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_TEST_JTX_XCHAINBRIDGE_H_INCLUDED #define RIPPLE_TEST_JTX_XCHAINBRIDGE_H_INCLUDED -#include -#include -#include #include #include #include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/ledger/BookDirs_test.cpp b/src/test/ledger/BookDirs_test.cpp index 2082a9cea..b50f4381f 100644 --- a/src/test/ledger/BookDirs_test.cpp +++ b/src/test/ledger/BookDirs_test.cpp @@ -15,9 +15,9 @@ */ //============================================================================== +#include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/ledger/Directory_test.cpp b/src/test/ledger/Directory_test.cpp index 273cb21ee..1a14feff0 100644 --- a/src/test/ledger/Directory_test.cpp +++ b/src/test/ledger/Directory_test.cpp @@ -15,15 +15,15 @@ */ //============================================================================== -#include +#include #include #include #include +#include #include #include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/ledger/Invariants_test.cpp b/src/test/ledger/Invariants_test.cpp index 15dec0db1..1861bf5d2 100644 --- a/src/test/ledger/Invariants_test.cpp +++ b/src/test/ledger/Invariants_test.cpp @@ -17,14 +17,14 @@ */ //============================================================================== +#include +#include #include #include #include #include #include #include -#include -#include namespace ripple { diff --git a/src/test/ledger/PaymentSandbox_test.cpp b/src/test/ledger/PaymentSandbox_test.cpp index 05bde8f29..e3ede19b4 100644 --- a/src/test/ledger/PaymentSandbox_test.cpp +++ b/src/test/ledger/PaymentSandbox_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== +#include #include #include #include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/ledger/SkipList_test.cpp b/src/test/ledger/SkipList_test.cpp index 959913434..3e8987a80 100644 --- a/src/test/ledger/SkipList_test.cpp +++ b/src/test/ledger/SkipList_test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== +#include #include +#include #include #include -#include -#include namespace ripple { namespace test { diff --git a/src/test/ledger/View_test.cpp b/src/test/ledger/View_test.cpp index a84335846..29ceb54cc 100644 --- a/src/test/ledger/View_test.cpp +++ b/src/test/ledger/View_test.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include #include #include #include @@ -25,7 +26,6 @@ #include #include #include -#include #include namespace ripple { diff --git a/src/test/net/DatabaseDownloader_test.cpp b/src/test/net/DatabaseDownloader_test.cpp index 8ba921e23..99e98dd3d 100644 --- a/src/test/net/DatabaseDownloader_test.cpp +++ b/src/test/net/DatabaseDownloader_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== +#include +#include +#include #include #include #include #include -#include -#include -#include namespace ripple { namespace test { diff --git a/src/test/nodestore/Backend_test.cpp b/src/test/nodestore/Backend_test.cpp index 05c1bd76e..b003fd866 100644 --- a/src/test/nodestore/Backend_test.cpp +++ b/src/test/nodestore/Backend_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include +#include +#include #include #include #include +#include #include -#include -#include namespace ripple { diff --git a/src/test/nodestore/Basics_test.cpp b/src/test/nodestore/Basics_test.cpp index 0779d51d4..aa423e7dc 100644 --- a/src/test/nodestore/Basics_test.cpp +++ b/src/test/nodestore/Basics_test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== +#include #include #include #include #include -#include namespace ripple { namespace NodeStore { diff --git a/src/test/nodestore/DatabaseShard_test.cpp b/src/test/nodestore/DatabaseShard_test.cpp index 5c4d67a8c..e185c43d1 100644 --- a/src/test/nodestore/DatabaseShard_test.cpp +++ b/src/test/nodestore/DatabaseShard_test.cpp @@ -17,24 +17,24 @@ */ //============================================================================== +#include +#include +#include #include #include #include #include #include -#include -#include -#include -#include #include #include #include #include #include +#include +#include +#include +#include #include -#include -#include -#include #include #include diff --git a/src/test/nodestore/Database_test.cpp b/src/test/nodestore/Database_test.cpp index 07afe2058..6e8855f32 100644 --- a/src/test/nodestore/Database_test.cpp +++ b/src/test/nodestore/Database_test.cpp @@ -17,15 +17,15 @@ */ //============================================================================== -#include -#include -#include -#include #include #include #include #include #include +#include +#include +#include +#include namespace ripple { diff --git a/src/test/nodestore/TestBase.h b/src/test/nodestore/TestBase.h index 44459e4fa..98608c5fb 100644 --- a/src/test/nodestore/TestBase.h +++ b/src/test/nodestore/TestBase.h @@ -20,14 +20,14 @@ #ifndef RIPPLE_NODESTORE_BASE_H_INCLUDED #define RIPPLE_NODESTORE_BASE_H_INCLUDED +#include +#include +#include #include #include #include #include #include -#include -#include -#include #include #include diff --git a/src/test/nodestore/Timing_test.cpp b/src/test/nodestore/Timing_test.cpp index 8fcbd8ff7..73789c024 100644 --- a/src/test/nodestore/Timing_test.cpp +++ b/src/test/nodestore/Timing_test.cpp @@ -17,6 +17,11 @@ */ //============================================================================== +#include +#include +#include +#include +#include #include #include #include @@ -24,9 +29,6 @@ #include #include #include -#include -#include -#include #include #include #include @@ -36,8 +38,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/src/test/nodestore/import_test.cpp b/src/test/nodestore/import_test.cpp index cb0c72f48..e13fe9c0c 100644 --- a/src/test/nodestore/import_test.cpp +++ b/src/test/nodestore/import_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== +#include #include #include #include #include #include -#include #include #include #include diff --git a/src/test/nodestore/varint_test.cpp b/src/test/nodestore/varint_test.cpp index 0de3f6420..da7ae9d28 100644 --- a/src/test/nodestore/varint_test.cpp +++ b/src/test/nodestore/varint_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include #include #include diff --git a/src/test/overlay/ProtocolVersion_test.cpp b/src/test/overlay/ProtocolVersion_test.cpp index 937550235..dfc0ee70b 100644 --- a/src/test/overlay/ProtocolVersion_test.cpp +++ b/src/test/overlay/ProtocolVersion_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { diff --git a/src/test/overlay/cluster_test.cpp b/src/test/overlay/cluster_test.cpp index 3a1dce7b0..d22674d28 100644 --- a/src/test/overlay/cluster_test.cpp +++ b/src/test/overlay/cluster_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include #include #include +#include +#include +#include +#include namespace ripple { namespace tests { diff --git a/src/test/overlay/compression_test.cpp b/src/test/overlay/compression_test.cpp index d4f36389c..19669efc2 100644 --- a/src/test/overlay/compression_test.cpp +++ b/src/test/overlay/compression_test.cpp @@ -17,17 +17,23 @@ */ //============================================================================== +#include +#include +#include +#include +#include #include #include #include -#include -#include -#include #include #include #include #include #include +#include +#include +#include +#include #include #include #include @@ -35,16 +41,10 @@ #include #include #include -#include #include #include #include #include -#include -#include -#include -#include -#include namespace ripple { diff --git a/src/test/overlay/handshake_test.cpp b/src/test/overlay/handshake_test.cpp index ed9040769..93038e522 100644 --- a/src/test/overlay/handshake_test.cpp +++ b/src/test/overlay/handshake_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { diff --git a/src/test/overlay/reduce_relay_test.cpp b/src/test/overlay/reduce_relay_test.cpp index 2600594e0..4d9086dab 100644 --- a/src/test/overlay/reduce_relay_test.cpp +++ b/src/test/overlay/reduce_relay_test.cpp @@ -16,15 +16,15 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include -#include +#include #include #include #include #include +#include +#include #include #include -#include #include diff --git a/src/test/overlay/short_read_test.cpp b/src/test/overlay/short_read_test.cpp index 888419283..6dd4f8c00 100644 --- a/src/test/overlay/short_read_test.cpp +++ b/src/test/overlay/short_read_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== +#include #include #include #include -#include #include #include diff --git a/src/test/overlay/tx_reduce_relay_test.cpp b/src/test/overlay/tx_reduce_relay_test.cpp index dac9f32e3..074976e85 100644 --- a/src/test/overlay/tx_reduce_relay_test.cpp +++ b/src/test/overlay/tx_reduce_relay_test.cpp @@ -16,12 +16,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== -#include -#include +#include #include #include #include -#include +#include +#include namespace ripple { diff --git a/src/test/peerfinder/Livecache_test.cpp b/src/test/peerfinder/Livecache_test.cpp index b93647f54..7fb9f02f4 100644 --- a/src/test/peerfinder/Livecache_test.cpp +++ b/src/test/peerfinder/Livecache_test.cpp @@ -17,14 +17,14 @@ */ //============================================================================== +#include +#include +#include #include #include #include #include -#include #include -#include -#include namespace ripple { namespace PeerFinder { diff --git a/src/test/peerfinder/PeerFinder_test.cpp b/src/test/peerfinder/PeerFinder_test.cpp index 1f9588a0e..a1cb8d740 100644 --- a/src/test/peerfinder/PeerFinder_test.cpp +++ b/src/test/peerfinder/PeerFinder_test.cpp @@ -17,15 +17,15 @@ */ //============================================================================== +#include +#include +#include #include #include #include #include -#include -#include #include #include -#include namespace ripple { namespace PeerFinder { diff --git a/src/test/protocol/Hooks_test.cpp b/src/test/protocol/Hooks_test.cpp index 7d787d921..fb61d10a7 100644 --- a/src/test/protocol/Hooks_test.cpp +++ b/src/test/protocol/Hooks_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== +#include #include #include #include -#include #include namespace ripple { diff --git a/src/test/protocol/InnerObjectFormats_test.cpp b/src/test/protocol/InnerObjectFormats_test.cpp index 1302fe43e..cfc8d123c 100644 --- a/src/test/protocol/InnerObjectFormats_test.cpp +++ b/src/test/protocol/InnerObjectFormats_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== +#include #include #include #include // Json::Reader #include // RPC::containsError #include #include // STParsedJSONObject -#include namespace ripple { diff --git a/src/test/protocol/Memo_test.cpp b/src/test/protocol/Memo_test.cpp index 53edaa5b0..6c692a40a 100644 --- a/src/test/protocol/Memo_test.cpp +++ b/src/test/protocol/Memo_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include namespace ripple { #define MEMOFEE fee(1'000'000) diff --git a/src/test/protocol/STObject_test.cpp b/src/test/protocol/STObject_test.cpp index 3a7172dbd..39a5b9c2f 100644 --- a/src/test/protocol/STObject_test.cpp +++ b/src/test/protocol/STObject_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== +#include #include #include #include #include #include #include -#include #include #include diff --git a/src/test/protocol/STValidation_test.cpp b/src/test/protocol/STValidation_test.cpp index df9a7cc5f..8efb58474 100644 --- a/src/test/protocol/STValidation_test.cpp +++ b/src/test/protocol/STValidation_test.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include #include #include #include @@ -26,7 +27,6 @@ #include #include #include -#include #include #include diff --git a/src/test/resource/Logic_test.cpp b/src/test/resource/Logic_test.cpp index 6d110eb41..b445890c3 100644 --- a/src/test/resource/Logic_test.cpp +++ b/src/test/resource/Logic_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== +#include #include #include #include #include #include #include -#include #include #include diff --git a/src/test/rpc/AMMInfo_test.cpp b/src/test/rpc/AMMInfo_test.cpp index 54b736f37..e4523bb04 100644 --- a/src/test/rpc/AMMInfo_test.cpp +++ b/src/test/rpc/AMMInfo_test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include #include #include #include +#include +#include #include diff --git a/src/test/rpc/AccountCurrencies_test.cpp b/src/test/rpc/AccountCurrencies_test.cpp index 62ae37f79..7d16ca48a 100644 --- a/src/test/rpc/AccountCurrencies_test.cpp +++ b/src/test/rpc/AccountCurrencies_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include namespace ripple { diff --git a/src/test/rpc/AccountInfo_test.cpp b/src/test/rpc/AccountInfo_test.cpp index b37ac14ef..30c673569 100644 --- a/src/test/rpc/AccountInfo_test.cpp +++ b/src/test/rpc/AccountInfo_test.cpp @@ -17,15 +17,15 @@ */ //============================================================================== +#include #include #include -#include -#include -#include -#include #include #include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/rpc/AccountLines_test.cpp b/src/test/rpc/AccountLines_test.cpp index df090f6e5..d104ea14b 100644 --- a/src/test/rpc/AccountLines_test.cpp +++ b/src/test/rpc/AccountLines_test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== +#include #include #include #include #include -#include namespace ripple { diff --git a/src/test/rpc/AccountNamespace_test.cpp b/src/test/rpc/AccountNamespace_test.cpp index 20ba33130..8a8809889 100644 --- a/src/test/rpc/AccountNamespace_test.cpp +++ b/src/test/rpc/AccountNamespace_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/rpc/AccountObjects_test.cpp b/src/test/rpc/AccountObjects_test.cpp index f7f517124..dc26c871b 100644 --- a/src/test/rpc/AccountObjects_test.cpp +++ b/src/test/rpc/AccountObjects_test.cpp @@ -17,14 +17,14 @@ */ //============================================================================== +#include +#include +#include #include #include #include #include #include -#include -#include -#include #include diff --git a/src/test/rpc/AccountOffers_test.cpp b/src/test/rpc/AccountOffers_test.cpp index 1a6578f1f..64113915e 100644 --- a/src/test/rpc/AccountOffers_test.cpp +++ b/src/test/rpc/AccountOffers_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/rpc/AccountSet_test.cpp b/src/test/rpc/AccountSet_test.cpp index f5be1fb95..4c314368f 100644 --- a/src/test/rpc/AccountSet_test.cpp +++ b/src/test/rpc/AccountSet_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== +#include #include #include #include #include #include #include -#include namespace ripple { diff --git a/src/test/rpc/AccountTx_test.cpp b/src/test/rpc/AccountTx_test.cpp index 1740ae085..6633875ae 100644 --- a/src/test/rpc/AccountTx_test.cpp +++ b/src/test/rpc/AccountTx_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== +#include #include #include #include #include #include -#include #include diff --git a/src/test/rpc/AmendmentBlocked_test.cpp b/src/test/rpc/AmendmentBlocked_test.cpp index b8e3c6cb6..196ce0e46 100644 --- a/src/test/rpc/AmendmentBlocked_test.cpp +++ b/src/test/rpc/AmendmentBlocked_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== +#include +#include #include #include #include #include -#include -#include namespace ripple { diff --git a/src/test/rpc/Book_test.cpp b/src/test/rpc/Book_test.cpp index 1d8519198..261fe1458 100644 --- a/src/test/rpc/Book_test.cpp +++ b/src/test/rpc/Book_test.cpp @@ -15,12 +15,12 @@ */ //============================================================================== +#include +#include +#include #include #include #include -#include -#include -#include namespace ripple { namespace test { diff --git a/src/test/rpc/Catalogue_test.cpp b/src/test/rpc/Catalogue_test.cpp index ccce6a515..1e699339e 100644 --- a/src/test/rpc/Catalogue_test.cpp +++ b/src/test/rpc/Catalogue_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== +#include #include #include #include #include #include #include -#include #include namespace ripple { diff --git a/src/test/rpc/DeliveredAmount_test.cpp b/src/test/rpc/DeliveredAmount_test.cpp index 210285c83..422adeffd 100644 --- a/src/test/rpc/DeliveredAmount_test.cpp +++ b/src/test/rpc/DeliveredAmount_test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== +#include +#include #include #include #include -#include -#include namespace ripple { namespace test { diff --git a/src/test/rpc/DepositAuthorized_test.cpp b/src/test/rpc/DepositAuthorized_test.cpp index f665b6fd8..ebabe1fbe 100644 --- a/src/test/rpc/DepositAuthorized_test.cpp +++ b/src/test/rpc/DepositAuthorized_test.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace test { diff --git a/src/test/rpc/Feature_test.cpp b/src/test/rpc/Feature_test.cpp index 90d9e5d6b..488255542 100644 --- a/src/test/rpc/Feature_test.cpp +++ b/src/test/rpc/Feature_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== +#include #include #include #include -#include namespace ripple { diff --git a/src/test/rpc/GRPCTestClientBase.h b/src/test/rpc/GRPCTestClientBase.h index c57c77ccf..f8b74ed6d 100644 --- a/src/test/rpc/GRPCTestClientBase.h +++ b/src/test/rpc/GRPCTestClientBase.h @@ -20,9 +20,9 @@ #ifndef RIPPLED_GRPCTESTCLIENTBASE_H #define RIPPLED_GRPCTESTCLIENTBASE_H -#include -#include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/rpc/GatewayBalances_test.cpp b/src/test/rpc/GatewayBalances_test.cpp index 2bcf9aec2..4e847c8db 100644 --- a/src/test/rpc/GatewayBalances_test.cpp +++ b/src/test/rpc/GatewayBalances_test.cpp @@ -15,12 +15,12 @@ */ //============================================================================== +#include +#include +#include #include #include #include -#include -#include -#include namespace ripple { namespace test { diff --git a/src/test/rpc/GetAggregatePrice_test.cpp b/src/test/rpc/GetAggregatePrice_test.cpp index c1fc6d626..aad3c9be9 100644 --- a/src/test/rpc/GetAggregatePrice_test.cpp +++ b/src/test/rpc/GetAggregatePrice_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include #include #include +#include +#include namespace ripple { namespace test { diff --git a/src/test/rpc/GetCounts_test.cpp b/src/test/rpc/GetCounts_test.cpp index ec2e56811..7411dddc8 100644 --- a/src/test/rpc/GetCounts_test.cpp +++ b/src/test/rpc/GetCounts_test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== +#include #include #include #include #include -#include namespace ripple { diff --git a/src/test/rpc/Handler_test.cpp b/src/test/rpc/Handler_test.cpp index 0449789c3..2c3bfd30d 100644 --- a/src/test/rpc/Handler_test.cpp +++ b/src/test/rpc/Handler_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include #include #include diff --git a/src/test/rpc/JSONRPC_test.cpp b/src/test/rpc/JSONRPC_test.cpp index 31e30e12f..b2b9e7a55 100644 --- a/src/test/rpc/JSONRPC_test.cpp +++ b/src/test/rpc/JSONRPC_test.cpp @@ -17,17 +17,17 @@ */ //============================================================================== +#include +#include #include #include +#include +#include #include #include -#include #include #include #include -#include -#include -#include namespace ripple { @@ -2550,7 +2550,7 @@ public: NetworkOPs::FailHard failType, Role role, std::chrono::seconds validatedLedgerAge, - Application & app, + Application& app, ProcessTransactionFn const& processTransaction); using TestStuff = diff --git a/src/test/rpc/KeyGeneration_test.cpp b/src/test/rpc/KeyGeneration_test.cpp index 48a8f0933..e136bb04b 100644 --- a/src/test/rpc/KeyGeneration_test.cpp +++ b/src/test/rpc/KeyGeneration_test.cpp @@ -16,13 +16,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ //============================================================================== +#include +#include +#include #include #include #include #include -#include -#include -#include namespace ripple { diff --git a/src/test/rpc/LedgerClosed_test.cpp b/src/test/rpc/LedgerClosed_test.cpp index 32a42b1a7..d0b3fcc91 100644 --- a/src/test/rpc/LedgerClosed_test.cpp +++ b/src/test/rpc/LedgerClosed_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include namespace ripple { diff --git a/src/test/rpc/LedgerData_test.cpp b/src/test/rpc/LedgerData_test.cpp index 29a5ebca2..ab7b91e27 100644 --- a/src/test/rpc/LedgerData_test.cpp +++ b/src/test/rpc/LedgerData_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== +#include +#include #include #include #include #include -#include -#include namespace ripple { diff --git a/src/test/rpc/LedgerHeader_test.cpp b/src/test/rpc/LedgerHeader_test.cpp index 2ff66c79d..d8fe738b8 100644 --- a/src/test/rpc/LedgerHeader_test.cpp +++ b/src/test/rpc/LedgerHeader_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include #include #include +#include namespace ripple { diff --git a/src/test/rpc/LedgerRPC_test.cpp b/src/test/rpc/LedgerRPC_test.cpp index 5a2822794..47f30d374 100644 --- a/src/test/rpc/LedgerRPC_test.cpp +++ b/src/test/rpc/LedgerRPC_test.cpp @@ -17,6 +17,12 @@ */ //============================================================================== +#include +#include +#include +#include +#include +#include #include #include #include @@ -26,12 +32,6 @@ #include #include #include -#include -#include -#include -#include -#include -#include namespace ripple { diff --git a/src/test/rpc/LedgerRequestRPC_test.cpp b/src/test/rpc/LedgerRequestRPC_test.cpp index eff478ca6..c21743e9b 100644 --- a/src/test/rpc/LedgerRequestRPC_test.cpp +++ b/src/test/rpc/LedgerRequestRPC_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== +#include #include +#include #include #include #include -#include -#include #include diff --git a/src/test/rpc/ManifestRPC_test.cpp b/src/test/rpc/ManifestRPC_test.cpp index c67401fc8..fcf47a574 100644 --- a/src/test/rpc/ManifestRPC_test.cpp +++ b/src/test/rpc/ManifestRPC_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include #include +#include +#include +#include #include diff --git a/src/test/rpc/NoRippleCheck_test.cpp b/src/test/rpc/NoRippleCheck_test.cpp index 437b577f5..455136502 100644 --- a/src/test/rpc/NoRippleCheck_test.cpp +++ b/src/test/rpc/NoRippleCheck_test.cpp @@ -17,17 +17,17 @@ */ //============================================================================== +#include +#include #include +#include #include #include #include #include #include #include -#include #include -#include -#include namespace ripple { diff --git a/src/test/rpc/NoRipple_test.cpp b/src/test/rpc/NoRipple_test.cpp index 90c02fcb0..aa5e6e1ef 100644 --- a/src/test/rpc/NoRipple_test.cpp +++ b/src/test/rpc/NoRipple_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== +#include +#include #include #include -#include -#include namespace ripple { diff --git a/src/test/rpc/NodeToShardRPC_test.cpp b/src/test/rpc/NodeToShardRPC_test.cpp index 99c139166..b1c8bc7b3 100644 --- a/src/test/rpc/NodeToShardRPC_test.cpp +++ b/src/test/rpc/NodeToShardRPC_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include -#include +#include #include #include +#include +#include #include #include -#include namespace ripple { namespace test { diff --git a/src/test/rpc/Peers_test.cpp b/src/test/rpc/Peers_test.cpp index 69b83fa1b..ab9b17b25 100644 --- a/src/test/rpc/Peers_test.cpp +++ b/src/test/rpc/Peers_test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== +#include +#include #include #include #include -#include -#include #include namespace ripple { diff --git a/src/test/rpc/RPCCall_test.cpp b/src/test/rpc/RPCCall_test.cpp index bce301b1b..f16e7cf5e 100644 --- a/src/test/rpc/RPCCall_test.cpp +++ b/src/test/rpc/RPCCall_test.cpp @@ -15,13 +15,13 @@ */ //============================================================================== -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include #include diff --git a/src/test/rpc/RPCOverload_test.cpp b/src/test/rpc/RPCOverload_test.cpp index d706f8e8e..c3328fb0b 100644 --- a/src/test/rpc/RPCOverload_test.cpp +++ b/src/test/rpc/RPCOverload_test.cpp @@ -15,12 +15,12 @@ */ //============================================================================== -#include -#include -#include #include #include #include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/rpc/ReportingETL_test.cpp b/src/test/rpc/ReportingETL_test.cpp index d65414dca..84cf0a407 100644 --- a/src/test/rpc/ReportingETL_test.cpp +++ b/src/test/rpc/ReportingETL_test.cpp @@ -19,14 +19,14 @@ //============================================================================== #include -#include #include +#include -#include #include #include #include #include +#include namespace ripple { namespace test { diff --git a/src/test/rpc/RobustTransaction_test.cpp b/src/test/rpc/RobustTransaction_test.cpp index c4bd7109a..b0506224f 100644 --- a/src/test/rpc/RobustTransaction_test.cpp +++ b/src/test/rpc/RobustTransaction_test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include #include #include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/rpc/Roles_test.cpp b/src/test/rpc/Roles_test.cpp index 0de9071da..8cef5dcbc 100644 --- a/src/test/rpc/Roles_test.cpp +++ b/src/test/rpc/Roles_test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== +#include +#include #include #include #include -#include -#include #include diff --git a/src/test/rpc/ServerDefinitions_test.cpp b/src/test/rpc/ServerDefinitions_test.cpp index 7fcf6c2e2..0529708f4 100644 --- a/src/test/rpc/ServerDefinitions_test.cpp +++ b/src/test/rpc/ServerDefinitions_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== +#include #include #include #include #include #include -#include namespace ripple { diff --git a/src/test/rpc/ServerInfo_test.cpp b/src/test/rpc/ServerInfo_test.cpp index c31b2876b..a2eaa63eb 100644 --- a/src/test/rpc/ServerInfo_test.cpp +++ b/src/test/rpc/ServerInfo_test.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include -#include #include +#include +#include +#include +#include #include diff --git a/src/test/rpc/ShardArchiveHandler_test.cpp b/src/test/rpc/ShardArchiveHandler_test.cpp index abc5a2745..82f12fe49 100644 --- a/src/test/rpc/ShardArchiveHandler_test.cpp +++ b/src/test/rpc/ShardArchiveHandler_test.cpp @@ -17,19 +17,19 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { namespace test { diff --git a/src/test/rpc/Status_test.cpp b/src/test/rpc/Status_test.cpp index 7bdc37e84..1ae8b23c6 100644 --- a/src/test/rpc/Status_test.cpp +++ b/src/test/rpc/Status_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include #include namespace ripple { diff --git a/src/test/rpc/Subscribe_test.cpp b/src/test/rpc/Subscribe_test.cpp index f893da02a..fb20ad14a 100644 --- a/src/test/rpc/Subscribe_test.cpp +++ b/src/test/rpc/Subscribe_test.cpp @@ -15,17 +15,17 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/test/rpc/TransactionEntry_test.cpp b/src/test/rpc/TransactionEntry_test.cpp index e243c72d8..6e3af8a8a 100644 --- a/src/test/rpc/TransactionEntry_test.cpp +++ b/src/test/rpc/TransactionEntry_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== +#include +#include +#include #include #include #include -#include -#include -#include #include diff --git a/src/test/rpc/TransactionHistory_test.cpp b/src/test/rpc/TransactionHistory_test.cpp index dd74366cc..63151bdae 100644 --- a/src/test/rpc/TransactionHistory_test.cpp +++ b/src/test/rpc/TransactionHistory_test.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include #include #include #include +#include +#include +#include namespace ripple { diff --git a/src/test/rpc/Transaction_test.cpp b/src/test/rpc/Transaction_test.cpp index b30583965..a879a2bd5 100644 --- a/src/test/rpc/Transaction_test.cpp +++ b/src/test/rpc/Transaction_test.cpp @@ -17,15 +17,15 @@ */ //============================================================================== +#include +#include +#include #include +#include #include #include #include #include -#include -#include -#include -#include #include #include diff --git a/src/test/rpc/ValidatorInfo_test.cpp b/src/test/rpc/ValidatorInfo_test.cpp index 778ea0f57..603a0ad9d 100644 --- a/src/test/rpc/ValidatorInfo_test.cpp +++ b/src/test/rpc/ValidatorInfo_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include -#include #include +#include +#include +#include #include #include diff --git a/src/test/rpc/ValidatorRPC_test.cpp b/src/test/rpc/ValidatorRPC_test.cpp index 6db2dff6b..2bd4b69c3 100644 --- a/src/test/rpc/ValidatorRPC_test.cpp +++ b/src/test/rpc/ValidatorRPC_test.cpp @@ -17,16 +17,16 @@ */ //============================================================================== +#include +#include #include #include +#include #include #include -#include #include #include #include -#include -#include #include diff --git a/src/test/rpc/Version_test.cpp b/src/test/rpc/Version_test.cpp index 2b3342619..b66e502b9 100644 --- a/src/test/rpc/Version_test.cpp +++ b/src/test/rpc/Version_test.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include -#include #include +#include +#include namespace ripple { diff --git a/src/test/server/ServerStatus_test.cpp b/src/test/server/ServerStatus_test.cpp index 8ca34a724..dae38ee21 100644 --- a/src/test/server/ServerStatus_test.cpp +++ b/src/test/server/ServerStatus_test.cpp @@ -17,13 +17,17 @@ */ //============================================================================== +#include +#include +#include +#include #include #include #include +#include #include #include #include -#include #include #include #include @@ -33,10 +37,6 @@ #include #include #include -#include -#include -#include -#include namespace ripple { namespace test { diff --git a/src/test/server/Server_test.cpp b/src/test/server/Server_test.cpp index 0d2ffbb20..4f88dc21a 100644 --- a/src/test/server/Server_test.cpp +++ b/src/test/server/Server_test.cpp @@ -17,10 +17,10 @@ */ //============================================================================== +#include #include #include #include -#include #include #include diff --git a/src/test/shamap/FetchPack_test.cpp b/src/test/shamap/FetchPack_test.cpp index dcf7b3c7d..ac2d16ecc 100644 --- a/src/test/shamap/FetchPack_test.cpp +++ b/src/test/shamap/FetchPack_test.cpp @@ -17,6 +17,10 @@ */ //============================================================================== +#include +#include +#include +#include #include #include #include @@ -24,12 +28,8 @@ #include #include #include -#include -#include #include #include -#include -#include namespace ripple { namespace tests { diff --git a/src/test/shamap/SHAMapSync_test.cpp b/src/test/shamap/SHAMapSync_test.cpp index 0ea474208..627e97e15 100644 --- a/src/test/shamap/SHAMapSync_test.cpp +++ b/src/test/shamap/SHAMapSync_test.cpp @@ -17,14 +17,14 @@ */ //============================================================================== +#include +#include +#include +#include #include #include #include #include -#include -#include -#include -#include namespace ripple { namespace tests { diff --git a/src/test/shamap/SHAMap_test.cpp b/src/test/shamap/SHAMap_test.cpp index 932e7cb8b..c8c877935 100644 --- a/src/test/shamap/SHAMap_test.cpp +++ b/src/test/shamap/SHAMap_test.cpp @@ -17,13 +17,13 @@ */ //============================================================================== +#include +#include +#include #include #include #include #include -#include -#include -#include namespace ripple { namespace tests { diff --git a/src/test/shamap/common.h b/src/test/shamap/common.h index e724bc986..7aeb2b818 100644 --- a/src/test/shamap/common.h +++ b/src/test/shamap/common.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_SHAMAP_TESTS_COMMON_H_INCLUDED #define RIPPLE_SHAMAP_TESTS_COMMON_H_INCLUDED -#include #include #include #include #include +#include namespace ripple { namespace tests { diff --git a/src/test/unit_test/FileDirGuard.h b/src/test/unit_test/FileDirGuard.h index 5d977d3db..246ac2623 100644 --- a/src/test/unit_test/FileDirGuard.h +++ b/src/test/unit_test/FileDirGuard.h @@ -20,9 +20,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef TEST_UNIT_TEST_DIRGUARD_H #define TEST_UNIT_TEST_DIRGUARD_H +#include #include #include -#include namespace ripple { namespace test { diff --git a/src/xrpld/app/consensus/RCLCensorshipDetector.h b/src/xrpld/app/consensus/RCLCensorshipDetector.h index 63fbb51bd..12a768ca4 100644 --- a/src/xrpld/app/consensus/RCLCensorshipDetector.h +++ b/src/xrpld/app/consensus/RCLCensorshipDetector.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_APP_CONSENSUS_RCLCENSORSHIPDETECTOR_H_INCLUDED #define RIPPLE_APP_CONSENSUS_RCLCENSORSHIPDETECTOR_H_INCLUDED -#include #include +#include #include #include #include diff --git a/src/xrpld/app/consensus/RCLConsensus.cpp b/src/xrpld/app/consensus/RCLConsensus.cpp index 26fd84fb9..5fd20f97c 100644 --- a/src/xrpld/app/consensus/RCLConsensus.cpp +++ b/src/xrpld/app/consensus/RCLConsensus.cpp @@ -35,12 +35,12 @@ #include #include #include -#include -#include #include #include #include #include +#include +#include #include #include #include diff --git a/src/xrpld/app/consensus/RCLConsensus.h b/src/xrpld/app/consensus/RCLConsensus.h index 3932a6d25..893e5cf08 100644 --- a/src/xrpld/app/consensus/RCLConsensus.h +++ b/src/xrpld/app/consensus/RCLConsensus.h @@ -26,15 +26,15 @@ #include #include #include -#include -#include -#include #include #include #include +#include +#include +#include +#include #include #include -#include #include #include #include diff --git a/src/xrpld/app/consensus/RCLCxPeerPos.h b/src/xrpld/app/consensus/RCLCxPeerPos.h index ca911a6a8..4236e2ab1 100644 --- a/src/xrpld/app/consensus/RCLCxPeerPos.h +++ b/src/xrpld/app/consensus/RCLCxPeerPos.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_APP_CONSENSUS_RCLCXPEERPOS_H_INCLUDED #define RIPPLE_APP_CONSENSUS_RCLCXPEERPOS_H_INCLUDED +#include #include #include #include -#include #include #include #include diff --git a/src/xrpld/app/consensus/RCLCxTx.h b/src/xrpld/app/consensus/RCLCxTx.h index 7e5fd0777..58e58ac3b 100644 --- a/src/xrpld/app/consensus/RCLCxTx.h +++ b/src/xrpld/app/consensus/RCLCxTx.h @@ -21,9 +21,9 @@ #define RIPPLE_APP_CONSENSUS_RCLCXTX_H_INCLUDED #include +#include #include #include -#include namespace ripple { diff --git a/src/xrpld/app/consensus/RCLValidations.cpp b/src/xrpld/app/consensus/RCLValidations.cpp index 4692254b7..5616aaace 100644 --- a/src/xrpld/app/consensus/RCLValidations.cpp +++ b/src/xrpld/app/consensus/RCLValidations.cpp @@ -24,13 +24,13 @@ #include #include #include -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include #include #include #include diff --git a/src/xrpld/app/ledger/BuildLedger.h b/src/xrpld/app/ledger/BuildLedger.h index 9d409ca0a..409fa3529 100644 --- a/src/xrpld/app/ledger/BuildLedger.h +++ b/src/xrpld/app/ledger/BuildLedger.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_APP_LEDGER_BUILD_LEDGER_H_INCLUDED #define RIPPLE_APP_LEDGER_BUILD_LEDGER_H_INCLUDED +#include #include #include -#include #include #include diff --git a/src/xrpld/app/ledger/ConsensusTransSetSF.cpp b/src/xrpld/app/ledger/ConsensusTransSetSF.cpp index 589414b67..4aed7d94b 100644 --- a/src/xrpld/app/ledger/ConsensusTransSetSF.cpp +++ b/src/xrpld/app/ledger/ConsensusTransSetSF.cpp @@ -22,9 +22,9 @@ #include #include #include -#include #include #include +#include #include #include diff --git a/src/xrpld/app/ledger/ConsensusTransSetSF.h b/src/xrpld/app/ledger/ConsensusTransSetSF.h index b400c8dc8..857f2b8ea 100644 --- a/src/xrpld/app/ledger/ConsensusTransSetSF.h +++ b/src/xrpld/app/ledger/ConsensusTransSetSF.h @@ -21,8 +21,8 @@ #define RIPPLE_APP_LEDGER_CONSENSUSTRANSSETSF_H_INCLUDED #include -#include #include +#include namespace ripple { diff --git a/src/xrpld/app/ledger/InboundLedger.h b/src/xrpld/app/ledger/InboundLedger.h index a47f6aa9d..62b6925d5 100644 --- a/src/xrpld/app/ledger/InboundLedger.h +++ b/src/xrpld/app/ledger/InboundLedger.h @@ -23,8 +23,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/xrpld/app/ledger/InboundTransactions.h b/src/xrpld/app/ledger/InboundTransactions.h index a71d8e6b0..368375c07 100644 --- a/src/xrpld/app/ledger/InboundTransactions.h +++ b/src/xrpld/app/ledger/InboundTransactions.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_APP_LEDGER_INBOUNDTRANSACTIONS_H_INCLUDED #define RIPPLE_APP_LEDGER_INBOUNDTRANSACTIONS_H_INCLUDED -#include #include #include +#include #include namespace ripple { diff --git a/src/xrpld/app/ledger/Ledger.cpp b/src/xrpld/app/ledger/Ledger.cpp index 343ea14c5..9d24a9858 100644 --- a/src/xrpld/app/ledger/Ledger.cpp +++ b/src/xrpld/app/ledger/Ledger.cpp @@ -31,17 +31,17 @@ #include #include #include -#include -#include -#include -#include #include #include #include #include #include -#include #include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/xrpld/app/ledger/Ledger.h b/src/xrpld/app/ledger/Ledger.h index b9714f4c6..97656b6d7 100644 --- a/src/xrpld/app/ledger/Ledger.h +++ b/src/xrpld/app/ledger/Ledger.h @@ -20,17 +20,17 @@ #ifndef RIPPLE_APP_LEDGER_LEDGER_H_INCLUDED #define RIPPLE_APP_LEDGER_LEDGER_H_INCLUDED -#include -#include #include #include #include +#include +#include +#include #include #include #include #include #include -#include #include namespace ripple { diff --git a/src/xrpld/app/ledger/LedgerToJson.h b/src/xrpld/app/ledger/LedgerToJson.h index e3ca11929..8f9316cbc 100644 --- a/src/xrpld/app/ledger/LedgerToJson.h +++ b/src/xrpld/app/ledger/LedgerToJson.h @@ -23,13 +23,13 @@ #include #include #include +#include #include #include #include #include #include #include -#include namespace ripple { diff --git a/src/xrpld/app/ledger/OpenLedger.h b/src/xrpld/app/ledger/OpenLedger.h index 016565dd4..030a39be9 100644 --- a/src/xrpld/app/ledger/OpenLedger.h +++ b/src/xrpld/app/ledger/OpenLedger.h @@ -22,12 +22,12 @@ #include #include -#include -#include -#include #include #include #include +#include +#include +#include #include #include diff --git a/src/xrpld/app/ledger/OrderBookDB.cpp b/src/xrpld/app/ledger/OrderBookDB.cpp index 590159edd..d0eddadba 100644 --- a/src/xrpld/app/ledger/OrderBookDB.cpp +++ b/src/xrpld/app/ledger/OrderBookDB.cpp @@ -22,9 +22,9 @@ #include #include #include -#include #include #include +#include #include namespace ripple { diff --git a/src/xrpld/app/ledger/TransactionMaster.h b/src/xrpld/app/ledger/TransactionMaster.h index c7deb9e0e..73b5a57f7 100644 --- a/src/xrpld/app/ledger/TransactionMaster.h +++ b/src/xrpld/app/ledger/TransactionMaster.h @@ -21,10 +21,10 @@ #define RIPPLE_APP_LEDGER_TRANSACTIONMASTER_H_INCLUDED #include -#include -#include #include #include +#include +#include namespace ripple { diff --git a/src/xrpld/app/ledger/detail/InboundLedger.cpp b/src/xrpld/app/ledger/detail/InboundLedger.cpp index acd0e2e3a..6ec2a48bb 100644 --- a/src/xrpld/app/ledger/detail/InboundLedger.cpp +++ b/src/xrpld/app/ledger/detail/InboundLedger.cpp @@ -24,14 +24,14 @@ #include #include #include -#include #include #include #include +#include +#include #include #include #include -#include #include diff --git a/src/xrpld/app/ledger/detail/InboundLedgers.cpp b/src/xrpld/app/ledger/detail/InboundLedgers.cpp index 328c915c4..f9666afd8 100644 --- a/src/xrpld/app/ledger/detail/InboundLedgers.cpp +++ b/src/xrpld/app/ledger/detail/InboundLedgers.cpp @@ -21,13 +21,13 @@ #include #include #include -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/xrpld/app/ledger/detail/InboundTransactions.cpp b/src/xrpld/app/ledger/detail/InboundTransactions.cpp index df43e806b..83b074f31 100644 --- a/src/xrpld/app/ledger/detail/InboundTransactions.cpp +++ b/src/xrpld/app/ledger/detail/InboundTransactions.cpp @@ -22,8 +22,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/xrpld/app/ledger/detail/LedgerMaster.cpp b/src/xrpld/app/ledger/detail/LedgerMaster.cpp index 23f2e862c..867c12022 100644 --- a/src/xrpld/app/ledger/detail/LedgerMaster.cpp +++ b/src/xrpld/app/ledger/detail/LedgerMaster.cpp @@ -36,18 +36,18 @@ #include #include #include -#include -#include -#include -#include -#include -#include #include #include #include #include #include #include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/xrpld/app/ledger/detail/LedgerToJson.cpp b/src/xrpld/app/ledger/detail/LedgerToJson.cpp index 20215caa7..95b572e97 100644 --- a/src/xrpld/app/ledger/detail/LedgerToJson.cpp +++ b/src/xrpld/app/ledger/detail/LedgerToJson.cpp @@ -22,12 +22,12 @@ #include #include #include -#include #include -#include #include #include #include +#include +#include namespace ripple { diff --git a/src/xrpld/app/ledger/detail/TimeoutCounter.h b/src/xrpld/app/ledger/detail/TimeoutCounter.h index a354c9646..228e879d4 100644 --- a/src/xrpld/app/ledger/detail/TimeoutCounter.h +++ b/src/xrpld/app/ledger/detail/TimeoutCounter.h @@ -21,9 +21,9 @@ #define RIPPLE_APP_LEDGER_TIMEOUTCOUNTER_H_INCLUDED #include +#include #include #include -#include #include #include diff --git a/src/xrpld/app/main/Application.cpp b/src/xrpld/app/main/Application.cpp index 1de7266d1..6b1e6b440 100644 --- a/src/xrpld/app/main/Application.cpp +++ b/src/xrpld/app/main/Application.cpp @@ -50,31 +50,31 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include #include -#include -#include #include #include #include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include #include -#include -#include -#include -#include #include #include diff --git a/src/xrpld/app/main/Application.h b/src/xrpld/app/main/Application.h index ac0c6a811..10794651d 100644 --- a/src/xrpld/app/main/Application.h +++ b/src/xrpld/app/main/Application.h @@ -19,13 +19,13 @@ #ifndef RIPPLE_APP_MAIN_APPLICATION_H_INCLUDED #define RIPPLE_APP_MAIN_APPLICATION_H_INCLUDED -#include -#include #include #include -#include #include #include +#include +#include +#include #include #include #include diff --git a/src/xrpld/app/main/GRPCServer.cpp b/src/xrpld/app/main/GRPCServer.cpp index 3d7580563..5d5a79db3 100644 --- a/src/xrpld/app/main/GRPCServer.cpp +++ b/src/xrpld/app/main/GRPCServer.cpp @@ -22,8 +22,8 @@ #include #include -#include #include +#include namespace ripple { diff --git a/src/xrpld/app/main/GRPCServer.h b/src/xrpld/app/main/GRPCServer.h index e62873732..39bfc0c97 100644 --- a/src/xrpld/app/main/GRPCServer.h +++ b/src/xrpld/app/main/GRPCServer.h @@ -23,14 +23,14 @@ #include #include #include -#include -#include #include #include #include #include #include #include +#include +#include #include #include diff --git a/src/xrpld/app/main/Main.cpp b/src/xrpld/app/main/Main.cpp index 7844c6ed5..f249e98d4 100644 --- a/src/xrpld/app/main/Main.cpp +++ b/src/xrpld/app/main/Main.cpp @@ -19,23 +19,23 @@ #include #include #include +#include +#include +#include +#include +#include #include #include #include #include #include -#include -#include -#include #include -#include #include #include -#include #ifdef ENABLE_TESTS -#include #include +#include #endif // ENABLE_TESTS #include diff --git a/src/xrpld/app/misc/AMMUtils.h b/src/xrpld/app/misc/AMMUtils.h index cbf29c7dd..52fe819a2 100644 --- a/src/xrpld/app/misc/AMMUtils.h +++ b/src/xrpld/app/misc/AMMUtils.h @@ -19,9 +19,9 @@ #ifndef RIPPLE_APP_MISC_AMMUTILS_H_INLCUDED #define RIPPLE_APP_MISC_AMMUTILS_H_INLCUDED +#include #include #include -#include #include #include #include diff --git a/src/xrpld/app/misc/DatagramMonitor.h b/src/xrpld/app/misc/DatagramMonitor.h index ccdc47f1f..3dec02437 100644 --- a/src/xrpld/app/misc/DatagramMonitor.h +++ b/src/xrpld/app/misc/DatagramMonitor.h @@ -10,16 +10,16 @@ #include #include #include -#include -#include #include #include #include #include +#include +#include +#include #include #include #include -#include #include #include #include diff --git a/src/xrpld/app/misc/FeeVote.h b/src/xrpld/app/misc/FeeVote.h index 9791c73ef..47769e21e 100644 --- a/src/xrpld/app/misc/FeeVote.h +++ b/src/xrpld/app/misc/FeeVote.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_APP_MISC_FEEVOTE_H_INCLUDED #define RIPPLE_APP_MISC_FEEVOTE_H_INCLUDED -#include #include +#include +#include #include #include -#include namespace ripple { diff --git a/src/xrpld/app/misc/NegativeUNLVote.cpp b/src/xrpld/app/misc/NegativeUNLVote.cpp index 0fc1c8f9d..fe020d91c 100644 --- a/src/xrpld/app/misc/NegativeUNLVote.cpp +++ b/src/xrpld/app/misc/NegativeUNLVote.cpp @@ -21,8 +21,8 @@ #include #include #include -#include #include +#include namespace ripple { diff --git a/src/xrpld/app/misc/NetworkOPs.cpp b/src/xrpld/app/misc/NetworkOPs.cpp index 938d27654..5493b3674 100644 --- a/src/xrpld/app/misc/NetworkOPs.cpp +++ b/src/xrpld/app/misc/NetworkOPs.cpp @@ -44,21 +44,26 @@ #include #include #include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include #include #include #include #include #include -#include -#include #include #include #include -#include -#include -#include -#include #include #include #include @@ -67,11 +72,6 @@ #include #include #include -#include -#include -#include -#include -#include #include #include #include diff --git a/src/xrpld/app/misc/SHAMapStoreImp.cpp b/src/xrpld/app/misc/SHAMapStoreImp.cpp index 7fe774d40..58ea7ae07 100644 --- a/src/xrpld/app/misc/SHAMapStoreImp.cpp +++ b/src/xrpld/app/misc/SHAMapStoreImp.cpp @@ -23,12 +23,12 @@ #include #include #include -#include #include #include #include #include #include +#include #include diff --git a/src/xrpld/app/misc/ValidatorList.h b/src/xrpld/app/misc/ValidatorList.h index 60cd689c0..543eba2f6 100644 --- a/src/xrpld/app/misc/ValidatorList.h +++ b/src/xrpld/app/misc/ValidatorList.h @@ -21,12 +21,12 @@ #define RIPPLE_APP_MISC_VALIDATORLIST_H_INCLUDED #include +#include +#include #include #include -#include #include #include -#include #include #include #include diff --git a/src/xrpld/app/misc/ValidatorSite.h b/src/xrpld/app/misc/ValidatorSite.h index e51a85b4a..39bf89580 100644 --- a/src/xrpld/app/misc/ValidatorSite.h +++ b/src/xrpld/app/misc/ValidatorSite.h @@ -23,9 +23,9 @@ #include #include #include +#include #include #include -#include #include #include diff --git a/src/xrpld/app/misc/detail/AMMUtils.cpp b/src/xrpld/app/misc/detail/AMMUtils.cpp index 9d94d9522..0014ab011 100644 --- a/src/xrpld/app/misc/detail/AMMUtils.cpp +++ b/src/xrpld/app/misc/detail/AMMUtils.cpp @@ -17,8 +17,8 @@ */ //============================================================================== #include -#include #include +#include #include #include #include diff --git a/src/xrpld/app/misc/detail/LoadFeeTrack.cpp b/src/xrpld/app/misc/detail/LoadFeeTrack.cpp index 62975fad7..1267af594 100644 --- a/src/xrpld/app/misc/detail/LoadFeeTrack.cpp +++ b/src/xrpld/app/misc/detail/LoadFeeTrack.cpp @@ -18,12 +18,12 @@ //============================================================================== #include +#include +#include #include #include #include #include -#include -#include #include #include diff --git a/src/xrpld/app/misc/detail/Manifest.cpp b/src/xrpld/app/misc/detail/Manifest.cpp index fef03fcc4..a17858ceb 100644 --- a/src/xrpld/app/misc/detail/Manifest.cpp +++ b/src/xrpld/app/misc/detail/Manifest.cpp @@ -19,10 +19,10 @@ #include #include +#include #include #include #include -#include #include #include #include diff --git a/src/xrpld/app/misc/detail/Transaction.cpp b/src/xrpld/app/misc/detail/Transaction.cpp index 9e8e306ea..dd92ed9b6 100644 --- a/src/xrpld/app/misc/detail/Transaction.cpp +++ b/src/xrpld/app/misc/detail/Transaction.cpp @@ -24,15 +24,15 @@ #include #include #include -#include -#include #include #include +#include +#include +#include #include #include #include #include -#include namespace ripple { diff --git a/src/xrpld/app/misc/detail/ValidatorKeys.cpp b/src/xrpld/app/misc/detail/ValidatorKeys.cpp index 2e05d1dbe..2b36848c8 100644 --- a/src/xrpld/app/misc/detail/ValidatorKeys.cpp +++ b/src/xrpld/app/misc/detail/ValidatorKeys.cpp @@ -20,10 +20,10 @@ #include #include -#include -#include #include #include +#include +#include namespace ripple { ValidatorKeys::ValidatorKeys(Config const& config, beast::Journal j) diff --git a/src/xrpld/app/misc/detail/ValidatorList.cpp b/src/xrpld/app/misc/detail/ValidatorList.cpp index daf46417a..a3854106a 100644 --- a/src/xrpld/app/misc/detail/ValidatorList.cpp +++ b/src/xrpld/app/misc/detail/ValidatorList.cpp @@ -20,12 +20,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include #include diff --git a/src/xrpld/app/misc/detail/WorkSSL.h b/src/xrpld/app/misc/detail/WorkSSL.h index 388c10a08..d48f0b5fd 100644 --- a/src/xrpld/app/misc/detail/WorkSSL.h +++ b/src/xrpld/app/misc/detail/WorkSSL.h @@ -21,9 +21,9 @@ #define RIPPLE_APP_MISC_DETAIL_WORKSSL_H_INCLUDED #include -#include #include #include +#include #include #include diff --git a/src/xrpld/app/paths/AMMLiquidity.h b/src/xrpld/app/paths/AMMLiquidity.h index 380158d62..fe60d3926 100644 --- a/src/xrpld/app/paths/AMMLiquidity.h +++ b/src/xrpld/app/paths/AMMLiquidity.h @@ -23,9 +23,9 @@ #include #include #include -#include #include #include +#include #include #include diff --git a/src/xrpld/app/paths/Credit.h b/src/xrpld/app/paths/Credit.h index 3eeacceee..1f9d5b04f 100644 --- a/src/xrpld/app/paths/Credit.h +++ b/src/xrpld/app/paths/Credit.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_APP_PATHS_CREDIT_H_INCLUDED #define RIPPLE_APP_PATHS_CREDIT_H_INCLUDED -#include #include +#include #include namespace ripple { diff --git a/src/xrpld/app/paths/PathRequest.cpp b/src/xrpld/app/paths/PathRequest.cpp index d4e4c780d..e726aa453 100644 --- a/src/xrpld/app/paths/PathRequest.cpp +++ b/src/xrpld/app/paths/PathRequest.cpp @@ -25,9 +25,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/src/xrpld/app/paths/PathRequest.h b/src/xrpld/app/paths/PathRequest.h index 804235eeb..21f10d066 100644 --- a/src/xrpld/app/paths/PathRequest.h +++ b/src/xrpld/app/paths/PathRequest.h @@ -23,8 +23,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/xrpld/app/paths/PathRequests.cpp b/src/xrpld/app/paths/PathRequests.cpp index 6b80bf368..86560445e 100644 --- a/src/xrpld/app/paths/PathRequests.cpp +++ b/src/xrpld/app/paths/PathRequests.cpp @@ -20,8 +20,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/xrpld/app/paths/Pathfinder.cpp b/src/xrpld/app/paths/Pathfinder.cpp index 6e9f909c8..b123d5daf 100644 --- a/src/xrpld/app/paths/Pathfinder.cpp +++ b/src/xrpld/app/paths/Pathfinder.cpp @@ -23,12 +23,12 @@ #include #include #include -#include -#include #include #include -#include #include +#include +#include +#include #include diff --git a/src/xrpld/app/paths/Pathfinder.h b/src/xrpld/app/paths/Pathfinder.h index 73d6556a8..01556a3c6 100644 --- a/src/xrpld/app/paths/Pathfinder.h +++ b/src/xrpld/app/paths/Pathfinder.h @@ -22,8 +22,8 @@ #include #include -#include #include +#include #include #include diff --git a/src/xrpld/app/paths/RippleCalc.cpp b/src/xrpld/app/paths/RippleCalc.cpp index 6ea24cdb1..c7b2e1f01 100644 --- a/src/xrpld/app/paths/RippleCalc.cpp +++ b/src/xrpld/app/paths/RippleCalc.cpp @@ -20,8 +20,8 @@ #include #include #include -#include #include +#include #include namespace ripple { diff --git a/src/xrpld/app/paths/RippleCalc.h b/src/xrpld/app/paths/RippleCalc.h index 1d91b02ac..9e03da9c9 100644 --- a/src/xrpld/app/paths/RippleCalc.h +++ b/src/xrpld/app/paths/RippleCalc.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_APP_PATHS_RIPPLECALC_H_INCLUDED #define RIPPLE_APP_PATHS_RIPPLECALC_H_INCLUDED -#include #include +#include #include #include diff --git a/src/xrpld/app/paths/TrustLine.h b/src/xrpld/app/paths/TrustLine.h index 749786a06..fdc1dc6be 100644 --- a/src/xrpld/app/paths/TrustLine.h +++ b/src/xrpld/app/paths/TrustLine.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_APP_PATHS_RIPPLESTATE_H_INCLUDED #define RIPPLE_APP_PATHS_RIPPLESTATE_H_INCLUDED -#include #include +#include #include #include #include diff --git a/src/xrpld/app/paths/detail/BookStep.cpp b/src/xrpld/app/paths/detail/BookStep.cpp index 3403ecc28..7f73ed5ed 100644 --- a/src/xrpld/app/paths/detail/BookStep.cpp +++ b/src/xrpld/app/paths/detail/BookStep.cpp @@ -23,12 +23,12 @@ #include #include #include +#include +#include #include #include #include #include -#include -#include #include #include #include diff --git a/src/xrpld/app/paths/detail/DirectStep.cpp b/src/xrpld/app/paths/detail/DirectStep.cpp index 8b61153d1..af53ffca6 100644 --- a/src/xrpld/app/paths/detail/DirectStep.cpp +++ b/src/xrpld/app/paths/detail/DirectStep.cpp @@ -20,9 +20,9 @@ #include #include #include +#include #include #include -#include #include #include diff --git a/src/xrpld/app/paths/detail/FlowDebugInfo.h b/src/xrpld/app/paths/detail/FlowDebugInfo.h index 6260b282a..000db4e57 100644 --- a/src/xrpld/app/paths/detail/FlowDebugInfo.h +++ b/src/xrpld/app/paths/detail/FlowDebugInfo.h @@ -21,9 +21,9 @@ #define RIPPLE_PATH_IMPL_FLOWDEBUGINFO_H_INCLUDED #include +#include #include #include -#include #include diff --git a/src/xrpld/app/paths/detail/PaySteps.cpp b/src/xrpld/app/paths/detail/PaySteps.cpp index 7c1cb1569..8411fb8fc 100644 --- a/src/xrpld/app/paths/detail/PaySteps.cpp +++ b/src/xrpld/app/paths/detail/PaySteps.cpp @@ -18,11 +18,11 @@ //============================================================================== #include +#include #include #include #include #include -#include #include #include diff --git a/src/xrpld/app/paths/detail/StepChecks.h b/src/xrpld/app/paths/detail/StepChecks.h index a02a948c1..140c9d1fe 100644 --- a/src/xrpld/app/paths/detail/StepChecks.h +++ b/src/xrpld/app/paths/detail/StepChecks.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_APP_PATHS_IMPL_STEP_CHECKS_H_INCLUDED #define RIPPLE_APP_PATHS_IMPL_STEP_CHECKS_H_INCLUDED +#include #include #include -#include #include #include diff --git a/src/xrpld/app/paths/detail/XRPEndpointStep.cpp b/src/xrpld/app/paths/detail/XRPEndpointStep.cpp index 90dd00b37..770a5bd5e 100644 --- a/src/xrpld/app/paths/detail/XRPEndpointStep.cpp +++ b/src/xrpld/app/paths/detail/XRPEndpointStep.cpp @@ -21,10 +21,10 @@ #include #include #include +#include #include #include #include -#include #include #include diff --git a/src/xrpld/app/rdb/backend/detail/PostgresDatabase.cpp b/src/xrpld/app/rdb/backend/detail/PostgresDatabase.cpp index 824afdf02..642ede7e6 100644 --- a/src/xrpld/app/rdb/backend/detail/PostgresDatabase.cpp +++ b/src/xrpld/app/rdb/backend/detail/PostgresDatabase.cpp @@ -26,14 +26,14 @@ #include #include #include -#include -#include #include #include #include +#include +#include +#include #include #include -#include #include #include #include diff --git a/src/xrpld/app/rdb/backend/detail/SQLiteDatabase.cpp b/src/xrpld/app/rdb/backend/detail/SQLiteDatabase.cpp index b27621b62..6dcf1db0a 100644 --- a/src/xrpld/app/rdb/backend/detail/SQLiteDatabase.cpp +++ b/src/xrpld/app/rdb/backend/detail/SQLiteDatabase.cpp @@ -26,12 +26,12 @@ #include #include #include -#include -#include #include #include -#include #include +#include +#include +#include #include namespace ripple { diff --git a/src/xrpld/app/rdb/backend/detail/detail/Node.cpp b/src/xrpld/app/rdb/backend/detail/detail/Node.cpp index d10a417ac..37effa63e 100644 --- a/src/xrpld/app/rdb/backend/detail/detail/Node.cpp +++ b/src/xrpld/app/rdb/backend/detail/detail/Node.cpp @@ -25,10 +25,10 @@ #include #include #include -#include -#include #include #include +#include +#include #include #include #include diff --git a/src/xrpld/app/rdb/backend/detail/detail/Shard.cpp b/src/xrpld/app/rdb/backend/detail/detail/Shard.cpp index 6171a19f0..7facf0fe8 100644 --- a/src/xrpld/app/rdb/backend/detail/detail/Shard.cpp +++ b/src/xrpld/app/rdb/backend/detail/detail/Shard.cpp @@ -20,9 +20,9 @@ #include #include #include -#include #include #include +#include #include namespace ripple { diff --git a/src/xrpld/app/reporting/ETLSource.h b/src/xrpld/app/reporting/ETLSource.h index d89fcd488..633b72afa 100644 --- a/src/xrpld/app/reporting/ETLSource.h +++ b/src/xrpld/app/reporting/ETLSource.h @@ -21,9 +21,9 @@ #define RIPPLE_APP_REPORTING_ETLSOURCE_H_INCLUDED #include #include +#include #include #include -#include #include #include diff --git a/src/xrpld/app/reporting/P2pProxy.h b/src/xrpld/app/reporting/P2pProxy.h index c43b7a7d4..d49389f42 100644 --- a/src/xrpld/app/reporting/P2pProxy.h +++ b/src/xrpld/app/reporting/P2pProxy.h @@ -21,9 +21,9 @@ #define RIPPLE_APP_REPORTING_P2PPROXY_H_INCLUDED #include -#include #include #include +#include #include #include diff --git a/src/xrpld/app/reporting/ReportingETL.h b/src/xrpld/app/reporting/ReportingETL.h index aa857f735..fc15f90b4 100644 --- a/src/xrpld/app/reporting/ReportingETL.h +++ b/src/xrpld/app/reporting/ReportingETL.h @@ -26,14 +26,14 @@ #include #include #include -#include -#include #include #include #include #include #include #include +#include +#include #include #include diff --git a/src/xrpld/app/tx/apply.h b/src/xrpld/app/tx/apply.h index bafb1fcc2..e6bcabb4b 100644 --- a/src/xrpld/app/tx/apply.h +++ b/src/xrpld/app/tx/apply.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_TX_APPLY_H_INCLUDED #define RIPPLE_TX_APPLY_H_INCLUDED -#include #include #include +#include #include #include #include diff --git a/src/xrpld/app/tx/applySteps.h b/src/xrpld/app/tx/applySteps.h index 9e7c582fc..d816969d3 100644 --- a/src/xrpld/app/tx/applySteps.h +++ b/src/xrpld/app/tx/applySteps.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TX_APPLYSTEPS_H_INCLUDED #define RIPPLE_TX_APPLYSTEPS_H_INCLUDED -#include #include +#include namespace ripple { diff --git a/src/xrpld/app/tx/detail/AMMWithdraw.cpp b/src/xrpld/app/tx/detail/AMMWithdraw.cpp index b21ea3412..51b512aba 100644 --- a/src/xrpld/app/tx/detail/AMMWithdraw.cpp +++ b/src/xrpld/app/tx/detail/AMMWithdraw.cpp @@ -21,9 +21,9 @@ #include #include -#include #include #include +#include #include #include #include diff --git a/src/xrpld/app/tx/detail/ApplyContext.h b/src/xrpld/app/tx/detail/ApplyContext.h index d755a6a6d..124ef7a8e 100644 --- a/src/xrpld/app/tx/detail/ApplyContext.h +++ b/src/xrpld/app/tx/detail/ApplyContext.h @@ -21,10 +21,10 @@ #define RIPPLE_TX_APPLYCONTEXT_H_INCLUDED #include -#include -#include #include #include +#include +#include #include #include #include diff --git a/src/xrpld/app/tx/detail/CancelCheck.cpp b/src/xrpld/app/tx/detail/CancelCheck.cpp index 882ef414c..7954e86cf 100644 --- a/src/xrpld/app/tx/detail/CancelCheck.cpp +++ b/src/xrpld/app/tx/detail/CancelCheck.cpp @@ -20,8 +20,8 @@ #include #include -#include #include +#include #include #include #include diff --git a/src/xrpld/app/tx/detail/CancelOffer.cpp b/src/xrpld/app/tx/detail/CancelOffer.cpp index b95fedb26..d3912b6d7 100644 --- a/src/xrpld/app/tx/detail/CancelOffer.cpp +++ b/src/xrpld/app/tx/detail/CancelOffer.cpp @@ -18,8 +18,8 @@ //============================================================================== #include -#include #include +#include #include namespace ripple { diff --git a/src/xrpld/app/tx/detail/Change.cpp b/src/xrpld/app/tx/detail/Change.cpp index 0e8bb0de4..f2387f179 100644 --- a/src/xrpld/app/tx/detail/Change.cpp +++ b/src/xrpld/app/tx/detail/Change.cpp @@ -26,8 +26,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/xrpld/app/tx/detail/ClaimReward.cpp b/src/xrpld/app/tx/detail/ClaimReward.cpp index 921f9206f..e1b812e15 100644 --- a/src/xrpld/app/tx/detail/ClaimReward.cpp +++ b/src/xrpld/app/tx/detail/ClaimReward.cpp @@ -19,9 +19,9 @@ #include #include -#include #include #include +#include #include #include #include diff --git a/src/xrpld/app/tx/detail/ClaimReward.h b/src/xrpld/app/tx/detail/ClaimReward.h index 296bd723e..9c4667801 100644 --- a/src/xrpld/app/tx/detail/ClaimReward.h +++ b/src/xrpld/app/tx/detail/ClaimReward.h @@ -21,8 +21,8 @@ #define RIPPLE_TX_CLAIMREWARD_H_INCLUDED #include -#include #include +#include #include #include #include diff --git a/src/xrpld/app/tx/detail/CreateOffer.cpp b/src/xrpld/app/tx/detail/CreateOffer.cpp index cec73c17e..702b04523 100644 --- a/src/xrpld/app/tx/detail/CreateOffer.cpp +++ b/src/xrpld/app/tx/detail/CreateOffer.cpp @@ -20,8 +20,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/xrpld/app/tx/detail/DID.cpp b/src/xrpld/app/tx/detail/DID.cpp index 378bd79ce..6e5a3108c 100644 --- a/src/xrpld/app/tx/detail/DID.cpp +++ b/src/xrpld/app/tx/detail/DID.cpp @@ -19,9 +19,9 @@ #include -#include #include #include +#include #include #include #include diff --git a/src/xrpld/app/tx/detail/DeleteAccount.cpp b/src/xrpld/app/tx/detail/DeleteAccount.cpp index 7fe0ab1b8..6664d80d0 100644 --- a/src/xrpld/app/tx/detail/DeleteAccount.cpp +++ b/src/xrpld/app/tx/detail/DeleteAccount.cpp @@ -21,12 +21,12 @@ #include #include #include -#include #include +#include +#include #include #include #include -#include #include #include #include diff --git a/src/xrpld/app/tx/detail/DepositPreauth.cpp b/src/xrpld/app/tx/detail/DepositPreauth.cpp index 9f1e15b3e..b60fd3e0e 100644 --- a/src/xrpld/app/tx/detail/DepositPreauth.cpp +++ b/src/xrpld/app/tx/detail/DepositPreauth.cpp @@ -18,8 +18,8 @@ //============================================================================== #include -#include #include +#include #include #include #include diff --git a/src/xrpld/app/tx/detail/Escrow.cpp b/src/xrpld/app/tx/detail/Escrow.cpp index 8f4a497d8..2e71ab790 100644 --- a/src/xrpld/app/tx/detail/Escrow.cpp +++ b/src/xrpld/app/tx/detail/Escrow.cpp @@ -20,14 +20,14 @@ #include #include -#include -#include -#include -#include #include #include #include #include +#include +#include +#include +#include #include #include #include diff --git a/src/xrpld/app/tx/detail/GenesisMint.cpp b/src/xrpld/app/tx/detail/GenesisMint.cpp index b4fee0d16..f467bf1e6 100644 --- a/src/xrpld/app/tx/detail/GenesisMint.cpp +++ b/src/xrpld/app/tx/detail/GenesisMint.cpp @@ -19,8 +19,8 @@ #include #include -#include #include +#include #include #include #include diff --git a/src/xrpld/app/tx/detail/GenesisMint.h b/src/xrpld/app/tx/detail/GenesisMint.h index 08f630ef6..797f75007 100644 --- a/src/xrpld/app/tx/detail/GenesisMint.h +++ b/src/xrpld/app/tx/detail/GenesisMint.h @@ -21,8 +21,8 @@ #define RIPPLE_TX_GENESISMINT_H_INCLUDED #include -#include #include +#include #include namespace ripple { diff --git a/src/xrpld/app/tx/detail/Import.cpp b/src/xrpld/app/tx/detail/Import.cpp index aa2944aa9..91a548cbc 100644 --- a/src/xrpld/app/tx/detail/Import.cpp +++ b/src/xrpld/app/tx/detail/Import.cpp @@ -20,12 +20,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include #include diff --git a/src/xrpld/app/tx/detail/Import.h b/src/xrpld/app/tx/detail/Import.h index 74c9721bb..430897ed6 100644 --- a/src/xrpld/app/tx/detail/Import.h +++ b/src/xrpld/app/tx/detail/Import.h @@ -21,8 +21,8 @@ #define RIPPLE_TX_IMPORT_H_INCLUDED #include -#include #include +#include #include #include diff --git a/src/xrpld/app/tx/detail/InvariantCheck.cpp b/src/xrpld/app/tx/detail/InvariantCheck.cpp index 5cbc4931f..6df672ae9 100644 --- a/src/xrpld/app/tx/detail/InvariantCheck.cpp +++ b/src/xrpld/app/tx/detail/InvariantCheck.cpp @@ -21,10 +21,10 @@ #include #include -#include -#include #include #include +#include +#include #include #include #include diff --git a/src/xrpld/app/tx/detail/Invoke.cpp b/src/xrpld/app/tx/detail/Invoke.cpp index 507aceb60..869b7272c 100644 --- a/src/xrpld/app/tx/detail/Invoke.cpp +++ b/src/xrpld/app/tx/detail/Invoke.cpp @@ -18,8 +18,8 @@ //============================================================================== #include -#include #include +#include #include #include #include diff --git a/src/xrpld/app/tx/detail/Invoke.h b/src/xrpld/app/tx/detail/Invoke.h index 6d44848d8..3daec09e7 100644 --- a/src/xrpld/app/tx/detail/Invoke.h +++ b/src/xrpld/app/tx/detail/Invoke.h @@ -21,8 +21,8 @@ #define RIPPLE_TX_INVOKE_H_INCLUDED #include -#include #include +#include #include namespace ripple { diff --git a/src/xrpld/app/tx/detail/NFTokenMint.cpp b/src/xrpld/app/tx/detail/NFTokenMint.cpp index 0659b3a19..a39fa04b9 100644 --- a/src/xrpld/app/tx/detail/NFTokenMint.cpp +++ b/src/xrpld/app/tx/detail/NFTokenMint.cpp @@ -18,9 +18,9 @@ //============================================================================== #include +#include #include #include -#include #include #include #include diff --git a/src/xrpld/app/tx/detail/NFTokenMint.h b/src/xrpld/app/tx/detail/NFTokenMint.h index 1889e9498..e0eb54bbc 100644 --- a/src/xrpld/app/tx/detail/NFTokenMint.h +++ b/src/xrpld/app/tx/detail/NFTokenMint.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_TX_NFTTOKENMINT_H_INCLUDED #define RIPPLE_TX_NFTTOKENMINT_H_INCLUDED -#include #include +#include namespace ripple { diff --git a/src/xrpld/app/tx/detail/NFTokenUtils.cpp b/src/xrpld/app/tx/detail/NFTokenUtils.cpp index 3ce671c8b..43aed3bef 100644 --- a/src/xrpld/app/tx/detail/NFTokenUtils.cpp +++ b/src/xrpld/app/tx/detail/NFTokenUtils.cpp @@ -18,9 +18,9 @@ //============================================================================== #include -#include #include #include +#include #include #include #include diff --git a/src/xrpld/app/tx/detail/NFTokenUtils.h b/src/xrpld/app/tx/detail/NFTokenUtils.h index a0fc7af65..94847af8f 100644 --- a/src/xrpld/app/tx/detail/NFTokenUtils.h +++ b/src/xrpld/app/tx/detail/NFTokenUtils.h @@ -21,9 +21,9 @@ #define RIPPLE_TX_IMPL_DETAILS_NFTOKENUTILS_H_INCLUDED #include +#include #include #include -#include #include #include #include diff --git a/src/xrpld/app/tx/detail/Offer.h b/src/xrpld/app/tx/detail/Offer.h index 6a1d740c0..a6f707ba5 100644 --- a/src/xrpld/app/tx/detail/Offer.h +++ b/src/xrpld/app/tx/detail/Offer.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_APP_BOOK_OFFER_H_INCLUDED #define RIPPLE_APP_BOOK_OFFER_H_INCLUDED -#include #include +#include #include #include #include diff --git a/src/xrpld/app/tx/detail/OfferStream.h b/src/xrpld/app/tx/detail/OfferStream.h index 5f9019069..be224a67b 100644 --- a/src/xrpld/app/tx/detail/OfferStream.h +++ b/src/xrpld/app/tx/detail/OfferStream.h @@ -22,10 +22,10 @@ #include #include +#include #include #include #include -#include #include #include diff --git a/src/xrpld/app/tx/detail/PayChan.cpp b/src/xrpld/app/tx/detail/PayChan.cpp index 42ad59f02..4254b6c48 100644 --- a/src/xrpld/app/tx/detail/PayChan.cpp +++ b/src/xrpld/app/tx/detail/PayChan.cpp @@ -18,11 +18,11 @@ //============================================================================== #include +#include +#include #include #include #include -#include -#include #include #include #include diff --git a/src/xrpld/app/tx/detail/Payment.cpp b/src/xrpld/app/tx/detail/Payment.cpp index 0ae794a9b..4f186db83 100644 --- a/src/xrpld/app/tx/detail/Payment.cpp +++ b/src/xrpld/app/tx/detail/Payment.cpp @@ -19,8 +19,8 @@ #include #include -#include #include +#include #include #include #include diff --git a/src/xrpld/app/tx/detail/Remit.cpp b/src/xrpld/app/tx/detail/Remit.cpp index 93801ea8d..73ca8abe5 100644 --- a/src/xrpld/app/tx/detail/Remit.cpp +++ b/src/xrpld/app/tx/detail/Remit.cpp @@ -19,8 +19,8 @@ #include #include -#include #include +#include #include #include #include diff --git a/src/xrpld/app/tx/detail/Remit.h b/src/xrpld/app/tx/detail/Remit.h index 7cde6aaa4..671243fbc 100644 --- a/src/xrpld/app/tx/detail/Remit.h +++ b/src/xrpld/app/tx/detail/Remit.h @@ -21,8 +21,8 @@ #define RIPPLE_TX_REMIT_H_INCLUDED #include -#include #include +#include #include namespace ripple { diff --git a/src/xrpld/app/tx/detail/SetAccount.cpp b/src/xrpld/app/tx/detail/SetAccount.cpp index 4bd8cf4ec..442f42383 100644 --- a/src/xrpld/app/tx/detail/SetAccount.cpp +++ b/src/xrpld/app/tx/detail/SetAccount.cpp @@ -18,9 +18,9 @@ //============================================================================== #include -#include #include #include +#include #include #include #include diff --git a/src/xrpld/app/tx/detail/SetAccount.h b/src/xrpld/app/tx/detail/SetAccount.h index 7d2c300c0..8e9b74d86 100644 --- a/src/xrpld/app/tx/detail/SetAccount.h +++ b/src/xrpld/app/tx/detail/SetAccount.h @@ -21,8 +21,8 @@ #define RIPPLE_TX_SETACCOUNT_H_INCLUDED #include -#include #include +#include #include #include #include diff --git a/src/xrpld/app/tx/detail/SetHook.cpp b/src/xrpld/app/tx/detail/SetHook.cpp index ca2916334..a83684df3 100644 --- a/src/xrpld/app/tx/detail/SetHook.cpp +++ b/src/xrpld/app/tx/detail/SetHook.cpp @@ -25,8 +25,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/xrpld/app/tx/detail/SetOracle.cpp b/src/xrpld/app/tx/detail/SetOracle.cpp index a577b10ad..055143cc6 100644 --- a/src/xrpld/app/tx/detail/SetOracle.cpp +++ b/src/xrpld/app/tx/detail/SetOracle.cpp @@ -18,9 +18,9 @@ //============================================================================== #include -#include #include #include +#include #include #include #include diff --git a/src/xrpld/app/tx/detail/SetRemarks.cpp b/src/xrpld/app/tx/detail/SetRemarks.cpp index cf5b3f7d2..4d6cb21e5 100644 --- a/src/xrpld/app/tx/detail/SetRemarks.cpp +++ b/src/xrpld/app/tx/detail/SetRemarks.cpp @@ -18,9 +18,9 @@ //============================================================================== #include -#include #include #include +#include #include #include #include diff --git a/src/xrpld/app/tx/detail/SetRemarks.h b/src/xrpld/app/tx/detail/SetRemarks.h index 778c271f0..21d2a01c9 100644 --- a/src/xrpld/app/tx/detail/SetRemarks.h +++ b/src/xrpld/app/tx/detail/SetRemarks.h @@ -21,8 +21,8 @@ #define RIPPLE_TX_SETREMARKS_H_INCLUDED #include -#include #include +#include #include namespace ripple { diff --git a/src/xrpld/app/tx/detail/SetSignerList.cpp b/src/xrpld/app/tx/detail/SetSignerList.cpp index 4ce3dbc47..ae9bf4a43 100644 --- a/src/xrpld/app/tx/detail/SetSignerList.cpp +++ b/src/xrpld/app/tx/detail/SetSignerList.cpp @@ -20,8 +20,8 @@ #include #include -#include #include +#include #include #include #include diff --git a/src/xrpld/app/tx/detail/SetTrust.cpp b/src/xrpld/app/tx/detail/SetTrust.cpp index 79f8c84ef..45421ffcf 100644 --- a/src/xrpld/app/tx/detail/SetTrust.cpp +++ b/src/xrpld/app/tx/detail/SetTrust.cpp @@ -18,8 +18,8 @@ //============================================================================== #include -#include #include +#include #include #include #include diff --git a/src/xrpld/app/tx/detail/SignerEntries.h b/src/xrpld/app/tx/detail/SignerEntries.h index a6a677fcd..e10579ad6 100644 --- a/src/xrpld/app/tx/detail/SignerEntries.h +++ b/src/xrpld/app/tx/detail/SignerEntries.h @@ -21,12 +21,12 @@ #define RIPPLE_TX_IMPL_SIGNER_ENTRIES_H_INCLUDED #include // NotTEC -#include // -#include // beast::Journal -#include // Rules -#include // STTx::maxMultiSigners -#include // temMALFORMED -#include // AccountID +#include // +#include // beast::Journal +#include // Rules +#include // STTx::maxMultiSigners +#include // temMALFORMED +#include // AccountID #include #include diff --git a/src/xrpld/app/tx/detail/Taker.h b/src/xrpld/app/tx/detail/Taker.h index eedd07960..3e64c59b5 100644 --- a/src/xrpld/app/tx/detail/Taker.h +++ b/src/xrpld/app/tx/detail/Taker.h @@ -21,9 +21,9 @@ #define RIPPLE_APP_BOOK_TAKER_H_INCLUDED #include -#include #include #include +#include #include #include #include diff --git a/src/xrpld/app/tx/detail/Transactor.cpp b/src/xrpld/app/tx/detail/Transactor.cpp index aacf2a3d1..f06c0a496 100644 --- a/src/xrpld/app/tx/detail/Transactor.cpp +++ b/src/xrpld/app/tx/detail/Transactor.cpp @@ -23,16 +23,16 @@ #include #include #include +#include #include #include -#include -#include -#include #include -#include #include #include #include +#include +#include +#include #include #include #include diff --git a/src/xrpld/app/tx/detail/Transactor.h b/src/xrpld/app/tx/detail/Transactor.h index c23eeb411..aec16f3e4 100644 --- a/src/xrpld/app/tx/detail/Transactor.h +++ b/src/xrpld/app/tx/detail/Transactor.h @@ -23,10 +23,10 @@ #include #include #include -#include -#include #include #include +#include +#include #include namespace ripple { diff --git a/src/xrpld/app/tx/detail/XChainBridge.cpp b/src/xrpld/app/tx/detail/XChainBridge.cpp index bc6c04295..d7bbf7913 100644 --- a/src/xrpld/app/tx/detail/XChainBridge.cpp +++ b/src/xrpld/app/tx/detail/XChainBridge.cpp @@ -21,14 +21,14 @@ #include #include #include +#include +#include +#include #include #include #include #include #include -#include -#include -#include #include #include #include diff --git a/src/xrpld/conditions/Condition.h b/src/xrpld/conditions/Condition.h index 33f37e458..a3120f1b3 100644 --- a/src/xrpld/conditions/Condition.h +++ b/src/xrpld/conditions/Condition.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_CONDITIONS_CONDITION_H #define RIPPLE_CONDITIONS_CONDITION_H +#include #include #include -#include #include #include #include diff --git a/src/xrpld/conditions/Fulfillment.h b/src/xrpld/conditions/Fulfillment.h index ce24bed87..e70bcf54d 100644 --- a/src/xrpld/conditions/Fulfillment.h +++ b/src/xrpld/conditions/Fulfillment.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_CONDITIONS_FULFILLMENT_H #define RIPPLE_CONDITIONS_FULFILLMENT_H -#include -#include #include #include +#include +#include namespace ripple { namespace cryptoconditions { diff --git a/src/xrpld/conditions/detail/Condition.cpp b/src/xrpld/conditions/detail/Condition.cpp index 4ec40eae3..3085ace0a 100644 --- a/src/xrpld/conditions/detail/Condition.cpp +++ b/src/xrpld/conditions/detail/Condition.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include #include #include #include #include +#include #include #include diff --git a/src/xrpld/conditions/detail/Fulfillment.cpp b/src/xrpld/conditions/detail/Fulfillment.cpp index d4ad665c8..285113ebf 100644 --- a/src/xrpld/conditions/detail/Fulfillment.cpp +++ b/src/xrpld/conditions/detail/Fulfillment.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include #include #include #include #include +#include #include #include diff --git a/src/xrpld/conditions/detail/PreimageSha256.h b/src/xrpld/conditions/detail/PreimageSha256.h index cda6438ef..c0eca96b0 100644 --- a/src/xrpld/conditions/detail/PreimageSha256.h +++ b/src/xrpld/conditions/detail/PreimageSha256.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_CONDITIONS_PREIMAGE_SHA256_H #define RIPPLE_CONDITIONS_PREIMAGE_SHA256_H -#include -#include #include #include #include +#include +#include #include #include diff --git a/src/xrpld/conditions/detail/error.cpp b/src/xrpld/conditions/detail/error.cpp index d3b07b146..3594c9e14 100644 --- a/src/xrpld/conditions/detail/error.cpp +++ b/src/xrpld/conditions/detail/error.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include #include #include #include diff --git a/src/xrpld/conditions/detail/utils.h b/src/xrpld/conditions/detail/utils.h index 47e192879..35d9c7dea 100644 --- a/src/xrpld/conditions/detail/utils.h +++ b/src/xrpld/conditions/detail/utils.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_CONDITIONS_UTILS_H #define RIPPLE_CONDITIONS_UTILS_H +#include #include #include #include -#include #include #include #include diff --git a/src/xrpld/consensus/Consensus.cpp b/src/xrpld/consensus/Consensus.cpp index 0ac1942a1..01451c6a2 100644 --- a/src/xrpld/consensus/Consensus.cpp +++ b/src/xrpld/consensus/Consensus.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { diff --git a/src/xrpld/consensus/Consensus.h b/src/xrpld/consensus/Consensus.h index 81a858d06..cd17b00d9 100644 --- a/src/xrpld/consensus/Consensus.h +++ b/src/xrpld/consensus/Consensus.h @@ -20,14 +20,14 @@ #ifndef RIPPLE_CONSENSUS_CONSENSUS_H_INCLUDED #define RIPPLE_CONSENSUS_CONSENSUS_H_INCLUDED -#include -#include -#include #include #include #include #include #include +#include +#include +#include #include #include diff --git a/src/xrpld/consensus/ConsensusTypes.h b/src/xrpld/consensus/ConsensusTypes.h index 743c97dd9..da03fc487 100644 --- a/src/xrpld/consensus/ConsensusTypes.h +++ b/src/xrpld/consensus/ConsensusTypes.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_CONSENSUS_CONSENSUS_TYPES_H_INCLUDED #define RIPPLE_CONSENSUS_CONSENSUS_TYPES_H_INCLUDED -#include #include #include +#include #include #include diff --git a/src/xrpld/consensus/DisputedTx.h b/src/xrpld/consensus/DisputedTx.h index ec2f20b18..bffb10093 100644 --- a/src/xrpld/consensus/DisputedTx.h +++ b/src/xrpld/consensus/DisputedTx.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_APP_CONSENSUS_IMPL_DISPUTEDTX_H_INCLUDED #define RIPPLE_APP_CONSENSUS_IMPL_DISPUTEDTX_H_INCLUDED +#include #include #include #include -#include #include #include #include diff --git a/src/xrpld/consensus/Validations.h b/src/xrpld/consensus/Validations.h index 0dd042635..ed07858d3 100644 --- a/src/xrpld/consensus/Validations.h +++ b/src/xrpld/consensus/Validations.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_CONSENSUS_VALIDATIONS_H_INCLUDED #define RIPPLE_CONSENSUS_VALIDATIONS_H_INCLUDED +#include #include #include #include #include #include -#include #include #include diff --git a/src/xrpld/core/Config.h b/src/xrpld/core/Config.h index 0b6b252b1..1e157624b 100644 --- a/src/xrpld/core/Config.h +++ b/src/xrpld/core/Config.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_CORE_CONFIG_H_INCLUDED #define RIPPLE_CORE_CONFIG_H_INCLUDED +#include #include #include #include #include #include -#include #include #include // VFALCO Breaks levelization diff --git a/src/xrpld/core/DatabaseCon.h b/src/xrpld/core/DatabaseCon.h index f80b43eb6..8c82dca89 100644 --- a/src/xrpld/core/DatabaseCon.h +++ b/src/xrpld/core/DatabaseCon.h @@ -21,9 +21,9 @@ #define RIPPLE_APP_DATA_DATABASECON_H_INCLUDED #include -#include #include #include +#include #include #include #include diff --git a/src/xrpld/core/Job.h b/src/xrpld/core/Job.h index 9cc532820..c5926ae2e 100644 --- a/src/xrpld/core/Job.h +++ b/src/xrpld/core/Job.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_CORE_JOB_H_INCLUDED #define RIPPLE_CORE_JOB_H_INCLUDED -#include #include #include +#include #include #include diff --git a/src/xrpld/core/JobQueue.h b/src/xrpld/core/JobQueue.h index 9e06c34e2..06f90dd1c 100644 --- a/src/xrpld/core/JobQueue.h +++ b/src/xrpld/core/JobQueue.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_CORE_JOBQUEUE_H_INCLUDED #define RIPPLE_CORE_JOBQUEUE_H_INCLUDED -#include #include #include #include #include +#include #include #include #include // workaround for boost 1.72 bug diff --git a/src/xrpld/core/JobTypeData.h b/src/xrpld/core/JobTypeData.h index ebffdbdb1..43d63895d 100644 --- a/src/xrpld/core/JobTypeData.h +++ b/src/xrpld/core/JobTypeData.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_CORE_JOBTYPEDATA_H_INCLUDED #define RIPPLE_CORE_JOBTYPEDATA_H_INCLUDED +#include #include #include -#include namespace ripple { diff --git a/src/xrpld/core/LoadMonitor.h b/src/xrpld/core/LoadMonitor.h index 209cab45b..e57429da2 100644 --- a/src/xrpld/core/LoadMonitor.h +++ b/src/xrpld/core/LoadMonitor.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_CORE_LOADMONITOR_H_INCLUDED #define RIPPLE_CORE_LOADMONITOR_H_INCLUDED +#include #include #include -#include #include #include diff --git a/src/xrpld/core/Pg.cpp b/src/xrpld/core/Pg.cpp index 18867d9c1..829e17658 100644 --- a/src/xrpld/core/Pg.cpp +++ b/src/xrpld/core/Pg.cpp @@ -29,8 +29,8 @@ #include #endif -#include #include +#include #include #include #include diff --git a/src/xrpld/core/SociDB.h b/src/xrpld/core/SociDB.h index 9046a18a5..20f210d4e 100644 --- a/src/xrpld/core/SociDB.h +++ b/src/xrpld/core/SociDB.h @@ -33,8 +33,8 @@ #pragma clang diagnostic ignored "-Wdeprecated" #endif -#include #include +#include #define SOCI_USE_BOOST #include #include diff --git a/src/xrpld/core/detail/Config.cpp b/src/xrpld/core/detail/Config.cpp index c88b2a797..715b295fe 100644 --- a/src/xrpld/core/detail/Config.cpp +++ b/src/xrpld/core/detail/Config.cpp @@ -17,15 +17,15 @@ */ //============================================================================== +#include +#include +#include #include #include #include #include #include -#include -#include #include -#include #include #include #include diff --git a/src/xrpld/core/detail/DatabaseCon.cpp b/src/xrpld/core/detail/DatabaseCon.cpp index 102461313..c23c7491b 100644 --- a/src/xrpld/core/detail/DatabaseCon.cpp +++ b/src/xrpld/core/detail/DatabaseCon.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include #include #include +#include +#include #include #include diff --git a/src/xrpld/core/detail/Job.cpp b/src/xrpld/core/detail/Job.cpp index 5c8be67f2..0782fd05a 100644 --- a/src/xrpld/core/detail/Job.cpp +++ b/src/xrpld/core/detail/Job.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include #include namespace ripple { diff --git a/src/xrpld/core/detail/JobQueue.cpp b/src/xrpld/core/detail/JobQueue.cpp index 4fb432362..1c859d724 100644 --- a/src/xrpld/core/detail/JobQueue.cpp +++ b/src/xrpld/core/detail/JobQueue.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include #include namespace ripple { diff --git a/src/xrpld/core/detail/LoadMonitor.cpp b/src/xrpld/core/detail/LoadMonitor.cpp index 9ea744428..80b08bbdf 100644 --- a/src/xrpld/core/detail/LoadMonitor.cpp +++ b/src/xrpld/core/detail/LoadMonitor.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include namespace ripple { diff --git a/src/xrpld/core/detail/SociDB.cpp b/src/xrpld/core/detail/SociDB.cpp index 65e98a39d..94f9098d9 100644 --- a/src/xrpld/core/detail/SociDB.cpp +++ b/src/xrpld/core/detail/SociDB.cpp @@ -22,12 +22,12 @@ #pragma clang diagnostic ignored "-Wdeprecated" #endif -#include -#include #include #include #include #include +#include +#include #include #include #include diff --git a/src/xrpld/core/detail/Workers.cpp b/src/xrpld/core/detail/Workers.cpp index 781463f52..ff861010d 100644 --- a/src/xrpld/core/detail/Workers.cpp +++ b/src/xrpld/core/detail/Workers.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include #include namespace ripple { diff --git a/src/xrpld/core/detail/Workers.h b/src/xrpld/core/detail/Workers.h index 45fe11db0..3645d4fbc 100644 --- a/src/xrpld/core/detail/Workers.h +++ b/src/xrpld/core/detail/Workers.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_CORE_WORKERS_H_INCLUDED #define RIPPLE_CORE_WORKERS_H_INCLUDED -#include #include +#include #include #include #include diff --git a/src/xrpld/ledger/ApplyView.h b/src/xrpld/ledger/ApplyView.h index 30354a283..617e0c10a 100644 --- a/src/xrpld/ledger/ApplyView.h +++ b/src/xrpld/ledger/ApplyView.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_LEDGER_APPLYVIEW_H_INCLUDED #define RIPPLE_LEDGER_APPLYVIEW_H_INCLUDED -#include #include #include +#include namespace ripple { diff --git a/src/xrpld/ledger/CachedView.h b/src/xrpld/ledger/CachedView.h index 7fd4a473e..fd921c63c 100644 --- a/src/xrpld/ledger/CachedView.h +++ b/src/xrpld/ledger/CachedView.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_LEDGER_CACHEDVIEW_H_INCLUDED #define RIPPLE_LEDGER_CACHEDVIEW_H_INCLUDED -#include #include #include +#include #include #include #include diff --git a/src/xrpld/ledger/OpenView.h b/src/xrpld/ledger/OpenView.h index 82758a161..bd8627a18 100644 --- a/src/xrpld/ledger/OpenView.h +++ b/src/xrpld/ledger/OpenView.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_LEDGER_OPENVIEW_H_INCLUDED #define RIPPLE_LEDGER_OPENVIEW_H_INCLUDED -#include #include #include #include +#include #include #include diff --git a/src/xrpld/ledger/ReadView.h b/src/xrpld/ledger/ReadView.h index 56c31f6f0..50f1a7d98 100644 --- a/src/xrpld/ledger/ReadView.h +++ b/src/xrpld/ledger/ReadView.h @@ -20,13 +20,13 @@ #ifndef RIPPLE_LEDGER_READVIEW_H_INCLUDED #define RIPPLE_LEDGER_READVIEW_H_INCLUDED +#include #include #include #include #include #include #include -#include #include #include #include diff --git a/src/xrpld/ledger/View.h b/src/xrpld/ledger/View.h index e677755df..e44d00476 100644 --- a/src/xrpld/ledger/View.h +++ b/src/xrpld/ledger/View.h @@ -20,14 +20,14 @@ #ifndef RIPPLE_LEDGER_VIEW_H_INCLUDED #define RIPPLE_LEDGER_VIEW_H_INCLUDED -#include -#include #include #include #include #include #include #include +#include +#include #include #include #include diff --git a/src/xrpld/ledger/detail/ApplyStateTable.cpp b/src/xrpld/ledger/detail/ApplyStateTable.cpp index f5a7df44a..09dff5039 100644 --- a/src/xrpld/ledger/detail/ApplyStateTable.cpp +++ b/src/xrpld/ledger/detail/ApplyStateTable.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include #include #include #include @@ -194,8 +194,8 @@ ApplyStateTable::generateTxMeta( { assert(curNode && origNode); - if (curNode->isThreadedType(to.rules())) // thread transaction to node - // item modified + if (curNode->isThreadedType(to.rules())) // thread transaction to + // node item modified threadItem(meta, curNode); STObject prevs(sfPreviousFields); diff --git a/src/xrpld/ledger/detail/ApplyStateTable.h b/src/xrpld/ledger/detail/ApplyStateTable.h index a1d1a45af..10511111c 100644 --- a/src/xrpld/ledger/detail/ApplyStateTable.h +++ b/src/xrpld/ledger/detail/ApplyStateTable.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_LEDGER_APPLYSTATETABLE_H_INCLUDED #define RIPPLE_LEDGER_APPLYSTATETABLE_H_INCLUDED -#include -#include #include #include #include +#include +#include #include #include #include diff --git a/src/xrpld/ledger/detail/ApplyView.cpp b/src/xrpld/ledger/detail/ApplyView.cpp index 71e58ab4b..8dfc2bf5d 100644 --- a/src/xrpld/ledger/detail/ApplyView.cpp +++ b/src/xrpld/ledger/detail/ApplyView.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include #include #include diff --git a/src/xrpld/ledger/detail/ApplyViewBase.cpp b/src/xrpld/ledger/detail/ApplyViewBase.cpp index 1ca82b12b..2462c1615 100644 --- a/src/xrpld/ledger/detail/ApplyViewBase.cpp +++ b/src/xrpld/ledger/detail/ApplyViewBase.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include #include namespace ripple { diff --git a/src/xrpld/ledger/detail/ApplyViewBase.h b/src/xrpld/ledger/detail/ApplyViewBase.h index 6ca1d94bc..2688ed291 100644 --- a/src/xrpld/ledger/detail/ApplyViewBase.h +++ b/src/xrpld/ledger/detail/ApplyViewBase.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_LEDGER_APPLYVIEWBASE_H_INCLUDED #define RIPPLE_LEDGER_APPLYVIEWBASE_H_INCLUDED -#include #include #include #include #include +#include namespace ripple { namespace detail { diff --git a/src/xrpld/ledger/detail/ApplyViewImpl.cpp b/src/xrpld/ledger/detail/ApplyViewImpl.cpp index 9ee0a0563..addc0fbb8 100644 --- a/src/xrpld/ledger/detail/ApplyViewImpl.cpp +++ b/src/xrpld/ledger/detail/ApplyViewImpl.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include #include namespace ripple { diff --git a/src/xrpld/ledger/detail/CachedView.cpp b/src/xrpld/ledger/detail/CachedView.cpp index 5dceaef70..645a2c79c 100644 --- a/src/xrpld/ledger/detail/CachedView.cpp +++ b/src/xrpld/ledger/detail/CachedView.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include #include namespace ripple { diff --git a/src/xrpld/ledger/detail/OpenView.cpp b/src/xrpld/ledger/detail/OpenView.cpp index 1b2a0d1c9..e49a836c9 100644 --- a/src/xrpld/ledger/detail/OpenView.cpp +++ b/src/xrpld/ledger/detail/OpenView.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { diff --git a/src/xrpld/ledger/detail/RawStateTable.cpp b/src/xrpld/ledger/detail/RawStateTable.cpp index 69201157a..4d3732f8a 100644 --- a/src/xrpld/ledger/detail/RawStateTable.cpp +++ b/src/xrpld/ledger/detail/RawStateTable.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include namespace ripple { namespace detail { diff --git a/src/xrpld/ledger/detail/View.cpp b/src/xrpld/ledger/detail/View.cpp index d0fdd91e0..027cf3c74 100644 --- a/src/xrpld/ledger/detail/View.cpp +++ b/src/xrpld/ledger/detail/View.cpp @@ -17,11 +17,11 @@ */ //============================================================================== +#include +#include #include #include #include -#include -#include #include #include #include diff --git a/src/xrpld/net/HTTPClient.h b/src/xrpld/net/HTTPClient.h index ff8c26034..3b7da776e 100644 --- a/src/xrpld/net/HTTPClient.h +++ b/src/xrpld/net/HTTPClient.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_NET_HTTPCLIENT_H_INCLUDED #define RIPPLE_NET_HTTPCLIENT_H_INCLUDED -#include #include +#include #include #include diff --git a/src/xrpld/net/HTTPClientSSLContext.h b/src/xrpld/net/HTTPClientSSLContext.h index 5c515a79f..64ca2461d 100644 --- a/src/xrpld/net/HTTPClientSSLContext.h +++ b/src/xrpld/net/HTTPClientSSLContext.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_NET_HTTPCLIENTSSLCONTEXT_H_INCLUDED #define RIPPLE_NET_HTTPCLIENTSSLCONTEXT_H_INCLUDED -#include -#include #include #include +#include +#include #include #include #include diff --git a/src/xrpld/net/HTTPDownloader.h b/src/xrpld/net/HTTPDownloader.h index 8fc09473f..711973aff 100644 --- a/src/xrpld/net/HTTPDownloader.h +++ b/src/xrpld/net/HTTPDownloader.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_NET_HTTPDOWNLOADER_H_INCLUDED #define RIPPLE_NET_HTTPDOWNLOADER_H_INCLUDED -#include #include #include +#include #include #include diff --git a/src/xrpld/net/RPCCall.h b/src/xrpld/net/RPCCall.h index 1147bdaa0..9c78bb20d 100644 --- a/src/xrpld/net/RPCCall.h +++ b/src/xrpld/net/RPCCall.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_NET_RPCCALL_H_INCLUDED #define RIPPLE_NET_RPCCALL_H_INCLUDED -#include #include +#include #include #include #include diff --git a/src/xrpld/net/detail/HTTPClient.cpp b/src/xrpld/net/detail/HTTPClient.cpp index b3609061e..61c2875a5 100644 --- a/src/xrpld/net/detail/HTTPClient.cpp +++ b/src/xrpld/net/detail/HTTPClient.cpp @@ -17,13 +17,13 @@ */ //============================================================================== +#include +#include +#include #include #include #include #include -#include -#include -#include #include #include #include diff --git a/src/xrpld/net/detail/RPCCall.cpp b/src/xrpld/net/detail/RPCCall.cpp index 4c4674a4d..effc953f2 100644 --- a/src/xrpld/net/detail/RPCCall.cpp +++ b/src/xrpld/net/detail/RPCCall.cpp @@ -18,26 +18,26 @@ //============================================================================== #include +#include +#include +#include +#include +#include #include #include #include #include #include #include -#include #include #include #include -#include -#include #include #include #include #include #include #include -#include -#include #include #include diff --git a/src/xrpld/net/detail/RPCSub.cpp b/src/xrpld/net/detail/RPCSub.cpp index 914fe8d8a..1fc327708 100644 --- a/src/xrpld/net/detail/RPCSub.cpp +++ b/src/xrpld/net/detail/RPCSub.cpp @@ -17,12 +17,12 @@ */ //============================================================================== +#include +#include #include #include #include #include -#include -#include #include namespace ripple { diff --git a/src/xrpld/nodestore/Database.h b/src/xrpld/nodestore/Database.h index 1bc68824a..ad843c55d 100644 --- a/src/xrpld/nodestore/Database.h +++ b/src/xrpld/nodestore/Database.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_NODESTORE_DATABASE_H_INCLUDED #define RIPPLE_NODESTORE_DATABASE_H_INCLUDED -#include #include #include #include +#include #include #include diff --git a/src/xrpld/nodestore/Factory.h b/src/xrpld/nodestore/Factory.h index 50360cda1..8853a6ce9 100644 --- a/src/xrpld/nodestore/Factory.h +++ b/src/xrpld/nodestore/Factory.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_NODESTORE_FACTORY_H_INCLUDED #define RIPPLE_NODESTORE_FACTORY_H_INCLUDED -#include #include #include +#include #include namespace ripple { diff --git a/src/xrpld/nodestore/ShardInfo.h b/src/xrpld/nodestore/ShardInfo.h index 9996ef510..b894ddc34 100644 --- a/src/xrpld/nodestore/ShardInfo.h +++ b/src/xrpld/nodestore/ShardInfo.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_NODESTORE_SHARDINFO_H_INCLUDED #define RIPPLE_NODESTORE_SHARDINFO_H_INCLUDED -#include #include +#include #include namespace ripple { diff --git a/src/xrpld/nodestore/Types.h b/src/xrpld/nodestore/Types.h index 785178d99..39104f946 100644 --- a/src/xrpld/nodestore/Types.h +++ b/src/xrpld/nodestore/Types.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_NODESTORE_TYPES_H_INCLUDED #define RIPPLE_NODESTORE_TYPES_H_INCLUDED -#include #include +#include #include namespace ripple { diff --git a/src/xrpld/nodestore/backend/CassandraFactory.cpp b/src/xrpld/nodestore/backend/CassandraFactory.cpp index e74e14976..c53e77095 100644 --- a/src/xrpld/nodestore/backend/CassandraFactory.cpp +++ b/src/xrpld/nodestore/backend/CassandraFactory.cpp @@ -22,16 +22,16 @@ #include #include -#include -#include -#include -#include #include #include #include #include #include #include +#include +#include +#include +#include #include #include #include diff --git a/src/xrpld/nodestore/backend/FlatmapFactory.cpp b/src/xrpld/nodestore/backend/FlatmapFactory.cpp index 6b8b3e6b5..6e47f9b9b 100644 --- a/src/xrpld/nodestore/backend/FlatmapFactory.cpp +++ b/src/xrpld/nodestore/backend/FlatmapFactory.cpp @@ -1,9 +1,9 @@ -#include #include #include #include #include #include +#include #include #include #include diff --git a/src/xrpld/nodestore/backend/MemoryFactory.cpp b/src/xrpld/nodestore/backend/MemoryFactory.cpp index 55ab9fa49..33526d535 100644 --- a/src/xrpld/nodestore/backend/MemoryFactory.cpp +++ b/src/xrpld/nodestore/backend/MemoryFactory.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include #include #include +#include #include #include #include diff --git a/src/xrpld/nodestore/backend/NuDBFactory.cpp b/src/xrpld/nodestore/backend/NuDBFactory.cpp index 200edfab3..742bf0503 100644 --- a/src/xrpld/nodestore/backend/NuDBFactory.cpp +++ b/src/xrpld/nodestore/backend/NuDBFactory.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include #include #include #include #include #include +#include #include #include #include diff --git a/src/xrpld/nodestore/backend/NullFactory.cpp b/src/xrpld/nodestore/backend/NullFactory.cpp index 732aa0e1f..47254cd50 100644 --- a/src/xrpld/nodestore/backend/NullFactory.cpp +++ b/src/xrpld/nodestore/backend/NullFactory.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include #include #include +#include #include namespace ripple { diff --git a/src/xrpld/nodestore/backend/RWDBFactory.cpp b/src/xrpld/nodestore/backend/RWDBFactory.cpp index 9edb737f6..aae6a6c79 100644 --- a/src/xrpld/nodestore/backend/RWDBFactory.cpp +++ b/src/xrpld/nodestore/backend/RWDBFactory.cpp @@ -1,9 +1,9 @@ -#include #include #include #include #include #include +#include #include #include #include diff --git a/src/xrpld/nodestore/backend/RocksDBFactory.cpp b/src/xrpld/nodestore/backend/RocksDBFactory.cpp index d4c4c56a5..9ba9fffe1 100644 --- a/src/xrpld/nodestore/backend/RocksDBFactory.cpp +++ b/src/xrpld/nodestore/backend/RocksDBFactory.cpp @@ -21,16 +21,16 @@ #if RIPPLE_ROCKSDB_AVAILABLE -#include -#include -#include -#include #include // VFALCO Bad dependency #include #include #include #include #include +#include +#include +#include +#include #include #include diff --git a/src/xrpld/nodestore/detail/Database.cpp b/src/xrpld/nodestore/detail/Database.cpp index 0d5a686c0..93468eb60 100644 --- a/src/xrpld/nodestore/detail/Database.cpp +++ b/src/xrpld/nodestore/detail/Database.cpp @@ -18,10 +18,10 @@ //============================================================================== #include +#include #include #include #include -#include #include #include #include diff --git a/src/xrpld/nodestore/detail/DatabaseNodeImp.h b/src/xrpld/nodestore/detail/DatabaseNodeImp.h index ebc769712..f5f5f64bd 100644 --- a/src/xrpld/nodestore/detail/DatabaseNodeImp.h +++ b/src/xrpld/nodestore/detail/DatabaseNodeImp.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_NODESTORE_DATABASENODEIMP_H_INCLUDED #define RIPPLE_NODESTORE_DATABASENODEIMP_H_INCLUDED +#include #include #include -#include namespace ripple { namespace NodeStore { diff --git a/src/xrpld/nodestore/detail/DatabaseShardImp.cpp b/src/xrpld/nodestore/detail/DatabaseShardImp.cpp index 5a233c3e9..c7e45641d 100644 --- a/src/xrpld/nodestore/detail/DatabaseShardImp.cpp +++ b/src/xrpld/nodestore/detail/DatabaseShardImp.cpp @@ -21,15 +21,15 @@ #include #include #include -#include -#include -#include -#include #include #include #include #include #include +#include +#include +#include +#include #include #include #include diff --git a/src/xrpld/nodestore/detail/DecodedBlob.cpp b/src/xrpld/nodestore/detail/DecodedBlob.cpp index f75142153..b71f2c543 100644 --- a/src/xrpld/nodestore/detail/DecodedBlob.cpp +++ b/src/xrpld/nodestore/detail/DecodedBlob.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include #include #include diff --git a/src/xrpld/nodestore/detail/DeterministicShard.cpp b/src/xrpld/nodestore/detail/DeterministicShard.cpp index d9afd2dc8..c575a685d 100644 --- a/src/xrpld/nodestore/detail/DeterministicShard.cpp +++ b/src/xrpld/nodestore/detail/DeterministicShard.cpp @@ -18,11 +18,11 @@ //============================================================================== #include -#include #include #include #include #include +#include #include #include #include diff --git a/src/xrpld/nodestore/detail/EncodedBlob.h b/src/xrpld/nodestore/detail/EncodedBlob.h index 5c9b220ac..2b506a0df 100644 --- a/src/xrpld/nodestore/detail/EncodedBlob.h +++ b/src/xrpld/nodestore/detail/EncodedBlob.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_NODESTORE_ENCODEDBLOB_H_INCLUDED #define RIPPLE_NODESTORE_ENCODEDBLOB_H_INCLUDED -#include #include +#include #include #include #include diff --git a/src/xrpld/nodestore/detail/Shard.cpp b/src/xrpld/nodestore/detail/Shard.cpp index 7ee6d03cf..97929502f 100644 --- a/src/xrpld/nodestore/detail/Shard.cpp +++ b/src/xrpld/nodestore/detail/Shard.cpp @@ -20,11 +20,11 @@ #include #include #include -#include #include #include #include #include +#include #include #include diff --git a/src/xrpld/nodestore/detail/Shard.h b/src/xrpld/nodestore/detail/Shard.h index 831f01b40..be11e538c 100644 --- a/src/xrpld/nodestore/detail/Shard.h +++ b/src/xrpld/nodestore/detail/Shard.h @@ -22,15 +22,15 @@ #include #include +#include +#include +#include +#include #include #include #include #include #include -#include -#include -#include -#include #include #include diff --git a/src/xrpld/nodestore/detail/codec.h b/src/xrpld/nodestore/detail/codec.h index 3548029e0..f19672b81 100644 --- a/src/xrpld/nodestore/detail/codec.h +++ b/src/xrpld/nodestore/detail/codec.h @@ -23,10 +23,10 @@ // Disable lz4 deprecation warning due to incompatibility with clang attributes #define LZ4_DISABLE_DEPRECATE_WARNINGS -#include -#include #include #include +#include +#include #include #include #include diff --git a/src/xrpld/overlay/Cluster.h b/src/xrpld/overlay/Cluster.h index a79cd0f60..42bda586c 100644 --- a/src/xrpld/overlay/Cluster.h +++ b/src/xrpld/overlay/Cluster.h @@ -21,11 +21,11 @@ #define RIPPLE_OVERLAY_CLUSTER_H_INCLUDED #include +#include #include #include #include #include -#include #include #include #include diff --git a/src/xrpld/overlay/Message.h b/src/xrpld/overlay/Message.h index 0f06d5829..247e53ec9 100644 --- a/src/xrpld/overlay/Message.h +++ b/src/xrpld/overlay/Message.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_OVERLAY_MESSAGE_H_INCLUDED #define RIPPLE_OVERLAY_MESSAGE_H_INCLUDED -#include #include +#include #include #include #include diff --git a/src/xrpld/overlay/Overlay.h b/src/xrpld/overlay/Overlay.h index 4cc0427ed..1a3362d38 100644 --- a/src/xrpld/overlay/Overlay.h +++ b/src/xrpld/overlay/Overlay.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_OVERLAY_OVERLAY_H_INCLUDED #define RIPPLE_OVERLAY_OVERLAY_H_INCLUDED -#include -#include #include #include +#include +#include #include #include #include diff --git a/src/xrpld/overlay/Peer.h b/src/xrpld/overlay/Peer.h index 558e65292..81c04f720 100644 --- a/src/xrpld/overlay/Peer.h +++ b/src/xrpld/overlay/Peer.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_OVERLAY_PEER_H_INCLUDED #define RIPPLE_OVERLAY_PEER_H_INCLUDED +#include #include #include #include -#include #include namespace ripple { diff --git a/src/xrpld/overlay/PeerSet.h b/src/xrpld/overlay/PeerSet.h index af9dc4944..aca6242f9 100644 --- a/src/xrpld/overlay/PeerSet.h +++ b/src/xrpld/overlay/PeerSet.h @@ -21,10 +21,10 @@ #define RIPPLE_APP_PEERS_PEERSET_H_INCLUDED #include -#include -#include #include #include +#include +#include #include #include #include diff --git a/src/xrpld/overlay/Slot.h b/src/xrpld/overlay/Slot.h index 8dd7e7cf7..2a8b2146a 100644 --- a/src/xrpld/overlay/Slot.h +++ b/src/xrpld/overlay/Slot.h @@ -20,13 +20,13 @@ #ifndef RIPPLE_OVERLAY_SLOT_H_INCLUDED #define RIPPLE_OVERLAY_SLOT_H_INCLUDED +#include +#include +#include #include #include #include #include -#include -#include -#include #include #include diff --git a/src/xrpld/overlay/Squelch.h b/src/xrpld/overlay/Squelch.h index a342a7a31..2919922da 100644 --- a/src/xrpld/overlay/Squelch.h +++ b/src/xrpld/overlay/Squelch.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_OVERLAY_SQUELCH_H_INCLUDED #define RIPPLE_OVERLAY_SQUELCH_H_INCLUDED +#include #include #include -#include #include #include diff --git a/src/xrpld/overlay/detail/Cluster.cpp b/src/xrpld/overlay/detail/Cluster.cpp index 7465a4d52..9d25248e8 100644 --- a/src/xrpld/overlay/detail/Cluster.cpp +++ b/src/xrpld/overlay/detail/Cluster.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include #include #include #include #include +#include +#include #include #include #include diff --git a/src/xrpld/overlay/detail/ConnectAttempt.cpp b/src/xrpld/overlay/detail/ConnectAttempt.cpp index 991afb570..6a3ebdd5b 100644 --- a/src/xrpld/overlay/detail/ConnectAttempt.cpp +++ b/src/xrpld/overlay/detail/ConnectAttempt.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include #include #include #include #include +#include namespace ripple { diff --git a/src/xrpld/overlay/detail/Handshake.cpp b/src/xrpld/overlay/detail/Handshake.cpp index fa9968c82..0eb2afd96 100644 --- a/src/xrpld/overlay/detail/Handshake.cpp +++ b/src/xrpld/overlay/detail/Handshake.cpp @@ -19,10 +19,10 @@ #include #include +#include #include #include #include -#include #include #include #include diff --git a/src/xrpld/overlay/detail/Handshake.h b/src/xrpld/overlay/detail/Handshake.h index 7efbb7c78..76c11b287 100644 --- a/src/xrpld/overlay/detail/Handshake.h +++ b/src/xrpld/overlay/detail/Handshake.h @@ -21,8 +21,8 @@ #define RIPPLE_OVERLAY_HANDSHAKE_H_INCLUDED #include -#include #include +#include #include #include #include diff --git a/src/xrpld/overlay/detail/OverlayImpl.cpp b/src/xrpld/overlay/detail/OverlayImpl.cpp index 673c45408..f037412d8 100644 --- a/src/xrpld/overlay/detail/OverlayImpl.cpp +++ b/src/xrpld/overlay/detail/OverlayImpl.cpp @@ -24,10 +24,6 @@ #include #include #include -#include -#include -#include -#include #include #include #include @@ -36,6 +32,10 @@ #include #include #include +#include +#include +#include +#include #include #include diff --git a/src/xrpld/overlay/detail/OverlayImpl.h b/src/xrpld/overlay/detail/OverlayImpl.h index c2de25772..1934a7c94 100644 --- a/src/xrpld/overlay/detail/OverlayImpl.h +++ b/src/xrpld/overlay/detail/OverlayImpl.h @@ -21,9 +21,6 @@ #define RIPPLE_OVERLAY_OVERLAYIMPL_H_INCLUDED #include -#include -#include -#include #include #include #include @@ -32,8 +29,11 @@ #include #include #include -#include #include +#include +#include +#include +#include #include #include #include diff --git a/src/xrpld/overlay/detail/PeerImp.cpp b/src/xrpld/overlay/detail/PeerImp.cpp index 934a8948d..a0d6d36da 100644 --- a/src/xrpld/overlay/detail/PeerImp.cpp +++ b/src/xrpld/overlay/detail/PeerImp.cpp @@ -28,17 +28,17 @@ #include #include #include +#include +#include +#include +#include +#include #include #include #include #include #include #include -#include -#include -#include -#include -#include #include #include diff --git a/src/xrpld/overlay/detail/PeerImp.h b/src/xrpld/overlay/detail/PeerImp.h index 4326907f9..1c25d8089 100644 --- a/src/xrpld/overlay/detail/PeerImp.h +++ b/src/xrpld/overlay/detail/PeerImp.h @@ -22,16 +22,16 @@ #include #include -#include -#include -#include -#include #include #include #include #include #include #include +#include +#include +#include +#include #include #include #include diff --git a/src/xrpld/overlay/detail/ProtocolMessage.h b/src/xrpld/overlay/detail/ProtocolMessage.h index 314c20d93..b8c6a2c1c 100644 --- a/src/xrpld/overlay/detail/ProtocolMessage.h +++ b/src/xrpld/overlay/detail/ProtocolMessage.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_OVERLAY_PROTOCOLMESSAGE_H_INCLUDED #define RIPPLE_OVERLAY_PROTOCOLMESSAGE_H_INCLUDED -#include #include #include #include +#include #include #include #include diff --git a/src/xrpld/overlay/detail/ProtocolVersion.cpp b/src/xrpld/overlay/detail/ProtocolVersion.cpp index 936c598aa..bd2effa63 100644 --- a/src/xrpld/overlay/detail/ProtocolVersion.cpp +++ b/src/xrpld/overlay/detail/ProtocolVersion.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include #include #include #include diff --git a/src/xrpld/overlay/make_Overlay.h b/src/xrpld/overlay/make_Overlay.h index ac7166735..6532281f3 100644 --- a/src/xrpld/overlay/make_Overlay.h +++ b/src/xrpld/overlay/make_Overlay.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_OVERLAY_MAKE_OVERLAY_H_INCLUDED #define RIPPLE_OVERLAY_MAKE_OVERLAY_H_INCLUDED -#include #include -#include #include +#include +#include #include #include diff --git a/src/xrpld/peerfinder/PeerfinderManager.h b/src/xrpld/peerfinder/PeerfinderManager.h index 54aa1f7f6..10de99abe 100644 --- a/src/xrpld/peerfinder/PeerfinderManager.h +++ b/src/xrpld/peerfinder/PeerfinderManager.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_PEERFINDER_MANAGER_H_INCLUDED #define RIPPLE_PEERFINDER_MANAGER_H_INCLUDED -#include -#include #include #include +#include +#include #include namespace ripple { diff --git a/src/xrpld/peerfinder/detail/Bootcache.cpp b/src/xrpld/peerfinder/detail/Bootcache.cpp index c21ff530a..9e94a12e6 100644 --- a/src/xrpld/peerfinder/detail/Bootcache.cpp +++ b/src/xrpld/peerfinder/detail/Bootcache.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include #include #include #include +#include namespace ripple { namespace PeerFinder { diff --git a/src/xrpld/peerfinder/detail/Bootcache.h b/src/xrpld/peerfinder/detail/Bootcache.h index 20de0c3c1..07e886959 100644 --- a/src/xrpld/peerfinder/detail/Bootcache.h +++ b/src/xrpld/peerfinder/detail/Bootcache.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_PEERFINDER_BOOTCACHE_H_INCLUDED #define RIPPLE_PEERFINDER_BOOTCACHE_H_INCLUDED +#include +#include #include #include #include -#include -#include #include #include #include diff --git a/src/xrpld/peerfinder/detail/Counts.h b/src/xrpld/peerfinder/detail/Counts.h index 3134ddc90..1ea6ff976 100644 --- a/src/xrpld/peerfinder/detail/Counts.h +++ b/src/xrpld/peerfinder/detail/Counts.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_PEERFINDER_COUNTS_H_INCLUDED #define RIPPLE_PEERFINDER_COUNTS_H_INCLUDED -#include #include #include #include +#include #include diff --git a/src/xrpld/peerfinder/detail/Handouts.h b/src/xrpld/peerfinder/detail/Handouts.h index b6f33406a..0b54dc205 100644 --- a/src/xrpld/peerfinder/detail/Handouts.h +++ b/src/xrpld/peerfinder/detail/Handouts.h @@ -20,9 +20,9 @@ #ifndef RIPPLE_PEERFINDER_HANDOUTS_H_INCLUDED #define RIPPLE_PEERFINDER_HANDOUTS_H_INCLUDED -#include #include #include +#include #include #include #include diff --git a/src/xrpld/peerfinder/detail/InMemoryStore.h b/src/xrpld/peerfinder/detail/InMemoryStore.h index 692d85d3a..fcb989255 100644 --- a/src/xrpld/peerfinder/detail/InMemoryStore.h +++ b/src/xrpld/peerfinder/detail/InMemoryStore.h @@ -1,8 +1,8 @@ #ifndef RIPPLE_PEERFINDER_INMEMORYSTORE_H_INCLUDED #define RIPPLE_PEERFINDER_INMEMORYSTORE_H_INCLUDED -#include #include +#include #include #include diff --git a/src/xrpld/peerfinder/detail/Livecache.h b/src/xrpld/peerfinder/detail/Livecache.h index 1dc8f4363..1583ccd96 100644 --- a/src/xrpld/peerfinder/detail/Livecache.h +++ b/src/xrpld/peerfinder/detail/Livecache.h @@ -20,13 +20,13 @@ #ifndef RIPPLE_PEERFINDER_LIVECACHE_H_INCLUDED #define RIPPLE_PEERFINDER_LIVECACHE_H_INCLUDED +#include +#include +#include #include #include #include #include -#include -#include -#include #include #include diff --git a/src/xrpld/peerfinder/detail/Logic.h b/src/xrpld/peerfinder/detail/Logic.h index 0b44366b5..49b71a6a5 100644 --- a/src/xrpld/peerfinder/detail/Logic.h +++ b/src/xrpld/peerfinder/detail/Logic.h @@ -20,11 +20,6 @@ #ifndef RIPPLE_PEERFINDER_LOGIC_H_INCLUDED #define RIPPLE_PEERFINDER_LOGIC_H_INCLUDED -#include -#include -#include -#include -#include #include #include #include @@ -36,6 +31,11 @@ #include #include #include +#include +#include +#include +#include +#include #include #include diff --git a/src/xrpld/peerfinder/detail/SlotImp.h b/src/xrpld/peerfinder/detail/SlotImp.h index cb6a83c63..45143a901 100644 --- a/src/xrpld/peerfinder/detail/SlotImp.h +++ b/src/xrpld/peerfinder/detail/SlotImp.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_PEERFINDER_SLOTIMP_H_INCLUDED #define RIPPLE_PEERFINDER_SLOTIMP_H_INCLUDED -#include -#include #include #include +#include +#include #include #include diff --git a/src/xrpld/peerfinder/detail/StoreSqdb.h b/src/xrpld/peerfinder/detail/StoreSqdb.h index 6e290d1d5..ad8b886d4 100644 --- a/src/xrpld/peerfinder/detail/StoreSqdb.h +++ b/src/xrpld/peerfinder/detail/StoreSqdb.h @@ -21,9 +21,9 @@ #define RIPPLE_PEERFINDER_STORESQDB_H_INCLUDED #include -#include #include #include +#include #include namespace ripple { diff --git a/src/xrpld/perflog/detail/PerfLogImp.cpp b/src/xrpld/perflog/detail/PerfLogImp.cpp index 8bfacd304..b9691e05c 100644 --- a/src/xrpld/perflog/detail/PerfLogImp.cpp +++ b/src/xrpld/perflog/detail/PerfLogImp.cpp @@ -19,13 +19,13 @@ #include +#include +#include #include #include #include -#include #include #include -#include #include #include #include diff --git a/src/xrpld/perflog/detail/PerfLogImp.h b/src/xrpld/perflog/detail/PerfLogImp.h index 168b8f67d..937486f75 100644 --- a/src/xrpld/perflog/detail/PerfLogImp.h +++ b/src/xrpld/perflog/detail/PerfLogImp.h @@ -21,10 +21,10 @@ #define RIPPLE_BASICS_PERFLOGIMP_H #include +#include #include #include #include -#include #include #include #include diff --git a/src/xrpld/rpc/GRPCHandlers.h b/src/xrpld/rpc/GRPCHandlers.h index fca144bb4..679b16fd8 100644 --- a/src/xrpld/rpc/GRPCHandlers.h +++ b/src/xrpld/rpc/GRPCHandlers.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_RPC_GRPCHANDLER_H_INCLUDED #define RIPPLE_RPC_GRPCHANDLER_H_INCLUDED -#include #include +#include #include namespace ripple { diff --git a/src/xrpld/rpc/Request.h b/src/xrpld/rpc/Request.h index 5a006299a..ec65e38d4 100644 --- a/src/xrpld/rpc/Request.h +++ b/src/xrpld/rpc/Request.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_RPC_REQUEST_H_INCLUDED #define RIPPLE_RPC_REQUEST_H_INCLUDED +#include #include #include #include -#include namespace ripple { diff --git a/src/xrpld/rpc/ServerHandler.h b/src/xrpld/rpc/ServerHandler.h index 4316f8a21..0874f51ca 100644 --- a/src/xrpld/rpc/ServerHandler.h +++ b/src/xrpld/rpc/ServerHandler.h @@ -22,10 +22,10 @@ #include #include -#include #include #include #include +#include #include #include #include diff --git a/src/xrpld/rpc/ShardArchiveHandler.h b/src/xrpld/rpc/ShardArchiveHandler.h index 1a27a9af7..3a407b379 100644 --- a/src/xrpld/rpc/ShardArchiveHandler.h +++ b/src/xrpld/rpc/ShardArchiveHandler.h @@ -21,11 +21,11 @@ #define RIPPLE_RPC_SHARDARCHIVEHANDLER_H_INCLUDED #include -#include -#include #include #include #include +#include +#include #include #include diff --git a/src/xrpld/rpc/detail/DeliveredAmount.cpp b/src/xrpld/rpc/detail/DeliveredAmount.cpp index 38bcf377d..f0addf63d 100644 --- a/src/xrpld/rpc/detail/DeliveredAmount.cpp +++ b/src/xrpld/rpc/detail/DeliveredAmount.cpp @@ -23,11 +23,11 @@ #include #include #include +#include +#include #include #include #include -#include -#include #include namespace ripple { diff --git a/src/xrpld/rpc/detail/Handler.cpp b/src/xrpld/rpc/detail/Handler.cpp index b304d92ea..c46211a95 100644 --- a/src/xrpld/rpc/detail/Handler.cpp +++ b/src/xrpld/rpc/detail/Handler.cpp @@ -17,11 +17,11 @@ */ //============================================================================== -#include -#include -#include #include #include +#include +#include +#include #include diff --git a/src/xrpld/rpc/detail/RPCHandler.cpp b/src/xrpld/rpc/detail/RPCHandler.cpp index 8039c96d3..8504fe72a 100644 --- a/src/xrpld/rpc/detail/RPCHandler.cpp +++ b/src/xrpld/rpc/detail/RPCHandler.cpp @@ -23,23 +23,23 @@ #include #include #include -#include -#include -#include #include #include -#include -#include #include -#include -#include -#include -#include +#include #include #include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/xrpld/rpc/detail/RPCHelpers.cpp b/src/xrpld/rpc/detail/RPCHelpers.cpp index 81f3422de..ff0d05486 100644 --- a/src/xrpld/rpc/detail/RPCHelpers.cpp +++ b/src/xrpld/rpc/detail/RPCHelpers.cpp @@ -25,14 +25,14 @@ #include #include #include +#include +#include +#include #include #include #include #include #include -#include -#include -#include #include #include diff --git a/src/xrpld/rpc/detail/RPCHelpers.h b/src/xrpld/rpc/detail/RPCHelpers.h index 3223f3cd4..046e6b0de 100644 --- a/src/xrpld/rpc/detail/RPCHelpers.h +++ b/src/xrpld/rpc/detail/RPCHelpers.h @@ -27,10 +27,10 @@ #include #include -#include #include #include #include +#include #include #include diff --git a/src/xrpld/rpc/detail/ServerHandler.cpp b/src/xrpld/rpc/detail/ServerHandler.cpp index ee6cb529d..ad476b1dc 100644 --- a/src/xrpld/rpc/detail/ServerHandler.cpp +++ b/src/xrpld/rpc/detail/ServerHandler.cpp @@ -21,26 +21,26 @@ #include #include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include #include #include -#include -#include #include #include -#include #include #include #include #include -#include -#include -#include -#include -#include #include #include #include diff --git a/src/xrpld/rpc/detail/ServerHandlerImp.h b/src/xrpld/rpc/detail/ServerHandlerImp.h index 2251774f4..835598d3c 100644 --- a/src/xrpld/rpc/detail/ServerHandlerImp.h +++ b/src/xrpld/rpc/detail/ServerHandlerImp.h @@ -22,10 +22,10 @@ #include #include -#include #include #include #include +#include #include #include #include diff --git a/src/xrpld/rpc/detail/ShardArchiveHandler.cpp b/src/xrpld/rpc/detail/ShardArchiveHandler.cpp index fae36069a..4999eb92d 100644 --- a/src/xrpld/rpc/detail/ShardArchiveHandler.cpp +++ b/src/xrpld/rpc/detail/ShardArchiveHandler.cpp @@ -19,12 +19,12 @@ #include #include -#include -#include #include #include #include #include +#include +#include #include diff --git a/src/xrpld/rpc/detail/TransactionSign.cpp b/src/xrpld/rpc/detail/TransactionSign.cpp index 258235251..5ea895b60 100644 --- a/src/xrpld/rpc/detail/TransactionSign.cpp +++ b/src/xrpld/rpc/detail/TransactionSign.cpp @@ -26,6 +26,10 @@ #include #include #include // Validity::Valid +#include +#include +#include +#include #include #include #include @@ -36,10 +40,6 @@ #include #include #include -#include -#include -#include -#include #include #include diff --git a/src/xrpld/rpc/detail/UDPInfoSub.h b/src/xrpld/rpc/detail/UDPInfoSub.h index 14612b04b..6b40871c9 100644 --- a/src/xrpld/rpc/detail/UDPInfoSub.h +++ b/src/xrpld/rpc/detail/UDPInfoSub.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_RPC_UDPINFOSUB_H #define RIPPLE_RPC_UDPINFOSUB_H +#include +#include #include #include #include -#include -#include #include #include #include diff --git a/src/xrpld/rpc/detail/WSInfoSub.h b/src/xrpld/rpc/detail/WSInfoSub.h index e022a41a4..1ef213bfa 100644 --- a/src/xrpld/rpc/detail/WSInfoSub.h +++ b/src/xrpld/rpc/detail/WSInfoSub.h @@ -20,10 +20,10 @@ #ifndef RIPPLE_RPC_WSINFOSUB_H #define RIPPLE_RPC_WSINFOSUB_H -#include -#include #include #include +#include +#include #include #include #include diff --git a/src/xrpld/rpc/handlers/AMMInfo.cpp b/src/xrpld/rpc/handlers/AMMInfo.cpp index fe5ba9f5c..aad8faea2 100644 --- a/src/xrpld/rpc/handlers/AMMInfo.cpp +++ b/src/xrpld/rpc/handlers/AMMInfo.cpp @@ -18,13 +18,13 @@ //============================================================================== #include #include -#include #include +#include +#include +#include #include #include #include -#include -#include #include namespace ripple { diff --git a/src/xrpld/rpc/handlers/AccountChannels.cpp b/src/xrpld/rpc/handlers/AccountChannels.cpp index 2f181e759..1c14f0bd6 100644 --- a/src/xrpld/rpc/handlers/AccountChannels.cpp +++ b/src/xrpld/rpc/handlers/AccountChannels.cpp @@ -20,15 +20,15 @@ #include #include #include +#include +#include +#include #include #include #include #include #include #include -#include -#include -#include namespace ripple { void diff --git a/src/xrpld/rpc/handlers/AccountCurrenciesHandler.cpp b/src/xrpld/rpc/handlers/AccountCurrenciesHandler.cpp index a1ae9dac1..6c8fe2826 100644 --- a/src/xrpld/rpc/handlers/AccountCurrenciesHandler.cpp +++ b/src/xrpld/rpc/handlers/AccountCurrenciesHandler.cpp @@ -20,11 +20,11 @@ #include #include #include +#include +#include #include #include #include -#include -#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/AccountInfo.cpp b/src/xrpld/rpc/handlers/AccountInfo.cpp index 9cb3fec02..724acb1f2 100644 --- a/src/xrpld/rpc/handlers/AccountInfo.cpp +++ b/src/xrpld/rpc/handlers/AccountInfo.cpp @@ -19,16 +19,16 @@ #include #include -#include #include +#include +#include +#include +#include #include #include #include #include #include -#include -#include -#include #include namespace ripple { diff --git a/src/xrpld/rpc/handlers/AccountLines.cpp b/src/xrpld/rpc/handlers/AccountLines.cpp index 182cbe091..3243aff9e 100644 --- a/src/xrpld/rpc/handlers/AccountLines.cpp +++ b/src/xrpld/rpc/handlers/AccountLines.cpp @@ -20,13 +20,13 @@ #include #include #include +#include +#include +#include #include #include #include #include -#include -#include -#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/AccountNamespace.cpp b/src/xrpld/rpc/handlers/AccountNamespace.cpp index 769da66fc..a4098cec8 100644 --- a/src/xrpld/rpc/handlers/AccountNamespace.cpp +++ b/src/xrpld/rpc/handlers/AccountNamespace.cpp @@ -18,17 +18,17 @@ //============================================================================== #include -#include #include +#include +#include +#include +#include #include #include #include #include #include #include -#include -#include -#include #include #include diff --git a/src/xrpld/rpc/handlers/AccountObjects.cpp b/src/xrpld/rpc/handlers/AccountObjects.cpp index 7fc1aa042..ed914b08f 100644 --- a/src/xrpld/rpc/handlers/AccountObjects.cpp +++ b/src/xrpld/rpc/handlers/AccountObjects.cpp @@ -20,6 +20,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -27,9 +30,6 @@ #include #include #include -#include -#include -#include #include #include diff --git a/src/xrpld/rpc/handlers/AccountOffers.cpp b/src/xrpld/rpc/handlers/AccountOffers.cpp index 882041c55..3c4a44049 100644 --- a/src/xrpld/rpc/handlers/AccountOffers.cpp +++ b/src/xrpld/rpc/handlers/AccountOffers.cpp @@ -18,16 +18,16 @@ //============================================================================== #include -#include #include #include +#include +#include +#include +#include #include #include #include #include -#include -#include -#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/AccountTx.cpp b/src/xrpld/rpc/handlers/AccountTx.cpp index 75e312a74..3b9165eec 100644 --- a/src/xrpld/rpc/handlers/AccountTx.cpp +++ b/src/xrpld/rpc/handlers/AccountTx.cpp @@ -25,18 +25,18 @@ #include #include #include +#include +#include +#include +#include #include #include -#include #include #include #include #include #include #include -#include -#include -#include #include diff --git a/src/xrpld/rpc/handlers/BlackList.cpp b/src/xrpld/rpc/handlers/BlackList.cpp index 68a88c7ee..3e887ff73 100644 --- a/src/xrpld/rpc/handlers/BlackList.cpp +++ b/src/xrpld/rpc/handlers/BlackList.cpp @@ -18,9 +18,9 @@ //============================================================================== #include +#include #include #include -#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/BookOffers.cpp b/src/xrpld/rpc/handlers/BookOffers.cpp index 19febe656..6126913a5 100644 --- a/src/xrpld/rpc/handlers/BookOffers.cpp +++ b/src/xrpld/rpc/handlers/BookOffers.cpp @@ -19,16 +19,16 @@ #include #include -#include #include +#include +#include +#include +#include #include #include #include #include #include -#include -#include -#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/CanDelete.cpp b/src/xrpld/rpc/handlers/CanDelete.cpp index 4f0da11f3..db9fdf7c5 100644 --- a/src/xrpld/rpc/handlers/CanDelete.cpp +++ b/src/xrpld/rpc/handlers/CanDelete.cpp @@ -21,10 +21,10 @@ #include #include #include +#include #include #include #include -#include #include #include diff --git a/src/xrpld/rpc/handlers/Catalogue.cpp b/src/xrpld/rpc/handlers/Catalogue.cpp index abe386597..57a59550d 100644 --- a/src/xrpld/rpc/handlers/Catalogue.cpp +++ b/src/xrpld/rpc/handlers/Catalogue.cpp @@ -22,6 +22,12 @@ #include #include #include +#include +#include +#include +#include +#include +#include #include #include #include @@ -29,12 +35,6 @@ #include #include #include -#include -#include -#include -#include -#include -#include #include #include diff --git a/src/xrpld/rpc/handlers/Connect.cpp b/src/xrpld/rpc/handlers/Connect.cpp index ac6a0bc0d..dadf0a051 100644 --- a/src/xrpld/rpc/handlers/Connect.cpp +++ b/src/xrpld/rpc/handlers/Connect.cpp @@ -20,12 +20,12 @@ #include #include #include +#include +#include #include #include #include #include -#include -#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/ConsensusInfo.cpp b/src/xrpld/rpc/handlers/ConsensusInfo.cpp index 2f26b6da7..42fbb60ba 100644 --- a/src/xrpld/rpc/handlers/ConsensusInfo.cpp +++ b/src/xrpld/rpc/handlers/ConsensusInfo.cpp @@ -19,11 +19,11 @@ #include #include +#include #include #include #include #include -#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/CrawlShards.cpp b/src/xrpld/rpc/handlers/CrawlShards.cpp index 392e1afb8..f586d7504 100644 --- a/src/xrpld/rpc/handlers/CrawlShards.cpp +++ b/src/xrpld/rpc/handlers/CrawlShards.cpp @@ -18,14 +18,14 @@ //============================================================================== #include -#include #include #include +#include +#include #include #include #include #include -#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/DepositAuthorized.cpp b/src/xrpld/rpc/handlers/DepositAuthorized.cpp index cdd19b33d..0efa58462 100644 --- a/src/xrpld/rpc/handlers/DepositAuthorized.cpp +++ b/src/xrpld/rpc/handlers/DepositAuthorized.cpp @@ -18,12 +18,12 @@ //============================================================================== #include +#include +#include #include #include #include #include -#include -#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/DownloadShard.cpp b/src/xrpld/rpc/handlers/DownloadShard.cpp index 460820607..1ec12e0fa 100644 --- a/src/xrpld/rpc/handlers/DownloadShard.cpp +++ b/src/xrpld/rpc/handlers/DownloadShard.cpp @@ -18,14 +18,14 @@ //============================================================================== #include -#include #include -#include -#include -#include #include #include #include +#include +#include +#include +#include #include diff --git a/src/xrpld/rpc/handlers/Feature1.cpp b/src/xrpld/rpc/handlers/Feature1.cpp index c7f658e88..d4499f120 100644 --- a/src/xrpld/rpc/handlers/Feature1.cpp +++ b/src/xrpld/rpc/handlers/Feature1.cpp @@ -20,11 +20,11 @@ #include #include #include +#include #include #include #include #include -#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/Fee1.cpp b/src/xrpld/rpc/handlers/Fee1.cpp index 4421bb423..e69307e90 100644 --- a/src/xrpld/rpc/handlers/Fee1.cpp +++ b/src/xrpld/rpc/handlers/Fee1.cpp @@ -22,12 +22,12 @@ #include #include #include +#include +#include #include #include #include #include -#include -#include namespace ripple { inline std::optional diff --git a/src/xrpld/rpc/handlers/FetchInfo.cpp b/src/xrpld/rpc/handlers/FetchInfo.cpp index 0c079948b..113ae78a3 100644 --- a/src/xrpld/rpc/handlers/FetchInfo.cpp +++ b/src/xrpld/rpc/handlers/FetchInfo.cpp @@ -19,11 +19,11 @@ #include #include +#include #include #include #include #include -#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/GatewayBalances.cpp b/src/xrpld/rpc/handlers/GatewayBalances.cpp index 31973b140..8fd13d472 100644 --- a/src/xrpld/rpc/handlers/GatewayBalances.cpp +++ b/src/xrpld/rpc/handlers/GatewayBalances.cpp @@ -20,14 +20,14 @@ #include #include #include +#include +#include #include #include #include #include #include #include -#include -#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/GetAggregatePrice.cpp b/src/xrpld/rpc/handlers/GetAggregatePrice.cpp index e314b445f..7467b94b6 100644 --- a/src/xrpld/rpc/handlers/GetAggregatePrice.cpp +++ b/src/xrpld/rpc/handlers/GetAggregatePrice.cpp @@ -19,12 +19,12 @@ #include #include -#include #include -#include -#include #include #include +#include +#include +#include #include #include diff --git a/src/xrpld/rpc/handlers/GetCounts.cpp b/src/xrpld/rpc/handlers/GetCounts.cpp index f9d480e10..0a2327e11 100644 --- a/src/xrpld/rpc/handlers/GetCounts.cpp +++ b/src/xrpld/rpc/handlers/GetCounts.cpp @@ -23,16 +23,16 @@ #include #include #include -#include -#include #include #include #include +#include +#include +#include +#include #include #include #include -#include -#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/LedgerAccept.cpp b/src/xrpld/rpc/handlers/LedgerAccept.cpp index 50e6ab4ed..742a84fbb 100644 --- a/src/xrpld/rpc/handlers/LedgerAccept.cpp +++ b/src/xrpld/rpc/handlers/LedgerAccept.cpp @@ -21,11 +21,11 @@ #include #include #include +#include #include #include #include #include -#include #include diff --git a/src/xrpld/rpc/handlers/LedgerCleanerHandler.cpp b/src/xrpld/rpc/handlers/LedgerCleanerHandler.cpp index df557dcf6..48f024c05 100644 --- a/src/xrpld/rpc/handlers/LedgerCleanerHandler.cpp +++ b/src/xrpld/rpc/handlers/LedgerCleanerHandler.cpp @@ -19,9 +19,9 @@ #include #include -#include #include #include +#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/LedgerClosed.cpp b/src/xrpld/rpc/handlers/LedgerClosed.cpp index 49cf2eeaa..9bc9315f6 100644 --- a/src/xrpld/rpc/handlers/LedgerClosed.cpp +++ b/src/xrpld/rpc/handlers/LedgerClosed.cpp @@ -19,9 +19,9 @@ #include #include +#include #include #include -#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/LedgerCurrent.cpp b/src/xrpld/rpc/handlers/LedgerCurrent.cpp index 0fb8a61cd..7f1d83c17 100644 --- a/src/xrpld/rpc/handlers/LedgerCurrent.cpp +++ b/src/xrpld/rpc/handlers/LedgerCurrent.cpp @@ -19,10 +19,10 @@ #include #include +#include #include #include #include -#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/LedgerData.cpp b/src/xrpld/rpc/handlers/LedgerData.cpp index 07a8a23aa..ad26b83b4 100644 --- a/src/xrpld/rpc/handlers/LedgerData.cpp +++ b/src/xrpld/rpc/handlers/LedgerData.cpp @@ -19,14 +19,14 @@ #include #include -#include -#include -#include #include #include #include #include #include +#include +#include +#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/LedgerEntry.cpp b/src/xrpld/rpc/handlers/LedgerEntry.cpp index 6f8498eeb..5da335d86 100644 --- a/src/xrpld/rpc/handlers/LedgerEntry.cpp +++ b/src/xrpld/rpc/handlers/LedgerEntry.cpp @@ -18,20 +18,20 @@ //============================================================================== #include +#include +#include +#include +#include #include #include #include #include -#include #include #include #include #include #include #include -#include -#include -#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/LedgerHandler.cpp b/src/xrpld/rpc/handlers/LedgerHandler.cpp index 55dd8cd6c..1ea9220c9 100644 --- a/src/xrpld/rpc/handlers/LedgerHandler.cpp +++ b/src/xrpld/rpc/handlers/LedgerHandler.cpp @@ -20,13 +20,13 @@ #include #include #include +#include +#include +#include #include #include #include #include -#include -#include -#include namespace ripple { namespace RPC { diff --git a/src/xrpld/rpc/handlers/LedgerHandler.h b/src/xrpld/rpc/handlers/LedgerHandler.h index 0f9774799..0a1ba2b42 100644 --- a/src/xrpld/rpc/handlers/LedgerHandler.h +++ b/src/xrpld/rpc/handlers/LedgerHandler.h @@ -23,14 +23,14 @@ #include #include #include -#include #include -#include #include #include #include #include #include +#include +#include namespace Json { class Object; diff --git a/src/xrpld/rpc/handlers/LedgerHeader.cpp b/src/xrpld/rpc/handlers/LedgerHeader.cpp index 3296c0a27..b73ee260d 100644 --- a/src/xrpld/rpc/handlers/LedgerHeader.cpp +++ b/src/xrpld/rpc/handlers/LedgerHeader.cpp @@ -18,10 +18,10 @@ //============================================================================== #include -#include #include -#include #include +#include +#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/LedgerRequest.cpp b/src/xrpld/rpc/handlers/LedgerRequest.cpp index f61048e97..8f79bb04f 100644 --- a/src/xrpld/rpc/handlers/LedgerRequest.cpp +++ b/src/xrpld/rpc/handlers/LedgerRequest.cpp @@ -21,13 +21,13 @@ #include #include #include +#include +#include +#include #include #include #include #include -#include -#include -#include #include namespace ripple { diff --git a/src/xrpld/rpc/handlers/LogLevel.cpp b/src/xrpld/rpc/handlers/LogLevel.cpp index 7e27385b0..bf0a0e1e2 100644 --- a/src/xrpld/rpc/handlers/LogLevel.cpp +++ b/src/xrpld/rpc/handlers/LogLevel.cpp @@ -18,12 +18,12 @@ //============================================================================== #include +#include #include #include #include #include #include -#include #include namespace ripple { diff --git a/src/xrpld/rpc/handlers/LogRotate.cpp b/src/xrpld/rpc/handlers/LogRotate.cpp index 47fa7a289..b7a887b0e 100644 --- a/src/xrpld/rpc/handlers/LogRotate.cpp +++ b/src/xrpld/rpc/handlers/LogRotate.cpp @@ -18,9 +18,9 @@ //============================================================================== #include -#include #include #include +#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/Manifest.cpp b/src/xrpld/rpc/handlers/Manifest.cpp index 58325412c..700d6ab39 100644 --- a/src/xrpld/rpc/handlers/Manifest.cpp +++ b/src/xrpld/rpc/handlers/Manifest.cpp @@ -18,12 +18,12 @@ //============================================================================== #include +#include #include #include #include #include #include -#include namespace ripple { Json::Value diff --git a/src/xrpld/rpc/handlers/NFTOffers.cpp b/src/xrpld/rpc/handlers/NFTOffers.cpp index fbb8c7449..bffb3dfbb 100644 --- a/src/xrpld/rpc/handlers/NFTOffers.cpp +++ b/src/xrpld/rpc/handlers/NFTOffers.cpp @@ -18,16 +18,16 @@ //============================================================================== #include -#include #include #include +#include +#include +#include +#include #include #include #include #include -#include -#include -#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/NoRippleCheck.cpp b/src/xrpld/rpc/handlers/NoRippleCheck.cpp index 752edc92a..94830a4f3 100644 --- a/src/xrpld/rpc/handlers/NoRippleCheck.cpp +++ b/src/xrpld/rpc/handlers/NoRippleCheck.cpp @@ -21,13 +21,13 @@ #include #include #include +#include +#include +#include #include #include #include #include -#include -#include -#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/NodeToShard.cpp b/src/xrpld/rpc/handlers/NodeToShard.cpp index 10995ee9c..917086ab0 100644 --- a/src/xrpld/rpc/handlers/NodeToShard.cpp +++ b/src/xrpld/rpc/handlers/NodeToShard.cpp @@ -19,12 +19,12 @@ #include #include -#include #include +#include +#include #include #include #include -#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/OwnerInfo.cpp b/src/xrpld/rpc/handlers/OwnerInfo.cpp index dc066a8af..83bf8b0ef 100644 --- a/src/xrpld/rpc/handlers/OwnerInfo.cpp +++ b/src/xrpld/rpc/handlers/OwnerInfo.cpp @@ -19,12 +19,12 @@ #include #include +#include +#include #include #include #include #include -#include -#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/PathFind.cpp b/src/xrpld/rpc/handlers/PathFind.cpp index 2527dbba5..cab14f9b5 100644 --- a/src/xrpld/rpc/handlers/PathFind.cpp +++ b/src/xrpld/rpc/handlers/PathFind.cpp @@ -21,11 +21,11 @@ #include #include #include +#include #include #include #include #include -#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/PayChanClaim.cpp b/src/xrpld/rpc/handlers/PayChanClaim.cpp index d70811763..de2ac1835 100644 --- a/src/xrpld/rpc/handlers/PayChanClaim.cpp +++ b/src/xrpld/rpc/handlers/PayChanClaim.cpp @@ -18,17 +18,17 @@ //============================================================================== #include -#include #include +#include +#include +#include +#include #include #include #include #include #include #include -#include -#include -#include #include diff --git a/src/xrpld/rpc/handlers/Peers.cpp b/src/xrpld/rpc/handlers/Peers.cpp index a52afba65..718070ec9 100644 --- a/src/xrpld/rpc/handlers/Peers.cpp +++ b/src/xrpld/rpc/handlers/Peers.cpp @@ -21,10 +21,10 @@ #include #include #include +#include #include #include #include -#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/Ping.cpp b/src/xrpld/rpc/handlers/Ping.cpp index f2b0fa70f..cb0dabcb9 100644 --- a/src/xrpld/rpc/handlers/Ping.cpp +++ b/src/xrpld/rpc/handlers/Ping.cpp @@ -17,10 +17,10 @@ */ //============================================================================== -#include -#include #include #include +#include +#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/Print.cpp b/src/xrpld/rpc/handlers/Print.cpp index 860b05a2c..df5012408 100644 --- a/src/xrpld/rpc/handlers/Print.cpp +++ b/src/xrpld/rpc/handlers/Print.cpp @@ -18,10 +18,10 @@ //============================================================================== #include +#include #include #include #include -#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/Reservations.cpp b/src/xrpld/rpc/handlers/Reservations.cpp index 11d6bf7c5..57a8fb366 100644 --- a/src/xrpld/rpc/handlers/Reservations.cpp +++ b/src/xrpld/rpc/handlers/Reservations.cpp @@ -17,13 +17,13 @@ */ //============================================================================== +#include +#include #include #include #include #include #include -#include -#include #include #include diff --git a/src/xrpld/rpc/handlers/RipplePathFind.cpp b/src/xrpld/rpc/handlers/RipplePathFind.cpp index faf516b22..5e18a1210 100644 --- a/src/xrpld/rpc/handlers/RipplePathFind.cpp +++ b/src/xrpld/rpc/handlers/RipplePathFind.cpp @@ -19,11 +19,11 @@ #include #include -#include -#include #include #include #include +#include +#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/ServerDefinitions.cpp b/src/xrpld/rpc/handlers/ServerDefinitions.cpp index e69a1af91..4f00b6ec0 100644 --- a/src/xrpld/rpc/handlers/ServerDefinitions.cpp +++ b/src/xrpld/rpc/handlers/ServerDefinitions.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -31,7 +32,6 @@ #include #include #include -#include #include #include #include diff --git a/src/xrpld/rpc/handlers/ServerInfo.cpp b/src/xrpld/rpc/handlers/ServerInfo.cpp index 3b1d244a9..e1ed01554 100644 --- a/src/xrpld/rpc/handlers/ServerInfo.cpp +++ b/src/xrpld/rpc/handlers/ServerInfo.cpp @@ -20,6 +20,8 @@ #include #include #include +#include +#include #include #include #include @@ -29,8 +31,6 @@ #include #include #include -#include -#include #include diff --git a/src/xrpld/rpc/handlers/ServerState.cpp b/src/xrpld/rpc/handlers/ServerState.cpp index 340b8919f..ec4678323 100644 --- a/src/xrpld/rpc/handlers/ServerState.cpp +++ b/src/xrpld/rpc/handlers/ServerState.cpp @@ -18,12 +18,12 @@ //============================================================================== #include -#include -#include -#include #include #include #include +#include +#include +#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/SignFor.cpp b/src/xrpld/rpc/handlers/SignFor.cpp index 05020b3c5..da8ff869f 100644 --- a/src/xrpld/rpc/handlers/SignFor.cpp +++ b/src/xrpld/rpc/handlers/SignFor.cpp @@ -18,11 +18,11 @@ //============================================================================== #include +#include +#include #include #include #include -#include -#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/SignHandler.cpp b/src/xrpld/rpc/handlers/SignHandler.cpp index 59ee75081..ed634161f 100644 --- a/src/xrpld/rpc/handlers/SignHandler.cpp +++ b/src/xrpld/rpc/handlers/SignHandler.cpp @@ -18,10 +18,10 @@ //============================================================================== #include -#include -#include #include #include +#include +#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/Stop.cpp b/src/xrpld/rpc/handlers/Stop.cpp index 89562bd91..ea37a1aaa 100644 --- a/src/xrpld/rpc/handlers/Stop.cpp +++ b/src/xrpld/rpc/handlers/Stop.cpp @@ -18,8 +18,8 @@ //============================================================================== #include -#include #include +#include #include diff --git a/src/xrpld/rpc/handlers/Submit.cpp b/src/xrpld/rpc/handlers/Submit.cpp index 011c0ed46..06a4cb5f6 100644 --- a/src/xrpld/rpc/handlers/Submit.cpp +++ b/src/xrpld/rpc/handlers/Submit.cpp @@ -22,13 +22,13 @@ #include #include #include -#include -#include -#include #include #include #include #include +#include +#include +#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/SubmitMultiSigned.cpp b/src/xrpld/rpc/handlers/SubmitMultiSigned.cpp index 2058ff660..9949d3e32 100644 --- a/src/xrpld/rpc/handlers/SubmitMultiSigned.cpp +++ b/src/xrpld/rpc/handlers/SubmitMultiSigned.cpp @@ -18,11 +18,11 @@ //============================================================================== #include +#include +#include #include #include #include -#include -#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/Subscribe.cpp b/src/xrpld/rpc/handlers/Subscribe.cpp index 507c5d71b..c9283f198 100644 --- a/src/xrpld/rpc/handlers/Subscribe.cpp +++ b/src/xrpld/rpc/handlers/Subscribe.cpp @@ -20,17 +20,17 @@ #include #include #include -#include #include #include -#include -#include -#include -#include #include #include #include #include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/TransactionEntry.cpp b/src/xrpld/rpc/handlers/TransactionEntry.cpp index e12aee5fa..e81e04345 100644 --- a/src/xrpld/rpc/handlers/TransactionEntry.cpp +++ b/src/xrpld/rpc/handlers/TransactionEntry.cpp @@ -21,9 +21,9 @@ #include #include #include -#include #include #include +#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/Tx.cpp b/src/xrpld/rpc/handlers/Tx.cpp index d94530fda..c736287ff 100644 --- a/src/xrpld/rpc/handlers/Tx.cpp +++ b/src/xrpld/rpc/handlers/Tx.cpp @@ -23,16 +23,16 @@ #include #include #include -#include -#include -#include -#include -#include #include #include #include #include #include +#include +#include +#include +#include +#include #include #include diff --git a/src/xrpld/rpc/handlers/TxHistory.cpp b/src/xrpld/rpc/handlers/TxHistory.cpp index b0cdec2b0..de86b1825 100644 --- a/src/xrpld/rpc/handlers/TxHistory.cpp +++ b/src/xrpld/rpc/handlers/TxHistory.cpp @@ -25,13 +25,13 @@ #include #include #include +#include +#include +#include #include #include #include #include -#include -#include -#include #include namespace ripple { diff --git a/src/xrpld/rpc/handlers/TxReduceRelay.cpp b/src/xrpld/rpc/handlers/TxReduceRelay.cpp index 80294339b..d8c21b3fa 100644 --- a/src/xrpld/rpc/handlers/TxReduceRelay.cpp +++ b/src/xrpld/rpc/handlers/TxReduceRelay.cpp @@ -18,9 +18,9 @@ //============================================================================== #include -#include #include #include +#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/UnlList.cpp b/src/xrpld/rpc/handlers/UnlList.cpp index 2462447e9..78bd3f14e 100644 --- a/src/xrpld/rpc/handlers/UnlList.cpp +++ b/src/xrpld/rpc/handlers/UnlList.cpp @@ -19,10 +19,10 @@ #include #include +#include #include #include #include -#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/Unsubscribe.cpp b/src/xrpld/rpc/handlers/Unsubscribe.cpp index 865482aab..99a252d18 100644 --- a/src/xrpld/rpc/handlers/Unsubscribe.cpp +++ b/src/xrpld/rpc/handlers/Unsubscribe.cpp @@ -18,14 +18,14 @@ //============================================================================== #include -#include -#include -#include -#include #include #include #include #include +#include +#include +#include +#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/ValidationCreate.cpp b/src/xrpld/rpc/handlers/ValidationCreate.cpp index ecda7a3c7..ce53f84d9 100644 --- a/src/xrpld/rpc/handlers/ValidationCreate.cpp +++ b/src/xrpld/rpc/handlers/ValidationCreate.cpp @@ -17,12 +17,12 @@ */ //============================================================================== +#include #include #include #include #include #include -#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/ValidatorInfo.cpp b/src/xrpld/rpc/handlers/ValidatorInfo.cpp index a27e876a5..d1a633719 100644 --- a/src/xrpld/rpc/handlers/ValidatorInfo.cpp +++ b/src/xrpld/rpc/handlers/ValidatorInfo.cpp @@ -19,11 +19,11 @@ #include #include +#include #include #include #include #include -#include namespace ripple { Json::Value diff --git a/src/xrpld/rpc/handlers/ValidatorListSites.cpp b/src/xrpld/rpc/handlers/ValidatorListSites.cpp index 57a5c1d2b..902c37376 100644 --- a/src/xrpld/rpc/handlers/ValidatorListSites.cpp +++ b/src/xrpld/rpc/handlers/ValidatorListSites.cpp @@ -19,9 +19,9 @@ #include #include +#include #include #include -#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/Validators.cpp b/src/xrpld/rpc/handlers/Validators.cpp index eb9804fd8..4048e8962 100644 --- a/src/xrpld/rpc/handlers/Validators.cpp +++ b/src/xrpld/rpc/handlers/Validators.cpp @@ -19,9 +19,9 @@ #include #include +#include #include #include -#include namespace ripple { diff --git a/src/xrpld/rpc/handlers/WalletPropose.cpp b/src/xrpld/rpc/handlers/WalletPropose.cpp index 8f6e97094..f3300b9ed 100644 --- a/src/xrpld/rpc/handlers/WalletPropose.cpp +++ b/src/xrpld/rpc/handlers/WalletPropose.cpp @@ -17,6 +17,9 @@ */ //============================================================================== +#include +#include +#include #include #include #include @@ -25,9 +28,6 @@ #include #include #include -#include -#include -#include #include #include #include diff --git a/src/xrpld/shamap/Family.h b/src/xrpld/shamap/Family.h index 82ddcd46a..730f83483 100644 --- a/src/xrpld/shamap/Family.h +++ b/src/xrpld/shamap/Family.h @@ -20,11 +20,11 @@ #ifndef RIPPLE_SHAMAP_FAMILY_H_INCLUDED #define RIPPLE_SHAMAP_FAMILY_H_INCLUDED -#include -#include #include #include #include +#include +#include #include namespace ripple { diff --git a/src/xrpld/shamap/SHAMap.h b/src/xrpld/shamap/SHAMap.h index f10552d57..8e02b41a7 100644 --- a/src/xrpld/shamap/SHAMap.h +++ b/src/xrpld/shamap/SHAMap.h @@ -20,8 +20,6 @@ #ifndef RIPPLE_SHAMAP_SHAMAP_H_INCLUDED #define RIPPLE_SHAMAP_SHAMAP_H_INCLUDED -#include -#include #include #include #include @@ -33,6 +31,8 @@ #include #include #include +#include +#include #include #include #include diff --git a/src/xrpld/shamap/SHAMapAccountStateLeafNode.h b/src/xrpld/shamap/SHAMapAccountStateLeafNode.h index e41fff65f..842c1092d 100644 --- a/src/xrpld/shamap/SHAMapAccountStateLeafNode.h +++ b/src/xrpld/shamap/SHAMapAccountStateLeafNode.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_SHAMAP_SHAMAPACCOUNTSTATELEAFNODE_H_INCLUDED #define RIPPLE_SHAMAP_SHAMAPACCOUNTSTATELEAFNODE_H_INCLUDED -#include -#include -#include #include #include #include +#include +#include +#include namespace ripple { diff --git a/src/xrpld/shamap/SHAMapInnerNode.h b/src/xrpld/shamap/SHAMapInnerNode.h index 45f7550df..d2791915c 100644 --- a/src/xrpld/shamap/SHAMapInnerNode.h +++ b/src/xrpld/shamap/SHAMapInnerNode.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_SHAMAP_SHAMAPINNERNODE_H_INCLUDED #define RIPPLE_SHAMAP_SHAMAPINNERNODE_H_INCLUDED -#include -#include #include #include #include #include +#include +#include #include #include diff --git a/src/xrpld/shamap/SHAMapMissingNode.h b/src/xrpld/shamap/SHAMapMissingNode.h index 3c6cf7445..50aa193b2 100644 --- a/src/xrpld/shamap/SHAMapMissingNode.h +++ b/src/xrpld/shamap/SHAMapMissingNode.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_SHAMAP_SHAMAPMISSINGNODE_H_INCLUDED #define RIPPLE_SHAMAP_SHAMAPMISSINGNODE_H_INCLUDED -#include #include +#include #include #include #include diff --git a/src/xrpld/shamap/SHAMapTreeNode.h b/src/xrpld/shamap/SHAMapTreeNode.h index 0d1064844..b3aad6491 100644 --- a/src/xrpld/shamap/SHAMapTreeNode.h +++ b/src/xrpld/shamap/SHAMapTreeNode.h @@ -20,13 +20,13 @@ #ifndef RIPPLE_SHAMAP_SHAMAPTREENODE_H_INCLUDED #define RIPPLE_SHAMAP_SHAMAPTREENODE_H_INCLUDED +#include +#include #include #include #include #include #include -#include -#include #include #include diff --git a/src/xrpld/shamap/SHAMapTxLeafNode.h b/src/xrpld/shamap/SHAMapTxLeafNode.h index d886849d3..f4d3f21e9 100644 --- a/src/xrpld/shamap/SHAMapTxLeafNode.h +++ b/src/xrpld/shamap/SHAMapTxLeafNode.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_SHAMAP_SHAMAPTXLEAFNODE_H_INCLUDED #define RIPPLE_SHAMAP_SHAMAPTXLEAFNODE_H_INCLUDED -#include -#include -#include #include #include #include +#include +#include +#include namespace ripple { diff --git a/src/xrpld/shamap/SHAMapTxPlusMetaLeafNode.h b/src/xrpld/shamap/SHAMapTxPlusMetaLeafNode.h index e14c56046..6ea55f4ac 100644 --- a/src/xrpld/shamap/SHAMapTxPlusMetaLeafNode.h +++ b/src/xrpld/shamap/SHAMapTxPlusMetaLeafNode.h @@ -20,12 +20,12 @@ #ifndef RIPPLE_SHAMAP_SHAMAPLEAFTXPLUSMETANODE_H_INCLUDED #define RIPPLE_SHAMAP_SHAMAPLEAFTXPLUSMETANODE_H_INCLUDED -#include -#include -#include #include #include #include +#include +#include +#include namespace ripple { diff --git a/src/xrpld/shamap/detail/SHAMap.cpp b/src/xrpld/shamap/detail/SHAMap.cpp index 5d133bb2d..7485673da 100644 --- a/src/xrpld/shamap/detail/SHAMap.cpp +++ b/src/xrpld/shamap/detail/SHAMap.cpp @@ -17,13 +17,13 @@ */ //============================================================================== -#include #include #include #include #include #include #include +#include namespace ripple { diff --git a/src/xrpld/shamap/detail/SHAMapDelta.cpp b/src/xrpld/shamap/detail/SHAMapDelta.cpp index badcf4f2f..0dcb861a6 100644 --- a/src/xrpld/shamap/detail/SHAMapDelta.cpp +++ b/src/xrpld/shamap/detail/SHAMapDelta.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include #include +#include #include #include diff --git a/src/xrpld/shamap/detail/SHAMapInnerNode.cpp b/src/xrpld/shamap/detail/SHAMapInnerNode.cpp index 0094ea917..99155a640 100644 --- a/src/xrpld/shamap/detail/SHAMapInnerNode.cpp +++ b/src/xrpld/shamap/detail/SHAMapInnerNode.cpp @@ -19,6 +19,8 @@ #include +#include +#include #include #include #include @@ -26,8 +28,6 @@ #include #include #include -#include -#include #include #include diff --git a/src/xrpld/shamap/detail/SHAMapLeafNode.cpp b/src/xrpld/shamap/detail/SHAMapLeafNode.cpp index 6fb446c5a..972919a9b 100644 --- a/src/xrpld/shamap/detail/SHAMapLeafNode.cpp +++ b/src/xrpld/shamap/detail/SHAMapLeafNode.cpp @@ -17,9 +17,9 @@ */ //============================================================================== +#include #include #include -#include namespace ripple { diff --git a/src/xrpld/shamap/detail/SHAMapNodeID.cpp b/src/xrpld/shamap/detail/SHAMapNodeID.cpp index c7b2fffb6..5cbd095e7 100644 --- a/src/xrpld/shamap/detail/SHAMapNodeID.cpp +++ b/src/xrpld/shamap/detail/SHAMapNodeID.cpp @@ -17,11 +17,11 @@ */ //============================================================================== +#include +#include #include #include #include -#include -#include #include namespace ripple { diff --git a/src/xrpld/shamap/detail/SHAMapSync.cpp b/src/xrpld/shamap/detail/SHAMapSync.cpp index 99838a207..02d548be2 100644 --- a/src/xrpld/shamap/detail/SHAMapSync.cpp +++ b/src/xrpld/shamap/detail/SHAMapSync.cpp @@ -17,9 +17,9 @@ */ //============================================================================== -#include #include #include +#include namespace ripple { diff --git a/src/xrpld/shamap/detail/SHAMapTreeNode.cpp b/src/xrpld/shamap/detail/SHAMapTreeNode.cpp index 307b17a4e..fe5b5377e 100644 --- a/src/xrpld/shamap/detail/SHAMapTreeNode.cpp +++ b/src/xrpld/shamap/detail/SHAMapTreeNode.cpp @@ -17,6 +17,12 @@ */ //============================================================================== +#include +#include +#include +#include +#include +#include #include #include #include @@ -24,12 +30,6 @@ #include #include #include -#include -#include -#include -#include -#include -#include #include #include diff --git a/src/xrpld/shamap/detail/TaggedPointer.ipp b/src/xrpld/shamap/detail/TaggedPointer.ipp index ca1efc857..6770b5302 100644 --- a/src/xrpld/shamap/detail/TaggedPointer.ipp +++ b/src/xrpld/shamap/detail/TaggedPointer.ipp @@ -17,9 +17,9 @@ */ //============================================================================== -#include #include #include +#include #include #include