Skip to content

Commit

Permalink
remove BOOST_THREAD_NO_CXX11_DECLTYPE_N3276.
Browse files Browse the repository at this point in the history
  • Loading branch information
@viboes
viboes committed Sep 28, 2014
1 parent 1ffef9e commit b973e9b
Show file tree
Hide file tree
Showing 18 changed files with 6 additions and 57 deletions.
3 changes: 0 additions & 3 deletions example/executor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
#if ! defined BOOST_NO_CXX11_DECLTYPE
#define BOOST_RESULT_OF_USE_DECLTYPE
#endif
#ifndef BOOST_NO_CXX11_DECLTYPE_N3276
//#define BOOST_THREAD_NO_CXX11_DECLTYPE_N3276
#endif

#define BOOST_THREAD_VERSION 4
#define BOOST_THREAD_PROVIDES_EXECUTORS
Expand Down
3 changes: 0 additions & 3 deletions example/future_fallback_to.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

#include <boost/config.hpp>
#ifndef BOOST_NO_CXX11_DECLTYPE_N3276
//#define BOOST_THREAD_NO_CXX11_DECLTYPE_N3276
#endif
#if ! defined BOOST_NO_CXX11_DECLTYPE
#define BOOST_RESULT_OF_USE_DECLTYPE
#endif
Expand Down
3 changes: 0 additions & 3 deletions example/future_then.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

#include <boost/config.hpp>
#ifndef BOOST_NO_CXX11_DECLTYPE_N3276
//#define BOOST_THREAD_NO_CXX11_DECLTYPE_N3276
#endif
#if ! defined BOOST_NO_CXX11_DECLTYPE
#define BOOST_RESULT_OF_USE_DECLTYPE
#endif
Expand Down
3 changes: 0 additions & 3 deletions example/future_unwrap.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

#include <boost/config.hpp>
#ifndef BOOST_NO_CXX11_DECLTYPE_N3276
//#define BOOST_THREAD_NO_CXX11_DECLTYPE_N3276
#endif
#if ! defined BOOST_NO_CXX11_DECLTYPE
#define BOOST_RESULT_OF_USE_DECLTYPE
#endif
Expand Down
3 changes: 0 additions & 3 deletions example/future_when_all.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@

#include <boost/config.hpp>

#ifndef BOOST_NO_CXX11_DECLTYPE_N3276
//#define BOOST_THREAD_NO_CXX11_DECLTYPE_N3276
#endif
#if ! defined BOOST_NO_CXX11_DECLTYPE
#define BOOST_RESULT_OF_USE_DECLTYPE
#endif
Expand Down
3 changes: 0 additions & 3 deletions example/generic_executor_ref.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
#if ! defined BOOST_NO_CXX11_DECLTYPE
#define BOOST_RESULT_OF_USE_DECLTYPE
#endif
#ifndef BOOST_NO_CXX11_DECLTYPE_N3276
//#define BOOST_THREAD_NO_CXX11_DECLTYPE_N3276
#endif

#define BOOST_THREAD_VERSION 4
#define BOOST_THREAD_PROVIDES_EXECUTORS
Expand Down
3 changes: 0 additions & 3 deletions example/lambda_future.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
#if ! defined BOOST_NO_CXX11_DECLTYPE
#define BOOST_RESULT_OF_USE_DECLTYPE
#endif
#ifndef BOOST_NO_CXX11_DECLTYPE_N3276
//#define BOOST_THREAD_NO_CXX11_DECLTYPE_N3276
#endif

#define BOOST_THREAD_VERSION 4
//#define BOOST_THREAD_USES_LOG
Expand Down
9 changes: 3 additions & 6 deletions example/parallel_accumulate.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,9 @@
#define BOOST_THREAD_PROVIDES_EXECUTORS
#define BOOST_THREAD_USES_LOG_THREAD_ID
#define BOOST_THREAD_QUEUE_DEPRECATE_OLD
//#ifndef BOOST_NO_CXX11_DECLTYPE_N3276
//#define BOOST_THREAD_NO_CXX11_DECLTYPE_N3276
//#endif
//#if ! defined BOOST_NO_CXX11_DECLTYPE
//#define BOOST_RESULT_OF_USE_DECLTYPE
//#endif
#if ! defined BOOST_NO_CXX11_DECLTYPE
#define BOOST_RESULT_OF_USE_DECLTYPE
#endif

#include <boost/thread/executors/basic_thread_pool.hpp>
#include <boost/thread/future.hpp>
Expand Down
9 changes: 3 additions & 6 deletions example/parallel_quick_sort.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,9 @@
#define BOOST_THREAD_PROVIDES_EXECUTORS
#define BOOST_THREAD_USES_LOG_THREAD_ID
#define BOOST_THREAD_QUEUE_DEPRECATE_OLD
//#ifndef BOOST_NO_CXX11_DECLTYPE_N3276
//#define BOOST_THREAD_NO_CXX11_DECLTYPE_N3276
//#endif
//#if ! defined BOOST_NO_CXX11_DECLTYPE
//#define BOOST_RESULT_OF_USE_DECLTYPE
//#endif
#if ! defined BOOST_NO_CXX11_DECLTYPE
#define BOOST_RESULT_OF_USE_DECLTYPE
#endif

