Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-10-19 20:22:58 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2014-10-20 13:49:33 (GMT) |
| commit | 6b22dfcf59474dd016a0355a3102a1dd3692d92c (patch) | |
| tree | 2b1fd33be433a91e81fee84fdc2bf1b52575d934 /3rdParty/Boost/src/boost/thread/detail/memory.hpp | |
| parent | 38b0cb785fea8eae5e48fae56440695fdfd10ee1 (diff) | |
| download | swift-6b22dfcf59474dd016a0355a3102a1dd3692d92c.zip swift-6b22dfcf59474dd016a0355a3102a1dd3692d92c.tar.bz2 | |
Update Boost in 3rdParty to version 1.56.0.
This updates Boost in our 3rdParty directory to version 1.56.0.
Updated our update.sh script to stop on error.
Changed error reporting in SwiftTools/CrashReporter.cpp to SWIFT_LOG due to
missing include of <iostream> with newer Boost.
Change-Id: I4b35c77de951333979a524097f35f5f83d325edc
Diffstat (limited to '3rdParty/Boost/src/boost/thread/detail/memory.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/thread/detail/memory.hpp | 130 |
1 files changed, 11 insertions, 119 deletions
diff --git a/3rdParty/Boost/src/boost/thread/detail/memory.hpp b/3rdParty/Boost/src/boost/thread/detail/memory.hpp index 3c1692d..51ce84f 100644 --- a/3rdParty/Boost/src/boost/thread/detail/memory.hpp +++ b/3rdParty/Boost/src/boost/thread/detail/memory.hpp @@ -1,8 +1,9 @@ ////////////////////////////////////////////////////////////////////////////// // -// (C) Copyright 2011-2012 Vicente J. Botet Escriba -// Software License, Version 1.0. (See accompanying file -// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) +// Copyright (C) 2011-2013 Vicente J. Botet Escriba +// +// Distributed under the Boost Software License, Version 1.0. (See accompanying +// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // // See http://www.boost.org/libs/thread for documentation. // @@ -12,14 +13,11 @@ #define BOOST_THREAD_DETAIL_MEMORY_HPP #include <boost/config.hpp> -#include <boost/container/allocator_traits.hpp> -#include <boost/container/scoped_allocator.hpp> -#include <boost/type_traits/remove_cv.hpp> -#include <boost/type_traits/is_convertible.hpp> -#include <boost/type_traits/is_scalar.hpp> -#include <boost/type_traits/is_pointer.hpp> -#include <boost/type_traits/is_same.hpp> -#include <boost/static_assert.hpp> + +#include <boost/thread/csbl/memory/pointer_traits.hpp> +#include <boost/thread/csbl/memory/allocator_arg.hpp> +#include <boost/thread/csbl/memory/allocator_traits.hpp> +#include <boost/thread/csbl/memory/scoped_allocator.hpp> namespace boost { @@ -28,7 +26,7 @@ namespace boost template <class _Alloc> class allocator_destructor { - typedef container::allocator_traits<_Alloc> alloc_traits; + typedef csbl::allocator_traits<_Alloc> alloc_traits; public: typedef typename alloc_traits::pointer pointer; typedef typename alloc_traits::size_type size_type; @@ -46,111 +44,5 @@ namespace boost } }; } //namespace thread_detail - - typedef container::allocator_arg_t allocator_arg_t; - BOOST_CONSTEXPR_OR_CONST allocator_arg_t allocator_arg = {}; - - template <class T, class Alloc> - struct uses_allocator: public container::uses_allocator<T, Alloc> - { - }; - - template <class Ptr> - struct pointer_traits - { - typedef Ptr pointer; -// typedef <details> element_type; -// typedef <details> difference_type; - -// template <class U> using rebind = <details>; -// -// static pointer pointer_to(<details>); - }; - - template <class T> - struct pointer_traits<T*> - { - typedef T* pointer; - typedef T element_type; - typedef ptrdiff_t difference_type; - -// template <class U> using rebind = U*; -// -// static pointer pointer_to(<details>) noexcept; - }; - - - namespace thread_detail { - template <class _Ptr1, class _Ptr2, - bool = is_same<typename remove_cv<typename pointer_traits<_Ptr1>::element_type>::type, - typename remove_cv<typename pointer_traits<_Ptr2>::element_type>::type - >::value - > - struct same_or_less_cv_qualified_imp - : is_convertible<_Ptr1, _Ptr2> {}; - - template <class _Ptr1, class _Ptr2> - struct same_or_less_cv_qualified_imp<_Ptr1, _Ptr2, false> - : false_type {}; - - template <class _Ptr1, class _Ptr2, bool = is_scalar<_Ptr1>::value && - !is_pointer<_Ptr1>::value> - struct same_or_less_cv_qualified - : same_or_less_cv_qualified_imp<_Ptr1, _Ptr2> {}; - - template <class _Ptr1, class _Ptr2> - struct same_or_less_cv_qualified<_Ptr1, _Ptr2, true> - : false_type {}; - - } - template <class T> - struct BOOST_SYMBOL_VISIBLE default_delete - { - #ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_SYMBOL_VISIBLE - BOOST_CONSTEXPR default_delete() = default; - #else - BOOST_SYMBOL_VISIBLE - BOOST_CONSTEXPR default_delete() BOOST_NOEXCEPT {} - #endif - template <class U> - BOOST_SYMBOL_VISIBLE - default_delete(const default_delete<U>&, - typename enable_if<is_convertible<U*, T*> >::type* = 0) BOOST_NOEXCEPT {} - BOOST_SYMBOL_VISIBLE - void operator() (T* ptr) const BOOST_NOEXCEPT - { - BOOST_STATIC_ASSERT_MSG(sizeof(T) > 0, "default_delete can not delete incomplete type"); - delete ptr; - } - }; - - template <class T> - struct BOOST_SYMBOL_VISIBLE default_delete<T[]> - { - public: - #ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_SYMBOL_VISIBLE - BOOST_CONSTEXPR default_delete() = default; - #else - BOOST_SYMBOL_VISIBLE - BOOST_CONSTEXPR default_delete() BOOST_NOEXCEPT {} - #endif - template <class U> - BOOST_SYMBOL_VISIBLE - default_delete(const default_delete<U[]>&, - typename enable_if<thread_detail::same_or_less_cv_qualified<U*, T*> >::type* = 0) BOOST_NOEXCEPT {} - template <class U> - BOOST_SYMBOL_VISIBLE - void operator() (U* ptr, - typename enable_if<thread_detail::same_or_less_cv_qualified<U*, T*> >::type* = 0) const BOOST_NOEXCEPT - { - BOOST_STATIC_ASSERT_MSG(sizeof(T) > 0, "default_delete can not delete incomplete type"); - delete [] ptr; - } - }; - -} // namespace boost - - +} #endif // BOOST_THREAD_DETAIL_MEMORY_HPP |