Revert "Merge pull request STEllAR-GROUP#1735 from STEllAR-GROUP/conf…

…ig-includes" This reverts commit 2d5c62b, reversing changes made to 01a8ff0.
K-ballo · Aug 29, 2015 · a3a9d96 · a3a9d96
1 parent 2d5c62b
commit a3a9d96
Show file tree

Hide file tree

Showing 41 changed files with 473 additions and 280 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -688,9 +688,6 @@ hpx_check_for_cxx11_explicit_cvt_ops(
 hpx_check_for_cxx11_function_template_default_args(
   REQUIRED "HPX needs support for C++11 defaulted function template arguments")
 
-hpx_check_for_cxx11_initializer_list(
-  DEFINITIONS HPX_HAVE_CXX11_INITIALIZER_LIST)
-
 hpx_check_for_cxx11_inline_namespaces(
   DEFINITIONS HPX_HAVE_CXX11_INLINE_NAMESPACES)
 
@@ -731,18 +728,12 @@ hpx_check_for_cxx11_std_chrono(
 hpx_check_for_cxx11_std_initializer_list(
   DEFINITIONS HPX_HAVE_CXX11_STD_INITIALIZER_LIST)
 
-hpx_check_for_cxx11_std_is_bind_expression(
-  DEFINITIONS HPX_HAVE_CXX11_STD_IS_BIND_EXPRESSION)
-
 hpx_check_for_cxx11_std_is_final(
   DEFINITIONS HPX_HAVE_CXX11_STD_IS_FINAL)
 
 hpx_check_for_cxx11_std_is_null_pointer(
   DEFINITIONS HPX_HAVE_CXX11_STD_IS_NULL_POINTER)
 
-hpx_check_for_cxx11_std_is_placeholder(
-  DEFINITIONS HPX_HAVE_CXX11_STD_IS_PLACEHOLDER)
-
 hpx_check_for_cxx11_std_unique_ptr(
   REQUIRED "HPX needs support for C++11 std::unique_ptr")
 

diff --git a/cmake/HPX_AddConfigTest.cmake b/cmake/HPX_AddConfigTest.cmake
@@ -176,13 +176,6 @@ macro(hpx_check_for_cxx11_function_template_default_args)
     FILE ${ARGN})
 endmacro()
 
-###############################################################################
-macro(hpx_check_for_cxx11_initializer_list)
-  add_hpx_config_test(HPX_WITH_CXX11_INITIALIZER_LIST
-    SOURCE cmake/tests/cxx11_initializer_list.cpp
-    FILE ${ARGN})
-endmacro()
-
 ###############################################################################
 macro(hpx_check_for_cxx11_inline_namespaces)
   add_hpx_config_test(HPX_WITH_CXX11_INLINE_NAMESPACES
@@ -260,13 +253,6 @@ macro(hpx_check_for_cxx11_std_chrono)
     FILE ${ARGN})
 endmacro()
 
-###############################################################################
-macro(hpx_check_for_cxx11_std_is_bind_expression)
-  add_hpx_config_test(HPX_WITH_CXX11_IS_BIND_EXPRESSION
-    SOURCE cmake/tests/cxx11_std_is_bind_expression.cpp
-    FILE ${ARGN})
-endmacro()
-
 ###############################################################################
 macro(hpx_check_for_cxx11_std_is_final)
   add_hpx_config_test(HPX_WITH_CXX11_IS_FINAL
@@ -281,13 +267,6 @@ macro(hpx_check_for_cxx11_std_is_null_pointer)
     FILE ${ARGN})
 endmacro()
 
-###############################################################################
-macro(hpx_check_for_cxx11_std_is_placeholder)
-  add_hpx_config_test(HPX_WITH_CXX11_IS_PLACEHOLDER
-    SOURCE cmake/tests/cxx11_std_is_placeholder.cpp
-    FILE ${ARGN})
-endmacro()
-
 ###############################################################################
 macro(hpx_check_for_cxx11_std_initializer_list)
   add_hpx_config_test(HPX_WITH_CXX11_STD_INITIALIZER_LIST

diff --git a/cmake/tests/cxx11_initializer_list.cpp b/cmake/tests/cxx11_initializer_list.cpp
diff --git a/cmake/tests/cxx11_std_is_bind_expression.cpp b/cmake/tests/cxx11_std_is_bind_expression.cpp
diff --git a/cmake/tests/cxx11_std_is_placeholder.cpp b/cmake/tests/cxx11_std_is_placeholder.cpp
diff --git a/docs/release_procedure.rst b/docs/release_procedure.rst
@@ -66,7 +66,7 @@ Note: If you are using commandline git to change branches use:
 #.  Checkout the main branch, and bump the HPX version to the next release
     target. The following files contain version info:
 
-    *   ``hpx/config/version.hpp``
+    *   ``hpx/version.hpp``
     *   ``docs/hpx.qbk``
     *   ``CMakeLists.txt``
     *   Grep for old version number
@@ -76,7 +76,7 @@ Note: If you are using commandline git to change branches use:
     lines 262/263.
 
 #.  Checkout the release branch, and remove the ``-trunk`` tag from
-    ``hpx/config/version.hpp`` (replace it with ``-rc1`` for the release
+    ``hpx/version.hpp`` (replace it with ``-rc1`` for the release candidate
     and later with an empty string for the actual release).
 
 #.  Change logo for release documentation by removing '_draft' suffix 

diff --git a/hpx/config.hpp b/hpx/config.hpp
@@ -15,14 +15,13 @@
 #endif
 
 #include <hpx/config/defines.hpp>
-#include <hpx/config/version.hpp>
+#include <hpx/version.hpp>
 #include <hpx/config/compiler_specific.hpp>
 #include <hpx/config/branch_hints.hpp>
 #include <hpx/config/manual_profiling.hpp>
 #include <hpx/config/forceinline.hpp>
 #include <hpx/config/constexpr.hpp>
-
-#include <boost/version.hpp>
+#include <hpx/config/cxx11_macros.hpp>
 
 #if BOOST_VERSION < 105600
 #include <boost/exception/detail/attribute_noreturn.hpp>
@@ -535,4 +534,7 @@
 #  endif
 #endif
 
+///////////////////////////////////////////////////////////////////////////////
+#include <hpx/config/defaults.hpp>
+
 #endif