Merge pull request #1808 from STEllAR-GROUP/fixing_1723

Fixing #1723
STEllAR-GROUP · Oct 23, 2015 · 6c21cef · 6c21cef
2 parents f2c8642 + aa6224c
commit 6c21cef
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/docs/manual/build_system/prerequisites.qbk b/docs/manual/build_system/prerequisites.qbk
@@ -73,6 +73,11 @@ favorite compiler with __hpx__ visit __stellar_hpx_buildbot__.
       for compiling __hpx__ if you use gcc V4.6.x. Please use either
       an earlier or a later version of Boost with this compiler.]
 
+[important When compiling with the Intel Compiler on Linux systems, we only support
+  C++ Standard Libraries provided by gcc 4.6 and upwards. If the 'g++' in your
+  path is older than 4.6, please specify the path of a newer g++ by setting
+  CMAKE_CXX_FLAGS='-gxx-name=/path/to/g++' via cmake.]
+
 [table Software Prerequisites for __hpx__ on Windows systems
     [[Name                       ][Recommended Version][Minimum Version ][Notes]]
 

diff --git a/hpx/parallel/executors/executor_information_traits.hpp b/hpx/parallel/executors/executor_information_traits.hpp
@@ -211,6 +211,4 @@ namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v3)
     };
 }}}
 
-#undef HPX_ENABLE_WORKAROUND_FOR_GCC46
-
 #endif
diff --git a/hpx/runtime/serialization/serialization_fwd.hpp b/hpx/runtime/serialization/serialization_fwd.hpp
@@ -10,8 +10,7 @@
 #include <hpx/config.hpp>
 #include <hpx/util/detail/pp_strip_parens.hpp>
 
-#if defined(HPX_INTEL_VERSION) && ((__GNUC__ == 4 && __GNUC_MINOR__ == 4) \
-           || HPX_INTEL_VERSION < 1400)
+#if defined(HPX_INTEL_VERSION) && (HPX_INTEL_VERSION < 1400)
 #include <boost/shared_ptr.hpp>
 #else
 #include <memory>
@@ -24,8 +23,7 @@ namespace hpx { namespace serialization
     namespace detail
     {
         struct ptr_helper;
-#if defined(HPX_INTEL_VERSION) && ((__GNUC__ == 4 && __GNUC_MINOR__ == 4) \
-           || HPX_INTEL_VERSION < 1400)
+#if defined(HPX_INTEL_VERSION) && (HPX_INTEL_VERSION < 1400)
         typedef boost::shared_ptr<ptr_helper> ptr_helper_ptr;
 #else
         typedef std::unique_ptr<ptr_helper> ptr_helper_ptr;

diff --git a/hpx/traits/get_remote_result.hpp b/hpx/traits/get_remote_result.hpp
@@ -34,17 +34,11 @@ namespace hpx { namespace traits
         {
             return rhs;
         }
-#if __GNUC__ == 4 && __GNUC_MINOR__ == 4
-        static Result&& call(Result&& rhs)
-        {
-            return rhs;
-        }
-#else
+
         static Result && call(Result && rhs)
         {
             return std::move(rhs);
         }
-#endif
     };
 }}