ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove a pre-C++17 workaround for std::is_invocable_r

Browse Source
This commit is contained in:
Nik Bougalis
2020-11-25 22:49:18 -08:00
parent bec6c626d8
commit 9bd6b249ce
8 changed files with 4 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Builds/CMake/RippledCore.cmake
View File

@@ -278,10 +278,6 @@ install (
src/ripple/beast/crypto/ripemd.h src/ripple/beast/crypto/ripemd.h
src/ripple/beast/crypto/sha2.h src/ripple/beast/crypto/sha2.h
DESTINATION include/ripple/beast/crypto) DESTINATION include/ripple/beast/crypto)
install (
FILES
src/ripple/beast/cxx17/type_traits.h
DESTINATION include/ripple/beast/cxx17)
install ( install (
FILES FILES
src/ripple/beast/hash/endian.h src/ripple/beast/hash/endian.h

2
src/ripple/basics/XRPAmount.h
View File

@@ -22,7 +22,6 @@
#include <ripple/basics/contract.h> #include <ripple/basics/contract.h>
#include <ripple/basics/safe_cast.h> #include <ripple/basics/safe_cast.h>
#include <ripple/beast/cxx17/type_traits.h>
#include <ripple/beast/utility/Zero.h> #include <ripple/beast/utility/Zero.h>
#include <ripple/json/json_value.h> #include <ripple/json/json_value.h>
@@ -32,6 +31,7 @@
#include <cstdint> #include <cstdint>
#include <string> #include <string>
#include <type_traits>
namespace ripple { namespace ripple {

1
src/ripple/basics/base_uint.h
View File

@@ -27,7 +27,6 @@
#include <ripple/basics/hardened_hash.h> #include <ripple/basics/hardened_hash.h>
#include <ripple/basics/strHex.h> #include <ripple/basics/strHex.h>
#include <ripple/beast/cxx17/type_traits.h>
#include <ripple/beast/utility/Zero.h> #include <ripple/beast/utility/Zero.h>
#include <boost/endian/conversion.hpp> #include <boost/endian/conversion.hpp>
#include <boost/functional/hash.hpp> #include <boost/functional/hash.hpp>

2
src/ripple/basics/random.h
View File

@@ -20,7 +20,6 @@
#ifndef RIPPLE_BASICS_RANDOM_H_INCLUDED #ifndef RIPPLE_BASICS_RANDOM_H_INCLUDED
#define RIPPLE_BASICS_RANDOM_H_INCLUDED #define RIPPLE_BASICS_RANDOM_H_INCLUDED
#include <ripple/beast/cxx17/type_traits.h> // <type_traits>
#include <ripple/beast/xor_shift_engine.h> #include <ripple/beast/xor_shift_engine.h>
#include <cassert> #include <cassert>
#include <cstddef> #include <cstddef>
@@ -29,6 +28,7 @@
#include <limits> #include <limits>
#include <mutex> #include <mutex>
#include <random> #include <random>
#include <type_traits>
namespace ripple { namespace ripple {

1
src/ripple/basics/safe_cast.h
View File

@@ -20,7 +20,6 @@
#ifndef RIPPLE_BASICS_SAFE_CAST_H_INCLUDED #ifndef RIPPLE_BASICS_SAFE_CAST_H_INCLUDED
#define RIPPLE_BASICS_SAFE_CAST_H_INCLUDED #define RIPPLE_BASICS_SAFE_CAST_H_INCLUDED
#include <ripple/beast/cxx17/type_traits.h>
#include <type_traits> #include <type_traits>
namespace ripple { namespace ripple {

2
src/ripple/beast/container/detail/aged_ordered_container.h
View File

@@ -25,7 +25,6 @@
#include <ripple/beast/container/detail/aged_associative_container.h> #include <ripple/beast/container/detail/aged_associative_container.h>
#include <ripple/beast/container/detail/aged_container_iterator.h> #include <ripple/beast/container/detail/aged_container_iterator.h>
#include <ripple/beast/container/detail/empty_base_optimization.h> #include <ripple/beast/container/detail/empty_base_optimization.h>
#include <ripple/beast/cxx17/type_traits.h> // <type_traits>
#include <boost/intrusive/list.hpp> #include <boost/intrusive/list.hpp>
#include <boost/intrusive/set.hpp> #include <boost/intrusive/set.hpp>
#include <boost/version.hpp> #include <boost/version.hpp>
@@ -34,6 +33,7 @@
#include <initializer_list> #include <initializer_list>
#include <iterator> #include <iterator>
#include <memory> #include <memory>
#include <type_traits>
#include <utility> #include <utility>
namespace beast { namespace beast {

41
src/ripple/beast/cxx17/type_traits.h
View File

@@ -1,41 +0,0 @@
//------------------------------------------------------------------------------
/*
This file is part of Beast: https://github.com/vinniefalco/Beast
Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
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 <tuple>
#include <type_traits>
#include <utility>
#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 6000
namespace std {
template <class _Ret, class _Fn, class... _Args>
struct _LIBCPP_TEMPLATE_VIS is_invocable_r
: integral_constant<bool, __invokable_r<_Ret, _Fn, _Args...>::value>
{
};
} // namespace std
#endif
#endif

2
src/test/jtx/Env.h
View File

@@ -26,7 +26,6 @@
#include <ripple/app/paths/Pathfinder.h> #include <ripple/app/paths/Pathfinder.h>
#include <ripple/basics/Log.h> #include <ripple/basics/Log.h>
#include <ripple/basics/chrono.h> #include <ripple/basics/chrono.h>
#include <ripple/beast/cxx17/type_traits.h> // <type_traits>
#include <ripple/beast/utility/Journal.h> #include <ripple/beast/utility/Journal.h>
#include <ripple/core/Config.h> #include <ripple/core/Config.h>
#include <ripple/json/json_value.h> #include <ripple/json/json_value.h>
@@ -50,6 +49,7 @@
#include <test/jtx/tags.h> #include <test/jtx/tags.h>
#include <test/unit_test/SuiteJournal.h> #include <test/unit_test/SuiteJournal.h>
#include <tuple> #include <tuple>
#include <type_traits>
#include <unordered_map> #include <unordered_map>
#include <utility> #include <utility>
#include <vector> #include <vector>