diff options
author | DongHun Kwak <dh0128.kwak@samsung.com> | 2019-12-05 15:24:45 +0900 |
---|---|---|
committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2019-12-05 15:24:45 +0900 |
commit | 5ce1cfc2525b06c0a9e38531813781de0281c96d (patch) | |
tree | 19cc66c6cf6396db288813b2558cc350f1deede2 /boost/smart_ptr/detail | |
parent | 3c1df2168531ad5580076ae08d529054689aeedd (diff) | |
download | boost-5ce1cfc2525b06c0a9e38531813781de0281c96d.tar.gz boost-5ce1cfc2525b06c0a9e38531813781de0281c96d.tar.bz2 boost-5ce1cfc2525b06c0a9e38531813781de0281c96d.zip |
Imported Upstream version 1.71.0upstream/1.71.0
Diffstat (limited to 'boost/smart_ptr/detail')
23 files changed, 128 insertions, 70 deletions
diff --git a/boost/smart_ptr/detail/atomic_count_std_atomic.hpp b/boost/smart_ptr/detail/atomic_count_std_atomic.hpp index 55b9998e52..3d5fb78fcb 100644 --- a/boost/smart_ptr/detail/atomic_count_std_atomic.hpp +++ b/boost/smart_ptr/detail/atomic_count_std_atomic.hpp @@ -26,7 +26,7 @@ class atomic_count { public: - explicit atomic_count( long v ): value_( v ) + explicit atomic_count( long v ): value_( static_cast< std::int_least32_t >( v ) ) { } diff --git a/boost/smart_ptr/detail/shared_count.hpp b/boost/smart_ptr/detail/shared_count.hpp index 1ce68e6b57..d56718fe7e 100644 --- a/boost/smart_ptr/detail/shared_count.hpp +++ b/boost/smart_ptr/detail/shared_count.hpp @@ -499,12 +499,12 @@ public: return std::less<sp_counted_base *>()( a.pi_, b.pi_ ); } - void * get_deleter( sp_typeinfo const & ti ) const BOOST_SP_NOEXCEPT + void * get_deleter( sp_typeinfo_ const & ti ) const BOOST_SP_NOEXCEPT { return pi_? pi_->get_deleter( ti ): 0; } - void * get_local_deleter( sp_typeinfo const & ti ) const BOOST_SP_NOEXCEPT + void * get_local_deleter( sp_typeinfo_ const & ti ) const BOOST_SP_NOEXCEPT { return pi_? pi_->get_local_deleter( ti ): 0; } diff --git a/boost/smart_ptr/detail/sp_counted_base_acc_ia64.hpp b/boost/smart_ptr/detail/sp_counted_base_acc_ia64.hpp index aa7ea9a20a..07c07e236b 100644 --- a/boost/smart_ptr/detail/sp_counted_base_acc_ia64.hpp +++ b/boost/smart_ptr/detail/sp_counted_base_acc_ia64.hpp @@ -15,7 +15,7 @@ // Lock-free algorithm by Alexander Terekhov // -#include <boost/detail/sp_typeinfo.hpp> +#include <boost/smart_ptr/detail/sp_typeinfo_.hpp> #include <boost/config.hpp> #include <machine/sys/inline.h> @@ -104,8 +104,8 @@ public: delete this; } - virtual void * get_deleter( sp_typeinfo const & ti ) = 0; - virtual void * get_local_deleter( sp_typeinfo const & ti ) = 0; + virtual void * get_deleter( sp_typeinfo_ const & ti ) = 0; + virtual void * get_local_deleter( sp_typeinfo_ const & ti ) = 0; virtual void * get_untyped_deleter() = 0; void add_ref_copy() diff --git a/boost/smart_ptr/detail/sp_counted_base_aix.hpp b/boost/smart_ptr/detail/sp_counted_base_aix.hpp index cbb642687e..072c667e29 100644 --- a/boost/smart_ptr/detail/sp_counted_base_aix.hpp +++ b/boost/smart_ptr/detail/sp_counted_base_aix.hpp @@ -20,7 +20,7 @@ // formulation // -#include <boost/detail/sp_typeinfo.hpp> +#include <boost/smart_ptr/detail/sp_typeinfo_.hpp> #include <boost/config.hpp> #include <builtins.h> #include <sys/atomic_op.h> @@ -96,8 +96,8 @@ public: delete this; } - virtual void * get_deleter( sp_typeinfo const & ti ) = 0; - virtual void * get_local_deleter( sp_typeinfo const & ti ) = 0; + virtual void * get_deleter( sp_typeinfo_ const & ti ) = 0; + virtual void * get_local_deleter( sp_typeinfo_ const & ti ) = 0; virtual void * get_untyped_deleter() = 0; void add_ref_copy() diff --git a/boost/smart_ptr/detail/sp_counted_base_clang.hpp b/boost/smart_ptr/detail/sp_counted_base_clang.hpp index 90b6f224ca..89bcfb80a7 100644 --- a/boost/smart_ptr/detail/sp_counted_base_clang.hpp +++ b/boost/smart_ptr/detail/sp_counted_base_clang.hpp @@ -15,7 +15,7 @@ // See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt -#include <boost/detail/sp_typeinfo.hpp> +#include <boost/smart_ptr/detail/sp_typeinfo_.hpp> #include <boost/smart_ptr/detail/sp_noexcept.hpp> #include <boost/config.hpp> #include <boost/cstdint.hpp> @@ -99,8 +99,8 @@ public: delete this; } - virtual void * get_deleter( sp_typeinfo const & ti ) BOOST_SP_NOEXCEPT = 0; - virtual void * get_local_deleter( sp_typeinfo const & ti ) BOOST_SP_NOEXCEPT = 0; + virtual void * get_deleter( sp_typeinfo_ const & ti ) BOOST_SP_NOEXCEPT = 0; + virtual void * get_local_deleter( sp_typeinfo_ const & ti ) BOOST_SP_NOEXCEPT = 0; virtual void * get_untyped_deleter() BOOST_SP_NOEXCEPT = 0; void add_ref_copy() BOOST_SP_NOEXCEPT diff --git a/boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp b/boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp index c43297e0e4..8e5a414dab 100644 --- a/boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp +++ b/boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp @@ -24,7 +24,7 @@ // formulation // -#include <boost/detail/sp_typeinfo.hpp> +#include <boost/smart_ptr/detail/sp_typeinfo_.hpp> #include <boost/config.hpp> namespace boost @@ -124,8 +124,8 @@ public: delete this; } - virtual void * get_deleter( sp_typeinfo const & ti ) = 0; - virtual void * get_local_deleter( sp_typeinfo const & ti ) = 0; + virtual void * get_deleter( sp_typeinfo_ const & ti ) = 0; + virtual void * get_local_deleter( sp_typeinfo_ const & ti ) = 0; virtual void * get_untyped_deleter() = 0; void add_ref_copy() diff --git a/boost/smart_ptr/detail/sp_counted_base_cw_x86.hpp b/boost/smart_ptr/detail/sp_counted_base_cw_x86.hpp index ce34b4cbc4..1ab21a5eaf 100644 --- a/boost/smart_ptr/detail/sp_counted_base_cw_x86.hpp +++ b/boost/smart_ptr/detail/sp_counted_base_cw_x86.hpp @@ -25,7 +25,7 @@ // formulation // -#include <boost/detail/sp_typeinfo.hpp> +#include <boost/smart_ptr/detail/sp_typeinfo_.hpp> #include <boost/config.hpp> namespace boost @@ -112,8 +112,8 @@ public: delete this; } - virtual void * get_deleter( sp_typeinfo const & ti ) = 0; - virtual void * get_local_deleter( sp_typeinfo const & ti ) = 0; + virtual void * get_deleter( sp_typeinfo_ const & ti ) = 0; + virtual void * get_local_deleter( sp_typeinfo_ const & ti ) = 0; virtual void * get_untyped_deleter() = 0; void add_ref_copy() diff --git a/boost/smart_ptr/detail/sp_counted_base_gcc_ia64.hpp b/boost/smart_ptr/detail/sp_counted_base_gcc_ia64.hpp index 32642df778..73d4533800 100644 --- a/boost/smart_ptr/detail/sp_counted_base_gcc_ia64.hpp +++ b/boost/smart_ptr/detail/sp_counted_base_gcc_ia64.hpp @@ -16,7 +16,7 @@ // Lock-free algorithm by Alexander Terekhov // -#include <boost/detail/sp_typeinfo.hpp> +#include <boost/smart_ptr/detail/sp_typeinfo_.hpp> #include <boost/config.hpp> namespace boost @@ -111,8 +111,8 @@ public: delete this; } - virtual void * get_deleter( sp_typeinfo const & ti ) = 0; - virtual void * get_local_deleter( sp_typeinfo const & ti ) = 0; + virtual void * get_deleter( sp_typeinfo_ const & ti ) = 0; + virtual void * get_local_deleter( sp_typeinfo_ const & ti ) = 0; virtual void * get_untyped_deleter() = 0; void add_ref_copy() diff --git a/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp b/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp index c4ce0537c9..f109f6579f 100644 --- a/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp +++ b/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp @@ -20,7 +20,7 @@ // Lock-free algorithm by Alexander Terekhov // -#include <boost/detail/sp_typeinfo.hpp> +#include <boost/smart_ptr/detail/sp_typeinfo_.hpp> #include <boost/config.hpp> namespace boost @@ -141,8 +141,8 @@ public: delete this; } - virtual void * get_deleter( sp_typeinfo const & ti ) = 0; - virtual void * get_local_deleter( sp_typeinfo const & ti ) = 0; + virtual void * get_deleter( sp_typeinfo_ const & ti ) = 0; + virtual void * get_local_deleter( sp_typeinfo_ const & ti ) = 0; virtual void * get_untyped_deleter() = 0; void add_ref_copy() diff --git a/boost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp b/boost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp index 5cf5b3fa66..5dce1cf6ac 100644 --- a/boost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp +++ b/boost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp @@ -24,7 +24,7 @@ // formulation // -#include <boost/detail/sp_typeinfo.hpp> +#include <boost/smart_ptr/detail/sp_typeinfo_.hpp> #include <boost/config.hpp> namespace boost @@ -135,8 +135,8 @@ public: delete this; } - virtual void * get_deleter( sp_typeinfo const & ti ) = 0; - virtual void * get_local_deleter( sp_typeinfo const & ti ) = 0; + virtual void * get_deleter( sp_typeinfo_ const & ti ) = 0; + virtual void * get_local_deleter( sp_typeinfo_ const & ti ) = 0; virtual void * get_untyped_deleter() = 0; void add_ref_copy() diff --git a/boost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp b/boost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp index 2f27b96e1e..a3d7295865 100644 --- a/boost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp +++ b/boost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp @@ -19,7 +19,7 @@ // // Thanks to Michael van der Westhuizen -#include <boost/detail/sp_typeinfo.hpp> +#include <boost/smart_ptr/detail/sp_typeinfo_.hpp> #include <boost/config.hpp> #include <inttypes.h> // int32_t @@ -120,8 +120,8 @@ public: delete this; } - virtual void * get_deleter( sp_typeinfo const & ti ) = 0; - virtual void * get_local_deleter( sp_typeinfo const & ti ) = 0; + virtual void * get_deleter( sp_typeinfo_ const & ti ) = 0; + virtual void * get_local_deleter( sp_typeinfo_ const & ti ) = 0; virtual void * get_untyped_deleter() = 0; void add_ref_copy() diff --git a/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp b/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp index ec44c7066f..ebbea50264 100644 --- a/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp +++ b/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp @@ -24,7 +24,7 @@ // formulation // -#include <boost/detail/sp_typeinfo.hpp> +#include <boost/smart_ptr/detail/sp_typeinfo_.hpp> #include <boost/config.hpp> namespace boost @@ -127,8 +127,8 @@ public: delete this; } - virtual void * get_deleter( sp_typeinfo const & ti ) = 0; - virtual void * get_local_deleter( sp_typeinfo const & ti ) = 0; + virtual void * get_deleter( sp_typeinfo_ const & ti ) = 0; + virtual void * get_local_deleter( sp_typeinfo_ const & ti ) = 0; virtual void * get_untyped_deleter() = 0; void add_ref_copy() diff --git a/boost/smart_ptr/detail/sp_counted_base_nt.hpp b/boost/smart_ptr/detail/sp_counted_base_nt.hpp index 8d7b8e9cc8..08300505bb 100644 --- a/boost/smart_ptr/detail/sp_counted_base_nt.hpp +++ b/boost/smart_ptr/detail/sp_counted_base_nt.hpp @@ -18,7 +18,7 @@ // http://www.boost.org/LICENSE_1_0.txt) // -#include <boost/detail/sp_typeinfo.hpp> +#include <boost/smart_ptr/detail/sp_typeinfo_.hpp> #include <boost/smart_ptr/detail/sp_noexcept.hpp> #include <boost/config.hpp> #include <boost/cstdint.hpp> @@ -61,8 +61,8 @@ public: delete this; } - virtual void * get_deleter( sp_typeinfo const & ti ) BOOST_SP_NOEXCEPT = 0; - virtual void * get_local_deleter( sp_typeinfo const & ti ) BOOST_SP_NOEXCEPT = 0; + virtual void * get_deleter( sp_typeinfo_ const & ti ) BOOST_SP_NOEXCEPT = 0; + virtual void * get_local_deleter( sp_typeinfo_ const & ti ) BOOST_SP_NOEXCEPT = 0; virtual void * get_untyped_deleter() BOOST_SP_NOEXCEPT = 0; void add_ref_copy() BOOST_SP_NOEXCEPT diff --git a/boost/smart_ptr/detail/sp_counted_base_pt.hpp b/boost/smart_ptr/detail/sp_counted_base_pt.hpp index 1aa6756122..ec850fe6bd 100644 --- a/boost/smart_ptr/detail/sp_counted_base_pt.hpp +++ b/boost/smart_ptr/detail/sp_counted_base_pt.hpp @@ -18,7 +18,7 @@ // http://www.boost.org/LICENSE_1_0.txt) // -#include <boost/detail/sp_typeinfo.hpp> +#include <boost/smart_ptr/detail/sp_typeinfo_.hpp> #include <boost/assert.hpp> #include <boost/config.hpp> #include <boost/cstdint.hpp> @@ -72,8 +72,8 @@ public: delete this; } - virtual void * get_deleter( sp_typeinfo const & ti ) = 0; - virtual void * get_local_deleter( sp_typeinfo const & ti ) = 0; + virtual void * get_deleter( sp_typeinfo_ const & ti ) = 0; + virtual void * get_local_deleter( sp_typeinfo_ const & ti ) = 0; virtual void * get_untyped_deleter() = 0; void add_ref_copy() diff --git a/boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp b/boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp index 1b9979bfb5..f38eee65f5 100644 --- a/boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp +++ b/boost/smart_ptr/detail/sp_counted_base_snc_ps3.hpp @@ -19,7 +19,7 @@ // // Thanks to Michael van der Westhuizen -#include <boost/detail/sp_typeinfo.hpp> +#include <boost/smart_ptr/detail/sp_typeinfo_.hpp> #include <boost/config.hpp> #include <inttypes.h> // uint32_t @@ -115,8 +115,8 @@ public: delete this; } - virtual void * get_deleter( sp_typeinfo const & ti ) = 0; - virtual void * get_local_deleter( sp_typeinfo const & ti ) = 0; + virtual void * get_deleter( sp_typeinfo_ const & ti ) = 0; + virtual void * get_local_deleter( sp_typeinfo_ const & ti ) = 0; virtual void * get_untyped_deleter() = 0; void add_ref_copy() diff --git a/boost/smart_ptr/detail/sp_counted_base_solaris.hpp b/boost/smart_ptr/detail/sp_counted_base_solaris.hpp index c0d69dcdcb..29f6b8a3c2 100644 --- a/boost/smart_ptr/detail/sp_counted_base_solaris.hpp +++ b/boost/smart_ptr/detail/sp_counted_base_solaris.hpp @@ -20,7 +20,7 @@ // formulation // -#include <boost/detail/sp_typeinfo.hpp> +#include <boost/smart_ptr/detail/sp_typeinfo_.hpp> #include <boost/config.hpp> #include <atomic.h> @@ -62,8 +62,8 @@ public: delete this; } - virtual void * get_deleter( sp_typeinfo const & ti ) = 0; - virtual void * get_local_deleter( sp_typeinfo const & ti ) = 0; + virtual void * get_deleter( sp_typeinfo_ const & ti ) = 0; + virtual void * get_local_deleter( sp_typeinfo_ const & ti ) = 0; virtual void * get_untyped_deleter() = 0; void add_ref_copy() diff --git a/boost/smart_ptr/detail/sp_counted_base_spin.hpp b/boost/smart_ptr/detail/sp_counted_base_spin.hpp index b9966260cb..56911bdb09 100644 --- a/boost/smart_ptr/detail/sp_counted_base_spin.hpp +++ b/boost/smart_ptr/detail/sp_counted_base_spin.hpp @@ -18,7 +18,7 @@ // http://www.boost.org/LICENSE_1_0.txt) // -#include <boost/detail/sp_typeinfo.hpp> +#include <boost/smart_ptr/detail/sp_typeinfo_.hpp> #include <boost/smart_ptr/detail/spinlock_pool.hpp> #include <boost/config.hpp> @@ -84,8 +84,8 @@ public: delete this; } - virtual void * get_deleter( sp_typeinfo const & ti ) = 0; - virtual void * get_local_deleter( sp_typeinfo const & ti ) = 0; + virtual void * get_deleter( sp_typeinfo_ const & ti ) = 0; + virtual void * get_local_deleter( sp_typeinfo_ const & ti ) = 0; virtual void * get_untyped_deleter() = 0; void add_ref_copy() diff --git a/boost/smart_ptr/detail/sp_counted_base_std_atomic.hpp b/boost/smart_ptr/detail/sp_counted_base_std_atomic.hpp index 2246dda4b6..338eeea718 100644 --- a/boost/smart_ptr/detail/sp_counted_base_std_atomic.hpp +++ b/boost/smart_ptr/detail/sp_counted_base_std_atomic.hpp @@ -15,7 +15,7 @@ // See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt -#include <boost/detail/sp_typeinfo.hpp> +#include <boost/smart_ptr/detail/sp_typeinfo_.hpp> #include <boost/smart_ptr/detail/sp_noexcept.hpp> #include <boost/config.hpp> #include <atomic> @@ -91,8 +91,8 @@ public: delete this; } - virtual void * get_deleter( sp_typeinfo const & ti ) BOOST_SP_NOEXCEPT = 0; - virtual void * get_local_deleter( sp_typeinfo const & ti ) BOOST_SP_NOEXCEPT = 0; + virtual void * get_deleter( sp_typeinfo_ const & ti ) BOOST_SP_NOEXCEPT = 0; + virtual void * get_local_deleter( sp_typeinfo_ const & ti ) BOOST_SP_NOEXCEPT = 0; virtual void * get_untyped_deleter() BOOST_SP_NOEXCEPT = 0; void add_ref_copy() BOOST_SP_NOEXCEPT diff --git a/boost/smart_ptr/detail/sp_counted_base_sync.hpp b/boost/smart_ptr/detail/sp_counted_base_sync.hpp index 17128cc97e..8446560e0a 100644 --- a/boost/smart_ptr/detail/sp_counted_base_sync.hpp +++ b/boost/smart_ptr/detail/sp_counted_base_sync.hpp @@ -15,7 +15,7 @@ // See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt -#include <boost/detail/sp_typeinfo.hpp> +#include <boost/smart_ptr/detail/sp_typeinfo_.hpp> #include <boost/config.hpp> #include <limits.h> @@ -109,8 +109,8 @@ public: delete this; } - virtual void * get_deleter( sp_typeinfo const & ti ) = 0; - virtual void * get_local_deleter( sp_typeinfo const & ti ) = 0; + virtual void * get_deleter( sp_typeinfo_ const & ti ) = 0; + virtual void * get_local_deleter( sp_typeinfo_ const & ti ) = 0; virtual void * get_untyped_deleter() = 0; void add_ref_copy() diff --git a/boost/smart_ptr/detail/sp_counted_base_vacpp_ppc.hpp b/boost/smart_ptr/detail/sp_counted_base_vacpp_ppc.hpp index 088ed63972..2467e95a17 100644 --- a/boost/smart_ptr/detail/sp_counted_base_vacpp_ppc.hpp +++ b/boost/smart_ptr/detail/sp_counted_base_vacpp_ppc.hpp @@ -21,7 +21,7 @@ // formulation // -#include <boost/detail/sp_typeinfo.hpp> +#include <boost/smart_ptr/detail/sp_typeinfo_.hpp> #include <boost/config.hpp> extern "builtin" void __lwsync(void); @@ -104,8 +104,8 @@ public: delete this; } - virtual void * get_deleter( sp_typeinfo const & ti ) = 0; - virtual void * get_local_deleter( sp_typeinfo const & ti ) = 0; + virtual void * get_deleter( sp_typeinfo_ const & ti ) = 0; + virtual void * get_local_deleter( sp_typeinfo_ const & ti ) = 0; virtual void * get_untyped_deleter() = 0; void add_ref_copy() diff --git a/boost/smart_ptr/detail/sp_counted_base_w32.hpp b/boost/smart_ptr/detail/sp_counted_base_w32.hpp index 46bd4d15a9..9ab71eff87 100644 --- a/boost/smart_ptr/detail/sp_counted_base_w32.hpp +++ b/boost/smart_ptr/detail/sp_counted_base_w32.hpp @@ -25,8 +25,8 @@ // #include <boost/smart_ptr/detail/sp_interlocked.hpp> +#include <boost/smart_ptr/detail/sp_typeinfo_.hpp> #include <boost/detail/workaround.hpp> -#include <boost/detail/sp_typeinfo.hpp> #include <boost/config.hpp> namespace boost @@ -67,8 +67,8 @@ public: delete this; } - virtual void * get_deleter( sp_typeinfo const & ti ) = 0; - virtual void * get_local_deleter( sp_typeinfo const & ti ) = 0; + virtual void * get_deleter( sp_typeinfo_ const & ti ) = 0; + virtual void * get_local_deleter( sp_typeinfo_ const & ti ) = 0; virtual void * get_untyped_deleter() = 0; void add_ref_copy() diff --git a/boost/smart_ptr/detail/sp_counted_impl.hpp b/boost/smart_ptr/detail/sp_counted_impl.hpp index 29718b6b8c..96c9da3830 100644 --- a/boost/smart_ptr/detail/sp_counted_impl.hpp +++ b/boost/smart_ptr/detail/sp_counted_impl.hpp @@ -93,12 +93,12 @@ public: boost::checked_delete( px_ ); } - virtual void * get_deleter( sp_typeinfo const & ) BOOST_SP_NOEXCEPT + virtual void * get_deleter( sp_typeinfo_ const & ) BOOST_SP_NOEXCEPT { return 0; } - virtual void * get_local_deleter( sp_typeinfo const & ) BOOST_SP_NOEXCEPT + virtual void * get_local_deleter( sp_typeinfo_ const & ) BOOST_SP_NOEXCEPT { return 0; } @@ -173,14 +173,14 @@ public: del( ptr ); } - virtual void * get_deleter( sp_typeinfo const & ti ) BOOST_SP_NOEXCEPT + virtual void * get_deleter( sp_typeinfo_ const & ti ) BOOST_SP_NOEXCEPT { - return ti == BOOST_SP_TYPEID(D)? &reinterpret_cast<char&>( del ): 0; + return ti == BOOST_SP_TYPEID_(D)? &reinterpret_cast<char&>( del ): 0; } - virtual void * get_local_deleter( sp_typeinfo const & ti ) BOOST_SP_NOEXCEPT + virtual void * get_local_deleter( sp_typeinfo_ const & ti ) BOOST_SP_NOEXCEPT { - return ti == BOOST_SP_TYPEID(D)? boost::detail::get_local_deleter( boost::addressof( del ) ): 0; + return ti == BOOST_SP_TYPEID_(D)? boost::detail::get_local_deleter( boost::addressof( del ) ): 0; } virtual void * get_untyped_deleter() BOOST_SP_NOEXCEPT @@ -266,14 +266,14 @@ public: a2.deallocate( this, 1 ); } - virtual void * get_deleter( sp_typeinfo const & ti ) BOOST_SP_NOEXCEPT + virtual void * get_deleter( sp_typeinfo_ const & ti ) BOOST_SP_NOEXCEPT { - return ti == BOOST_SP_TYPEID( D )? &reinterpret_cast<char&>( d_ ): 0; + return ti == BOOST_SP_TYPEID_( D )? &reinterpret_cast<char&>( d_ ): 0; } - virtual void * get_local_deleter( sp_typeinfo const & ti ) BOOST_SP_NOEXCEPT + virtual void * get_local_deleter( sp_typeinfo_ const & ti ) BOOST_SP_NOEXCEPT { - return ti == BOOST_SP_TYPEID(D)? boost::detail::get_local_deleter( boost::addressof( d_ ) ): 0; + return ti == BOOST_SP_TYPEID_( D )? boost::detail::get_local_deleter( boost::addressof( d_ ) ): 0; } virtual void * get_untyped_deleter() BOOST_SP_NOEXCEPT diff --git a/boost/smart_ptr/detail/sp_typeinfo_.hpp b/boost/smart_ptr/detail/sp_typeinfo_.hpp new file mode 100644 index 0000000000..287bf72818 --- /dev/null +++ b/boost/smart_ptr/detail/sp_typeinfo_.hpp @@ -0,0 +1,58 @@ +#ifndef BOOST_SMART_PTR_DETAIL_SP_TYPEINFO_HPP_INCLUDED +#define BOOST_SMART_PTR_DETAIL_SP_TYPEINFO_HPP_INCLUDED + +// MS compatible compilers support #pragma once + +#if defined(_MSC_VER) && (_MSC_VER >= 1020) +# pragma once +#endif + +// smart_ptr/detail/sp_typeinfo_.hpp +// +// Copyright 2007, 2019 Peter Dimov +// +// 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) + +#include <boost/config.hpp> + +#if defined( BOOST_NO_TYPEID ) || defined( BOOST_NO_STD_TYPEINFO ) + +#include <boost/core/typeinfo.hpp> + +namespace boost +{ + +namespace detail +{ + +typedef boost::core::typeinfo sp_typeinfo_; + +} // namespace detail + +} // namespace boost + +#define BOOST_SP_TYPEID_(T) BOOST_CORE_TYPEID(T) + +#else // defined( BOOST_NO_TYPEID ) || defined( BOOST_NO_STD_TYPEINFO ) + +#include <typeinfo> + +namespace boost +{ + +namespace detail +{ + +typedef std::type_info sp_typeinfo_; + +} // namespace detail + +} // namespace boost + +#define BOOST_SP_TYPEID_(T) typeid(T) + +#endif // defined( BOOST_NO_TYPEID ) || defined( BOOST_NO_STD_TYPEINFO ) + +#endif // #ifndef BOOST_SMART_PTR_DETAIL_SP_TYPEINFO_HPP_INCLUDED |