#include <boost/thread/executors/basic_thread_pool.hpp>
#include <boost/thread/future.hpp>
Expand Down
1 change: 0 additions & 1 deletion include/boost/thread/detail/config.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,6 @@
! defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && \
! defined(BOOST_NO_CXX11_DECLTYPE) && \
! defined(BOOST_NO_CXX11_DECLTYPE_N3276) && \
! defined(BOOST_THREAD_NO_CXX11_DECLTYPE_N3276) && \
! defined(BOOST_NO_CXX11_TRAILING_RESULT_TYPES) && \
! defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && \
! defined(BOOST_NO_CXX11_HDR_TUPLE)
Expand Down
2 changes: 0 additions & 2 deletions include/boost/thread/detail/invoke.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ namespace boost
#if ! defined(BOOST_NO_SFINAE_EXPR) && \
! defined(BOOST_NO_CXX11_DECLTYPE) && \
! defined(BOOST_NO_CXX11_DECLTYPE_N3276) && \
! defined(BOOST_THREAD_NO_CXX11_DECLTYPE_N3276) && \
! defined(BOOST_NO_CXX11_TRAILING_RESULT_TYPES)

#define BOOST_THREAD_PROVIDES_INVOKE
Expand Down Expand Up @@ -339,7 +338,6 @@ namespace boost
! defined BOOST_NO_CXX11_HDR_FUNCTIONAL && \
defined BOOST_MSVC

//#error
template <class Ret, class Fp>
inline
Ret invoke(BOOST_THREAD_RV_REF(Fp) f)
Expand Down
3 changes: 0 additions & 3 deletions test/sync/futures/when_all/iterators_pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@

#include <boost/config.hpp>

#ifndef BOOST_NO_CXX11_DECLTYPE_N3276
//#define BOOST_THREAD_NO_CXX11_DECLTYPE_N3276
#endif
#if ! defined BOOST_NO_CXX11_DECLTYPE
#define BOOST_RESULT_OF_USE_DECLTYPE
#endif
Expand Down
3 changes: 0 additions & 3 deletions test/sync/futures/when_all/none_pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@

#include <boost/config.hpp>

#ifndef BOOST_NO_CXX11_DECLTYPE_N3276
//#define BOOST_THREAD_NO_CXX11_DECLTYPE_N3276
#endif
#if ! defined BOOST_NO_CXX11_DECLTYPE
#define BOOST_RESULT_OF_USE_DECLTYPE
#endif
Expand Down
3 changes: 0 additions & 3 deletions test/sync/futures/when_all/one_pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@

#include <boost/config.hpp>

#ifndef BOOST_NO_CXX11_DECLTYPE_N3276
//#define BOOST_THREAD_NO_CXX11_DECLTYPE_N3276
#endif
#if ! defined BOOST_NO_CXX11_DECLTYPE
#define BOOST_RESULT_OF_USE_DECLTYPE
#endif
Expand Down
3 changes: 0 additions & 3 deletions test/sync/futures/when_all/variadic_pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@

#include <boost/config.hpp>

#ifndef BOOST_NO_CXX11_DECLTYPE_N3276
//#define BOOST_THREAD_NO_CXX11_DECLTYPE_N3276
#endif
#if ! defined BOOST_NO_CXX11_DECLTYPE
#define BOOST_RESULT_OF_USE_DECLTYPE
#endif
Expand Down
3 changes: 0 additions & 3 deletions test/sync/futures/when_any/iterators_pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@

#include <boost/config.hpp>

#ifndef BOOST_NO_CXX11_DECLTYPE_N3276
//#define BOOST_THREAD_NO_CXX11_DECLTYPE_N3276
#endif
#if ! defined BOOST_NO_CXX11_DECLTYPE
#define BOOST_RESULT_OF_USE_DECLTYPE
#endif
Expand Down
3 changes: 0 additions & 3 deletions test/sync/futures/when_any/none_pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@

#include <boost/config.hpp>

#ifndef BOOST_NO_CXX11_DECLTYPE_N3276
//#define BOOST_THREAD_NO_CXX11_DECLTYPE_N3276
#endif
#if ! defined BOOST_NO_CXX11_DECLTYPE
#define BOOST_RESULT_OF_USE_DECLTYPE
#endif
Expand Down
3 changes: 0 additions & 3 deletions test/sync/futures/when_any/one_pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@

#include <boost/config.hpp>

#ifndef BOOST_NO_CXX11_DECLTYPE_N3276
//#define BOOST_THREAD_NO_CXX11_DECLTYPE_N3276
#endif
#if ! defined BOOST_NO_CXX11_DECLTYPE
#define BOOST_RESULT_OF_USE_DECLTYPE
#endif
Expand Down

0 comments on commit b973e9b

Please sign in to comment.