boost_mirror/utility
1
0
Fork 0
mirror of https://github.com/boostorg/utility.git synced 2025-05-09 15:04:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed usage of deprecated macros in Boost.Utility; specifically result_of

Browse Source 
[SVN r81574]
This commit is contained in:
Marshall Clow 2012-11-26 20:32:24 +00:00
parent 943af35553
commit c55d5ca7de
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/utility/result_of.hpp
View File

@ -46,7 +46,7 @@
#ifndef BOOST_RESULT_OF_USE_TR1 #ifndef BOOST_RESULT_OF_USE_TR1
# ifndef BOOST_RESULT_OF_USE_DECLTYPE # ifndef BOOST_RESULT_OF_USE_DECLTYPE
# ifndef BOOST_NO_DECLTYPE_N3276 // this implies !defined(BOOST_NO_DECLTYPE) # ifndef BOOST_NO_CXX11_DECLTYPE_N3276 // this implies !defined(BOOST_NO_CXX11_DECLTYPE)
# define BOOST_RESULT_OF_USE_DECLTYPE # define BOOST_RESULT_OF_USE_DECLTYPE
# else # else
# define BOOST_RESULT_OF_USE_TR1 # define BOOST_RESULT_OF_USE_TR1

6
test/result_of_test.cpp
View File

@ -104,7 +104,7 @@ struct no_result_type_or_result
cv_overload_check<const int> operator()() const; cv_overload_check<const int> operator()() const;
cv_overload_check<volatile int> operator()() volatile; cv_overload_check<volatile int> operator()() volatile;
cv_overload_check<const volatile int> operator()() const volatile; cv_overload_check<const volatile int> operator()() const volatile;
#if !defined(BOOST_NO_RVALUE_REFERENCES) #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
short operator()(int&&); short operator()(int&&);
int operator()(int&); int operator()(int&);
long operator()(int const&); long operator()(int const&);
@ -122,7 +122,7 @@ struct no_result_type_or_result_template
cv_overload_check<const int> operator()() const; cv_overload_check<const int> operator()() const;
cv_overload_check<volatile int> operator()() volatile; cv_overload_check<volatile int> operator()() volatile;
cv_overload_check<const volatile int> operator()() const volatile; cv_overload_check<const volatile int> operator()() const volatile;
#if !defined(BOOST_NO_RVALUE_REFERENCES) #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
short operator()(int&&); short operator()(int&&);
int operator()(int&); int operator()(int&);
long operator()(int const&); long operator()(int const&);
@ -291,7 +291,7 @@ int main()
BOOST_STATIC_ASSERT((is_same<result_of<const no_result_type_or_result_template<void>(void)>::type, cv_overload_check<const int> >::value)); BOOST_STATIC_ASSERT((is_same<result_of<const no_result_type_or_result_template<void>(void)>::type, cv_overload_check<const int> >::value));
BOOST_STATIC_ASSERT((is_same<result_of<volatile no_result_type_or_result_template<void>(void)>::type, cv_overload_check<volatile int> >::value)); BOOST_STATIC_ASSERT((is_same<result_of<volatile no_result_type_or_result_template<void>(void)>::type, cv_overload_check<volatile int> >::value));
BOOST_STATIC_ASSERT((is_same<result_of<const volatile no_result_type_or_result_template<void>(void)>::type, cv_overload_check<const volatile int> >::value)); BOOST_STATIC_ASSERT((is_same<result_of<const volatile no_result_type_or_result_template<void>(void)>::type, cv_overload_check<const volatile int> >::value));
#if !defined(BOOST_NO_RVALUE_REFERENCES) #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
BOOST_STATIC_ASSERT((is_same<result_of<no_result_type_or_result(int&&)>::type, short>::value)); BOOST_STATIC_ASSERT((is_same<result_of<no_result_type_or_result(int&&)>::type, short>::value));
BOOST_STATIC_ASSERT((is_same<result_of<no_result_type_or_result(int&)>::type, int>::value)); BOOST_STATIC_ASSERT((is_same<result_of<no_result_type_or_result(int&)>::type, int>::value));
BOOST_STATIC_ASSERT((is_same<result_of<no_result_type_or_result(int const&)>::type, long>::value)); BOOST_STATIC_ASSERT((is_same<result_of<no_result_type_or_result(int const&)>::type, long>::value));