diff --git a/Builds/CMake/RippledCore.cmake b/Builds/CMake/RippledCore.cmake index bd2b2412f4..40b1df1997 100644 --- a/Builds/CMake/RippledCore.cmake +++ b/Builds/CMake/RippledCore.cmake @@ -278,10 +278,6 @@ install ( src/ripple/beast/crypto/ripemd.h src/ripple/beast/crypto/sha2.h DESTINATION include/ripple/beast/crypto) -install ( - FILES - src/ripple/beast/cxx17/type_traits.h - DESTINATION include/ripple/beast/cxx17) install ( FILES src/ripple/beast/hash/endian.h diff --git a/src/ripple/basics/XRPAmount.h b/src/ripple/basics/XRPAmount.h index a9611814d8..e8f26266e9 100644 --- a/src/ripple/basics/XRPAmount.h +++ b/src/ripple/basics/XRPAmount.h @@ -22,7 +22,6 @@ #include #include -#include #include #include @@ -32,6 +31,7 @@ #include #include +#include namespace ripple { diff --git a/src/ripple/basics/base_uint.h b/src/ripple/basics/base_uint.h index 56c4266584..bc23a58251 100644 --- a/src/ripple/basics/base_uint.h +++ b/src/ripple/basics/base_uint.h @@ -27,7 +27,6 @@ #include #include -#include #include #include #include diff --git a/src/ripple/basics/random.h b/src/ripple/basics/random.h index 7ea8972eab..3af8be5410 100644 --- a/src/ripple/basics/random.h +++ b/src/ripple/basics/random.h @@ -20,7 +20,6 @@ #ifndef RIPPLE_BASICS_RANDOM_H_INCLUDED #define RIPPLE_BASICS_RANDOM_H_INCLUDED -#include // #include #include #include @@ -29,6 +28,7 @@ #include #include #include +#include namespace ripple { diff --git a/src/ripple/basics/safe_cast.h b/src/ripple/basics/safe_cast.h index d4bbefec30..e52bceca75 100644 --- a/src/ripple/basics/safe_cast.h +++ b/src/ripple/basics/safe_cast.h @@ -20,7 +20,6 @@ #ifndef RIPPLE_BASICS_SAFE_CAST_H_INCLUDED #define RIPPLE_BASICS_SAFE_CAST_H_INCLUDED -#include #include namespace ripple { diff --git a/src/ripple/beast/container/detail/aged_ordered_container.h b/src/ripple/beast/container/detail/aged_ordered_container.h index a6cafa8973..ed6585dd50 100644 --- a/src/ripple/beast/container/detail/aged_ordered_container.h +++ b/src/ripple/beast/container/detail/aged_ordered_container.h @@ -25,7 +25,6 @@ #include #include #include -#include // #include #include #include @@ -34,6 +33,7 @@ #include #include #include +#include #include namespace beast { diff --git a/src/ripple/beast/cxx17/type_traits.h b/src/ripple/beast/cxx17/type_traits.h deleted file mode 100644 index 0dfeee45bd..0000000000 --- a/src/ripple/beast/cxx17/type_traits.h +++ /dev/null @@ -1,41 +0,0 @@ -//------------------------------------------------------------------------------ -/* - This file is part of Beast: https://github.com/vinniefalco/Beast - Copyright 2013, Vinnie Falco - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ -//============================================================================== - -#ifndef BEAST_CXX17_TYPE_TRAITS_H_INCLUDED -#define BEAST_CXX17_TYPE_TRAITS_H_INCLUDED - -#include -#include -#include - -#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 6000 - -namespace std { - -template -struct _LIBCPP_TEMPLATE_VIS is_invocable_r - : integral_constant::value> -{ -}; - -} // namespace std - -#endif - -#endif diff --git a/src/test/jtx/Env.h b/src/test/jtx/Env.h index f2934bb500..57b68b1187 100644 --- a/src/test/jtx/Env.h +++ b/src/test/jtx/Env.h @@ -26,7 +26,6 @@ #include #include #include -#include // #include #include #include @@ -50,6 +49,7 @@ #include #include #include +#include #include #include #include