diff --git a/Builds/VisualStudio2013/beast.vcxproj b/Builds/VisualStudio2013/beast.vcxproj index 95f484156b..2d2943b2bc 100644 --- a/Builds/VisualStudio2013/beast.vcxproj +++ b/Builds/VisualStudio2013/beast.vcxproj @@ -223,13 +223,10 @@ - - - diff --git a/Builds/VisualStudio2013/beast.vcxproj.filters b/Builds/VisualStudio2013/beast.vcxproj.filters index b57463e165..bb202a9deb 100644 --- a/Builds/VisualStudio2013/beast.vcxproj.filters +++ b/Builds/VisualStudio2013/beast.vcxproj.filters @@ -866,12 +866,6 @@ beast\type_traits - - beast\type_traits - - - beast\utility - beast\utility @@ -1140,9 +1134,6 @@ beast\threads - - beast\utility - beast diff --git a/beast/TypeTraits.h b/beast/TypeTraits.h index 6af5fedc1a..b790e9ada8 100644 --- a/beast/TypeTraits.h +++ b/beast/TypeTraits.h @@ -23,6 +23,5 @@ #include "type_traits/IntegralConstant.h" #include "type_traits/IsIntegral.h" #include "type_traits/IsSigned.h" -#include "type_traits/RemoveSigned.h" #endif diff --git a/beast/Utility.h b/beast/Utility.h index 6c9685343f..c214de92d8 100644 --- a/beast/Utility.h +++ b/beast/Utility.h @@ -20,9 +20,7 @@ #ifndef BEAST_UTILITY_H_INCLUDED #define BEAST_UTILITY_H_INCLUDED -#include "utility/BaseFromMember.h" #include "utility/Debug.h" -#include "utility/EnableIf.h" #include "utility/Error.h" #include "utility/Journal.h" #include "utility/LeakChecked.h" diff --git a/beast/crypto/Sha256.h b/beast/crypto/Sha256.h index a3f4c5c528..9f3c0d3e0f 100644 --- a/beast/crypto/Sha256.h +++ b/beast/crypto/Sha256.h @@ -22,7 +22,8 @@ #include "../Config.h" #include "../CStdInt.h" -#include "../FixedArray.h" + +#include //------------------------------------------------------------------------------ @@ -36,7 +37,7 @@ enum }; /** A container suitable for holding the resulting hash. */ -typedef FixedArray digest_type; +typedef std::array digest_type; namespace detail { struct Context @@ -85,7 +86,7 @@ public: digest_type& finish (digest_type& digest) { - finish (digest.c_array()); + finish (digest.data()); return digest; } diff --git a/beast/crypto/impl/Sha256.cpp b/beast/crypto/impl/Sha256.cpp index 7542c189d1..3eb1f57743 100644 --- a/beast/crypto/impl/Sha256.cpp +++ b/beast/crypto/impl/Sha256.cpp @@ -88,7 +88,7 @@ void* hash (void const* buffer, std::size_t bytes, void* digest) digest_type& hash (void const* buffer, std::size_t bytes, digest_type& digest) { - hash (buffer, bytes, digest.c_array()); + hash (buffer, bytes, digest.data()); return digest; } diff --git a/beast/type_traits/RemoveSigned.h b/beast/type_traits/RemoveSigned.h deleted file mode 100644 index e159d4d4bb..0000000000 --- a/beast/type_traits/RemoveSigned.h +++ /dev/null @@ -1,45 +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_TYPE_TRAITS_REMOVESIGNED_H_INCLUDED -#define BEAST_TYPE_TRAITS_REMOVESIGNED_H_INCLUDED - -#include "IntegralConstant.h" -#include "../CStdInt.h" - -namespace beast { - -/** Returns an equally sized, unsigned type. - Requires: - IsIntegral::value == true -*/ -template -struct RemoveSigned -{ - typedef T type; -}; - -template <> struct RemoveSigned { typedef uint8 type; }; -template <> struct RemoveSigned { typedef uint16 type; }; -template <> struct RemoveSigned { typedef uint32 type; }; -template <> struct RemoveSigned { typedef uint64 type; }; - -} - -#endif diff --git a/beast/utility/BaseFromMember.h b/beast/utility/BaseFromMember.h deleted file mode 100644 index e2103b6493..0000000000 --- a/beast/utility/BaseFromMember.h +++ /dev/null @@ -1,71 +0,0 @@ -//------------------------------------------------------------------------------ -/* - This file is part of rippled: https://github.com/ripple/rippled - Copyright (c) 2012, 2013 Ripple Labs Inc. - - 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_UTILITY_BASEFROMMEMBER_H_INCLUDED -#define BEAST_UTILITY_BASEFROMMEMBER_H_INCLUDED - -namespace beast { - -template -class BaseFromMember -{ -private: - T m_t; - -public: - BaseFromMember () - : m_t (T()) - { - } - - template - explicit BaseFromMember (P1 const& p1) - : m_t (p1) - { } - - template - BaseFromMember (P1 const& p1, P2 const& p2) - : m_t (p1, p2) - { } - - template - BaseFromMember (P1 const& p1, P2 const& p2, P3 const& p3) - : m_t (p1, p2, p3) - { } - - template - BaseFromMember (P1 const& p1, P2 const& p2, P3 const& p3, P4 const& p4) - : m_t (p1, p2, p3, p4) - { } - - template - BaseFromMember (P1 const& p1, P2 const& p2, P3 const& p3, P4 const& p4, P5 const& p5) - : m_t (p1, p2, p3, p4, p5) - { } - - T& member() - { return m_t; } - - T const& member() const - { return m_t; } -}; - -} - -#endif diff --git a/beast/utility/EnableIf.h b/beast/utility/EnableIf.h deleted file mode 100644 index 51087fa41f..0000000000 --- a/beast/utility/EnableIf.h +++ /dev/null @@ -1,48 +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_UTILITY_ENABLEIF_H_INCLUDED -#define BEAST_UTILITY_ENABLEIF_H_INCLUDED - -#include "../type_traits/IntegralConstant.h" - -namespace beast -{ - -template -struct EnableIfBool : TrueType { typedef T type; }; - -template -struct EnableIfBool : FalseType { }; - -template -struct EnableIf : public EnableIfBool { }; - -template -struct DisableIfBool : FalseType { typedef T type; }; - -template -struct DisableIfBool { }; - -template -struct DisableIf : public DisableIfBool { }; - -} - -#endif