ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

C++17 compatibility:

Browse Source 
* std::void_t
* std::bool_constant
This commit is contained in:
Vinnie Falco
2016-03-30 09:16:06 -04:00
parent 08171dad5e
commit 73ddda4651
4 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Builds/VisualStudio2015/RippleD.vcxproj
View File

@@ -299,7 +299,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\beast\beast\cxx14\type_traits.h">
<ClInclude Include="..\..\src\beast\beast\cxx17\type_traits.h">
</ClInclude>
<ClInclude Include="..\..\src\beast\beast\empty_base_optimization.h">
</ClInclude>

8
Builds/VisualStudio2015/RippleD.vcxproj.filters
View File

@@ -31,8 +31,8 @@
<Filter Include="beast\crypto\tests">
<UniqueIdentifier>{FF9CBE50-56A0-7B59-C99F-C873605C844B}</UniqueIdentifier>
</Filter>
<Filter Include="beast\cxx14">
<UniqueIdentifier>{A3DFF000-1717-AE18-DD13-75DC3A36F594}</UniqueIdentifier>
<Filter Include="beast\cxx17">
<UniqueIdentifier>{DED08E50-BA3F-9E32-7501-3B77F31A5C11}</UniqueIdentifier>
</Filter>
<Filter Include="beast\hash">
<UniqueIdentifier>{FE3C8FFD-FEE1-BDEA-DE7F-24A8DEDCAD20}</UniqueIdentifier>
@@ -612,8 +612,8 @@
<ClCompile Include="..\..\src\beast\beast\crypto\tests\beast_base64_test.cpp">
<Filter>beast\crypto\tests</Filter>
</ClCompile>
<ClInclude Include="..\..\src\beast\beast\cxx14\type_traits.h">
<Filter>beast\cxx14</Filter>
<ClInclude Include="..\..\src\beast\beast\cxx17\type_traits.h">
<Filter>beast\cxx17</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\beast\empty_base_optimization.h">
<Filter>beast</Filter>

16
src/beast/beast/cxx14/type_traits.h → src/beast/beast/cxx17/type_traits.h
View File

@@ -17,8 +17,8 @@
*/
//==============================================================================
#ifndef BEAST_CXX14_TYPE_TRAITS_H_INCLUDED
#define BEAST_CXX14_TYPE_TRAITS_H_INCLUDED
#ifndef BEAST_CXX17_TYPE_TRAITS_H_INCLUDED
#define BEAST_CXX17_TYPE_TRAITS_H_INCLUDED
#include <tuple>
#include <type_traits>
@@ -26,6 +26,16 @@
namespace std {
#ifndef _MSC_VER
template<class...>
using void_t = void;
template<bool B>
using bool_constant = std::integral_constant<bool, B>;
#endif
// Ideas from Howard Hinnant
//
// Specializations of is_constructible for pair and tuple which
@@ -41,6 +51,6 @@ struct is_constructible <pair <T, U>>
{
};
}
} // std
#endif

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

@@ -25,8 +25,6 @@
#include <ripple/beast/container/aged_container.h>
#include <beast/clock/abstract_clock.h>
#include <beast/empty_base_optimization.h>
#include <beast/empty_base_optimization.h>
#include <beast/cxx14/type_traits.h>
#include <boost/intrusive/list.hpp>
#include <boost/intrusive/set.hpp>
#include <boost/version.hpp>
@@ -35,7 +33,7 @@
#include <initializer_list>
#include <iterator>
#include <memory>
#include <type_traits>
#include <beast/cxx17/type_traits.h> // <type_traits>
#include <utility>
namespace beast {