Merge pull request #1362 from STEllAR-GROUP/std-config-removal

Std config removal
STEllAR-GROUP · Jan 26, 2015 · c5b9199 · c5b9199
2 parents acd5fcf + 6b32ecd
commit c5b9199
Show file tree

Hide file tree

Showing 151 changed files with 917 additions and 1,235 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -196,16 +196,6 @@ endif()
 ################################################################################
 # Utility configuration
 ################################################################################
-hpx_option(HPX_UTIL_FUNCTION BOOL "Use hpx::util::function instead of boost::function or std::function (default: ON)" ON ADVANCED)
-if(HPX_UTIL_FUNCTION)
-  hpx_add_config_define(HPX_UTIL_FUNCTION)
-endif()
-
-hpx_option(HPX_UTIL_TUPLE BOOL "Use hpx::util::tuple instead of boost::tuple or std::tuple (default: ON)" ON ADVANCED)
-if(HPX_UTIL_TUPLE)
-  hpx_add_config_define(HPX_UTIL_TUPLE)
-endif()
-
 set(HPX_HIDDEN_VISIBILITY_DEFAULT ON)
 if(CMAKE_COMPILER_IS_GNUCXX)
   if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.6.99
@@ -1030,14 +1020,6 @@ hpx_check_for_cxx11_std_unique_ptr(
   DEFINITIONS HPX_HAVE_CXX11_STD_UNIQUE_PTR
               BOOST_LOCKFREE_HAVE_CXX11_STD_UNIQUE_PTR)
 
-if(NOT HPX_UTIL_TUPLE)
-  hpx_check_for_cxx11_std_tuple(DEFINITIONS HPX_HAVE_CXX11_STD_TUPLE)
-endif()
-
-if(NOT HPX_UTIL_FUNCTION)
-  hpx_check_for_cxx11_std_bind(DEFINITIONS HPX_HAVE_CXX11_STD_FUNCTION)
-endif()
-
 hpx_check_for_cxx11_std_initializer_list(
   DEFINITIONS HPX_HAVE_CXX11_STD_INITIALIZER_LIST)
 

diff --git a/cmake/tests/cxx11_std_function.cpp b/cmake/tests/cxx11_std_function.cpp
diff --git a/cmake/tests/cxx11_std_tuple.cpp b/cmake/tests/cxx11_std_tuple.cpp
diff --git a/docs/manual/build_system/cmake_variables.qbk b/docs/manual/build_system/cmake_variables.qbk
@@ -41,8 +41,6 @@ The options are split into these categories:
 * [link build_system.cmake_variables.HPX_RUN_MAIN_EVERYWHERE HPX_RUN_MAIN_EVERYWHERE]
 * [link build_system.cmake_variables.HPX_STATIC_LINKING HPX_STATIC_LINKING]
 * [link build_system.cmake_variables.HPX_UNIQUE_FUTURE_ALIAS HPX_UNIQUE_FUTURE_ALIAS]
-* [link build_system.cmake_variables.HPX_UTIL_FUNCTION HPX_UTIL_FUNCTION]
-* [link build_system.cmake_variables.HPX_UTIL_TUPLE HPX_UTIL_TUPLE]
 * [link build_system.cmake_variables.HPX_WAVE_ADDITIONAL_INCLUDE_DIRS HPX_WAVE_ADDITIONAL_INCLUDE_DIRS]
 * [link build_system.cmake_variables.HPX_WITH_BOOST_ALL_DYNAMIC_LINK HPX_WITH_BOOST_ALL_DYNAMIC_LINK]
 * [link build_system.cmake_variables.HPX_WITH_COMPRESSION_BZIP2 HPX_WITH_COMPRESSION_BZIP2]
