diff options
Diffstat (limited to 'boost/thread/executors/work.hpp')
| -rw-r--r-- | boost/thread/executors/work.hpp | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/boost/thread/executors/work.hpp b/boost/thread/executors/work.hpp index df1512cd95..bdaf7651b9 100644 --- a/boost/thread/executors/work.hpp +++ b/boost/thread/executors/work.hpp @@ -8,36 +8,23 @@ #define BOOST_THREAD_EXECUTORS_WORK_HPP #include <boost/thread/detail/config.hpp> - -#if ! defined BOOST_THREAD_EXECUTORS_WORK_ACCEPTS_MOVABLE \ - && ! defined BOOST_THREAD_EXECUTORS_WORK_DONT_ACCEPT_MOVABLE -#define BOOST_THREAD_EXECUTORS_WORK_ACCEPTS_MOVABLE -//#define BOOST_THREAD_EXECUTORS_WORK_DONT_ACCEPT_MOVABLE -#endif - -#if defined BOOST_THREAD_EXECUTORS_WORK_ACCEPTS_MOVABLE - #include <boost/thread/detail/nullary_function.hpp> +#include <boost/thread/csbl/functional.hpp> namespace boost { namespace executors { typedef detail::nullary_function<void()> work; - } -} // namespace boost +#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES + typedef detail::nullary_function<void()> work_pq; + //typedef csbl::function<void()> work_pq; #else -#include <boost/thread/csbl/functional.hpp> - -namespace boost -{ - namespace executors - { - typedef csbl::function<void()> work; + typedef csbl::function<void()> work_pq; +#endif } } // namespace boost -#endif #endif // BOOST_THREAD_EXECUTORS_WORK_HPP |