@@ -69,8 +67,6 @@ The options are split into these categories:
         [[[#build_system.cmake_variables.HPX_RUN_MAIN_EVERYWHERE] `HPX_RUN_MAIN_EVERYWHERE:BOOL`][Run hpx_main by default on all localities (default: OFF).]]
         [[[#build_system.cmake_variables.HPX_STATIC_LINKING] `HPX_STATIC_LINKING:BOOL`][Compile HPX statically linked libraries (Default: OFF)]]
         [[[#build_system.cmake_variables.HPX_UNIQUE_FUTURE_ALIAS] `HPX_UNIQUE_FUTURE_ALIAS:BOOL`][HPX will defined unique_future<R> as a template alias to future<R>. (default OFF).]]
-        [[[#build_system.cmake_variables.HPX_UTIL_FUNCTION] `HPX_UTIL_FUNCTION:BOOL`][Use hpx::util::function instead of boost::function or std::function (default: ON)]]
-        [[[#build_system.cmake_variables.HPX_UTIL_TUPLE] `HPX_UTIL_TUPLE:BOOL`][Use hpx::util::tuple instead of boost::tuple or std::tuple (default: ON)]]
         [[[#build_system.cmake_variables.HPX_WAVE_ADDITIONAL_INCLUDE_DIRS] `HPX_WAVE_ADDITIONAL_INCLUDE_DIRS:STRING`][Additional (compiler specific) include directories for the wave preprocessing tool.]]
         [[[#build_system.cmake_variables.HPX_WITH_BOOST_ALL_DYNAMIC_LINK] `HPX_WITH_BOOST_ALL_DYNAMIC_LINK:BOOL`][Add BOOST_ALL_DYN_LINK to compile flags]]
         [[[#build_system.cmake_variables.HPX_WITH_COMPRESSION_BZIP2] `HPX_WITH_COMPRESSION_BZIP2:BOOL`][Enable bzip2 compression for parcel data (default: OFF).]]

diff --git a/examples/heartbeat/heartbeat.cpp b/examples/heartbeat/heartbeat.cpp
@@ -138,7 +138,7 @@ int main(int argc, char* argv[])
     std::vector<std::string> cfg;
     cfg.push_back("hpx.run_hpx_main!=1");
 
-    HPX_STD_FUNCTION<void()> const empty;
+    hpx::util::function_nonser<void()> const empty;
     return hpx::init(desc_commandline, argc, argv, cfg, empty, empty, hpx::runtime_mode_connect);
 }
 
diff --git a/examples/performance_counters/sine/sine.cpp b/examples/performance_counters/sine/sine.cpp
@@ -82,7 +82,7 @@ namespace performance_counters { namespace sine
     // function has been registered with.
     bool explicit_sine_counter_discoverer(
         hpx::performance_counters::counter_info const& info,
-        HPX_STD_FUNCTION<hpx::performance_counters::discover_counter_func> const& f,
+        hpx::performance_counters::discover_counter_func const& f,
         hpx::performance_counters::discover_counters_mode mode, hpx::error_code& ec)
     {
         hpx::performance_counters::counter_info i = info;
@@ -238,7 +238,7 @@ namespace performance_counters { namespace sine
     }
 
     ///////////////////////////////////////////////////////////////////////////
-    bool get_startup(HPX_STD_FUNCTION<void()>& startup_func, bool& pre_startup)
+    bool get_startup(hpx::util::function_nonser<void()>& startup_func, bool& pre_startup)
     {
         // check whether the performance counters need to be enabled
         if (!need_perf_counters()) {

diff --git a/examples/quickstart/fibonacci_futures.cpp b/examples/quickstart/fibonacci_futures.cpp
@@ -39,7 +39,7 @@ boost::uint64_t add(
 struct when_all_wrapper
 {
     typedef boost::uint64_t result_type;
-    typedef HPX_STD_TUPLE<
+    typedef hpx::util::tuple<
             hpx::future<boost::uint64_t>
           , hpx::future<boost::uint64_t> > data_type;
 
@@ -48,7 +48,7 @@ struct when_all_wrapper
     ) const
     {
         data_type v = data.get();
-        return HPX_STD_GET(0, v).get() + HPX_STD_GET(1, v).get();
+        return hpx::util::get<0>(v).get() + hpx::util::get<1>(v).get();
     }
 };
 

diff --git a/examples/quickstart/fibonacci_futures_distributed.cpp b/examples/quickstart/fibonacci_futures_distributed.cpp
@@ -36,7 +36,7 @@ hpx::id_type here;
 struct when_all_wrapper
 {
     typedef boost::uint64_t result_type;
-    typedef HPX_STD_TUPLE<
+    typedef hpx::util::tuple<
             hpx::lcos::future<boost::uint64_t>
           , hpx::lcos::future<boost::uint64_t> > data_type;
 
@@ -45,7 +45,7 @@ struct when_all_wrapper
     ) const
     {
         data_type v = data.get();
-        return HPX_STD_GET(0, v).get() + HPX_STD_GET(1, v).get();
+        return hpx::util::get<0>(v).get() + hpx::util::get<1>(v).get();
     }
 };
 

diff --git a/examples/quickstart/wait_composition.cpp b/examples/quickstart/wait_composition.cpp
@@ -12,7 +12,7 @@
 struct cout_continuation
 {
     typedef void result_type;
-    typedef HPX_STD_TUPLE<
+    typedef hpx::util::tuple<
             hpx::lcos::future<int>
           , hpx::lcos::future<int>
           , hpx::lcos::future<int> > data_type;
@@ -22,9 +22,9 @@ struct cout_continuation
     ) const
     {
         data_type v = data.get();
-        std::cout << HPX_STD_GET(0, v).get() << "\n";
-        std::cout << HPX_STD_GET(1, v).get() << "\n";
-        std::cout << HPX_STD_GET(2, v).get() << "\n";
+        std::cout << hpx::util::get<0>(v).get() << "\n";
+        std::cout << hpx::util::get<1>(v).get() << "\n";
+        std::cout << hpx::util::get<2>(v).get() << "\n";
     }
 };
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/examples/sheneos/sheneos/interpolator.cpp b/examples/sheneos/sheneos/interpolator.cpp
@@ -49,7 +49,7 @@ namespace sheneos
     }
 
     ///////////////////////////////////////////////////////////////////////////
-    bool get_shutdown(HPX_STD_FUNCTION<void()>& shutdown_func, bool& pre_shutdown)
+    bool get_shutdown(hpx::util::function_nonser<void()>& shutdown_func, bool& pre_shutdown)
     {
         shutdown_func = shutdown;
         pre_shutdown = false;       // run this as late as possible

diff --git a/examples/startup_shutdown/startup_shutdown.cpp b/examples/startup_shutdown/startup_shutdown.cpp
@@ -65,7 +65,7 @@ namespace startup_shutdown
     }
 
     ///////////////////////////////////////////////////////////////////////////
-    bool get_startup(HPX_STD_FUNCTION<void()>& startup_func, bool& pre_startup)
+    bool get_startup(hpx::util::function_nonser<void()>& startup_func, bool& pre_startup)
     {
         startup_func = startup;     // return our startup-function
         pre_startup = true;         // run 'startup' as pre-startup function

diff --git a/examples/throttle/throttle_client.cpp b/examples/throttle/throttle_client.cpp
@@ -94,7 +94,7 @@ int main(int argc, char* argv[])
     cfg.push_back("hpx.components.load_external=0");
     cfg.push_back("hpx.run_hpx_main!=1");
 
-    HPX_STD_FUNCTION<void()> const empty;
+    hpx::util::function_nonser<void()> const empty;
     return hpx::init(cmdline, argc, argv, cfg, empty, empty, hpx::runtime_mode_connect);
 }
 
diff --git a/hpx/components/iostreams/write_functions.hpp b/hpx/components/iostreams/write_functions.hpp
@@ -8,19 +8,20 @@
 #if !defined(HPX_B72D9BF0_B236_46F6_83AA_E45A70BD1FAA)
 #define HPX_B72D9BF0_B236_46F6_83AA_E45A70BD1FAA
 
+#include <hpx/util/bind.hpp>
+#include <hpx/util/function.hpp>
+
+#include <boost/ref.hpp>
+
 #include <ostream>
 #include <iterator>
 #include <algorithm>
 #include <deque>
 
-#include <boost/ref.hpp>
-#include <boost/bind.hpp>
-#include <boost/bind/placeholders.hpp>
-
 namespace hpx { namespace iostreams
 {
 
-typedef HPX_STD_FUNCTION<void(std::vector<char> const&)> write_function_type;
+typedef util::function_nonser<void(std::vector<char> const&)> write_function_type;
 
 ///////////////////////////////////////////////////////////////////////////////
 // Write function that works on STL OutputIterators
@@ -34,7 +35,8 @@ inline void iterator_write_function(std::vector<char> const& in, Iterator it)
 template <typename Iterator>
 inline write_function_type make_iterator_write_function(Iterator it)
 {
-    return boost::bind(iterator_write_function<Iterator>, _1, it);
+    return util::bind(iterator_write_function<Iterator>,
+        util::placeholders::_1, it);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -47,7 +49,8 @@ std_ostream_write_function(std::vector<char> const& in, std::ostream& os)
 // Factory function
 inline write_function_type make_std_ostream_write_function(std::ostream& os)
 {
-    return boost::bind(std_ostream_write_function, _1, boost::ref(os));
+    return util::bind(std_ostream_write_function,
+        util::placeholders::_1, boost::ref(os));
 }
 
 }}

diff --git a/hpx/components/security/certificate_store.hpp b/hpx/components/security/certificate_store.hpp
@@ -9,7 +9,6 @@
 #include <boost/optional.hpp>
 #include <hpx/hpx_fwd.hpp>
 #include <hpx/exception.hpp>
-#include <hpx/util/stringstream.hpp>
 #include <boost/format.hpp>
 
 #include <boost/noncopyable.hpp>
@@ -18,6 +17,8 @@
 #include "public_key.hpp"
 #include "signed_type.hpp"
 
+#include <sstream>
+
 namespace hpx { namespace components { namespace security
 {
     class certificate_store : private boost::noncopyable
@@ -73,7 +74,7 @@ namespace hpx { namespace components { namespace security
                 store_.find(certificate.get_issuer());
             if (issuer == store_.end())
             {
-                hpx::util::osstream oss;
+                std::ostringstream oss;
                 oss << boost::str(boost::format(
                     "The certificate issuer is unknown: %1%\n") % subject);
                 oss << "Known certificate subjects:\n";
@@ -87,7 +88,7 @@ namespace hpx { namespace components { namespace security
                 HPX_THROW_EXCEPTION(
                     hpx::security_error
                   , "certificate_store::insert"
-                  , hpx::util::osstream_get_string(oss)
+                  , oss.str()
                 )
             }
 
@@ -128,7 +129,7 @@ namespace hpx { namespace components { namespace security
 
             if (iterator == store_.end())
             {
-                hpx::util::osstream strm;
+                std::ostringstream strm;
                 strm << boost::str(boost::format(
                     "requesting a certificate for an unknown subject: %1%\n") %
                     subject);
@@ -143,7 +144,7 @@ namespace hpx { namespace components { namespace security
                 HPX_THROWS_IF(
                     ec, hpx::security_error
                   , "certificate_store::certificate_store"
-                  , hpx::util::osstream_get_string(strm)
+                  , strm.str()
                 );
 
                 return signed_type<certificate>::invalid_signed_type;

diff --git a/hpx/config.hpp b/hpx/config.hpp
@@ -554,36 +554,6 @@
 #  define HPX_STD_UNIQUE_PTR ::std::unique_ptr
 #endif
 
-///////////////////////////////////////////////////////////////////////////////
-// Use std::function if it's available and movable
-#if defined(HPX_UTIL_FUNCTION)
-#  define HPX_STD_FUNCTION ::hpx::util::function_nonser
-#else
-#if !defined(HPX_HAVE_CXX11_STD_FUNCTION)
-#  define HPX_STD_FUNCTION ::boost::function
-#else
-#  define HPX_STD_FUNCTION ::std::function
-#endif
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// Use std::tuple if it's available and movable
-#if defined(HPX_UTIL_TUPLE)
-#  define HPX_STD_TUPLE         ::hpx::util::tuple
-#  define HPX_STD_MAKE_TUPLE    ::hpx::util::make_tuple
-#  define HPX_STD_GET(N, c)     ::hpx::util::get<N>(c)
-#else
-#if !defined(HPX_HAVE_CXX11_STD_TUPLE)
-#  define HPX_STD_TUPLE         ::boost::tuple
-#  define HPX_STD_MAKE_TUPLE    ::boost::make_tuple
-#  define HPX_STD_GET(N, c)     ::boost::get<N>(c)
-#else
-#  define HPX_STD_TUPLE         ::std::tuple
-#  define HPX_STD_MAKE_TUPLE    ::std::make_tuple
-#  define HPX_STD_GET(N, c)     ::std::get<N>(c)
-#endif
-#endif
-
 ///////////////////////////////////////////////////////////////////////////////
 // Older Boost versions do not have BOOST_NOEXCEPT defined
 #if !defined(BOOST_NOEXCEPT)