Fixing #555: adding proper definition of BOOST_FORCEINLINE when using…

… older boost version
STEllAR-GROUP · Oct 1, 2012 · 8b3d51e · 8b3d51e
1 parent da3127f
commit 8b3d51e
Show file tree

Hide file tree

Showing 17 changed files with 41 additions and 5 deletions.
diff --git a/hpx/config.hpp b/hpx/config.hpp
@@ -11,6 +11,7 @@
 #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/preprocessor/add3.hpp>
 #include <hpx/config/preprocessor/round_up.hpp>
 #include <hpx/config/preprocessor/round_up_add3.hpp>

diff --git a/hpx/config/forceinline.hpp b/hpx/config/forceinline.hpp
@@ -0,0 +1,22 @@
+
+//  Copyright (c) 2012 Thomas Heller
+//
+//  Distributed under the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef HPX_CONFIG_FORCEINLINE_HPP
+#define HPX_CONFIG_FORCEINLINE_HPP
+
+#include <boost/config/suffix.hpp>
+
+#if !defined(BOOST_FORCEINLINE)
+#   if defined(_MSC_VER)
+#       define BOOST_FORCEINLINE __forceinline
+#   elif defined(__GNUC__) && __GNUC__ > 3
+#       define BOOST_FORCEIINLINE inline __attribute__ ((always_inline))
+#   else
+#   define BOOST_FORCEINLINE inline
+#   endif
+#endif
+
+#endif
diff --git a/hpx/lcos/detail/future_data.hpp b/hpx/lcos/detail/future_data.hpp
@@ -312,7 +312,7 @@ namespace hpx { namespace lcos { namespace detail
                         // invoke the callback (continuation) function
                         set_on_completed_ = false;
                         on_completed_(f);
-                        on_completed_.reset();
+                        on_completed_.clear();
                         return;
                     }
                 }
@@ -341,7 +341,7 @@ namespace hpx { namespace lcos { namespace detail
                     // invoke the callback (continuation) function
                     set_on_completed_ = false;
                     on_completed_(f);
-                    on_completed_.reset();
+                    on_completed_.clear();
                     return;
                 }
             }
@@ -419,7 +419,7 @@ namespace hpx { namespace lcos { namespace detail
                 // invoke the callback (continuation) function
                 on_completed_(f);
                 set_on_completed_ = false;
-                on_completed_.reset();
+                on_completed_.clear();
             }
             return retval;
         }

diff --git a/hpx/lcos/local/conditional_trigger.hpp b/hpx/lcos/local/conditional_trigger.hpp
@@ -55,7 +55,7 @@ namespace hpx { namespace lcos { namespace local
 
         void reset()
         {
-            cond_.reset();
+            cond_.clear();
         }
 
         /// \brief Trigger this object.

diff --git a/hpx/runtime/actions/component_action.hpp b/hpx/runtime/actions/component_action.hpp
@@ -506,7 +506,7 @@ namespace hpx { namespace actions
     /**/
 
 #define HPX_DEFINE_COMPONENT_ACTION_TPL(component, func, name)                \
-    typedef HPX_MAKE_COMPONENT_ACTION_TPL(component, func)::type name         \
+    typedef typename HPX_MAKE_COMPONENT_ACTION_TPL(component, func)::type name\
     /**/
 #define HPX_DEFINE_COMPONENT_CONST_ACTION_TPL(component, func, name)          \
     typedef HPX_MAKE_CONST_COMPONENT_ACTION_TPL(component, func)::type name   \

diff --git a/hpx/runtime/actions/component_action_implementations.hpp b/hpx/runtime/actions/component_action_implementations.hpp
@@ -9,6 +9,7 @@
 #if !defined(HPX_RUNTIME_ACTIONS_ACTION_IMPLEMENTATIONS_MAY_20_2008_1104AM)
 #define HPX_RUNTIME_ACTIONS_ACTION_IMPLEMENTATIONS_MAY_20_2008_1104AM
 
+#include <hpx/config/forceinline.hpp>
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/repeat.hpp>
 #include <boost/preprocessor/iterate.hpp>

diff --git a/hpx/runtime/actions/construct_continuation_function_objects.hpp b/hpx/runtime/actions/construct_continuation_function_objects.hpp
@@ -8,6 +8,7 @@
 #if !defined(HPX_RUNTIME_ACTIONS_CONSTRUCT_CONTINUATION_FUNCTION_OBJECTS_MAY_08_2012_0610PM)
 #define HPX_RUNTIME_ACTIONS_CONSTRUCT_CONTINUATION_FUNCTION_OBJECTS_MAY_08_2012_0610PM
 
+#include <hpx/config/forceinline.hpp>
 #include <hpx/util/move.hpp>
 #include <boost/fusion/include/size.hpp>
 #include <boost/type_traits/remove_reference.hpp>

diff --git a/hpx/runtime/actions/construct_continuation_functions.hpp b/hpx/runtime/actions/construct_continuation_functions.hpp
@@ -8,6 +8,7 @@
 #if !defined(HPX_RUNTIME_ACTIONS_CONSTRUCT_CONTINUATION_FUNCTION_FEB_22_2012_1143AM)
 #define HPX_RUNTIME_ACTIONS_CONSTRUCT_CONTINUATION_FUNCTION_FEB_22_2012_1143AM
 
+#include <hpx/config/forceinline.hpp>
 #include <hpx/util/move.hpp>
 
 #include <boost/preprocessor/cat.hpp>

diff --git a/hpx/runtime/actions/define_function_operators.hpp b/hpx/runtime/actions/define_function_operators.hpp
@@ -8,6 +8,7 @@
 #if !defined(HPX_RUNTIME_ACTIONS_FUNCTION_OPERATORS_MAY_09_2012_0420PM)
 #define HPX_RUNTIME_ACTIONS_FUNCTION_OPERATORS_MAY_09_2012_0420PM
 
+#include <hpx/config/forceinline.hpp>
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/iterate.hpp>
 #include <boost/preprocessor/enum_params.hpp>

diff --git a/hpx/runtime/actions/plain_action_implementations.hpp b/hpx/runtime/actions/plain_action_implementations.hpp
@@ -9,6 +9,7 @@
 #if !defined(HPX_RUNTIME_ACTIONS_PLAIN_ACTION_IMPLEMENTATIONS_NOV_14_2008_0811PM)
 #define HPX_RUNTIME_ACTIONS_PLAIN_ACTION_IMPLEMENTATIONS_NOV_14_2008_0811PM
 
+#include <hpx/config/forceinline.hpp>
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/repeat.hpp>
 #include <boost/preprocessor/iterate.hpp>

diff --git a/hpx/util/bind_action.hpp b/hpx/util/bind_action.hpp
@@ -10,6 +10,7 @@
 #define HPX_UTIL_BIND_ACTION_HPP
 
 #include <hpx/hpx_fwd.hpp>
+#include <hpx/config.hpp>
 #include <hpx/util/move.hpp>
 #include <hpx/util/tuple.hpp>
 #include <hpx/util/detail/remove_reference.hpp>

diff --git a/hpx/util/coroutine/detail/context_generic_context.hpp b/hpx/util/coroutine/detail/context_generic_context.hpp
@@ -20,6 +20,7 @@
 #include <boost/context/all.hpp>
 #include <boost/noncopyable.hpp>
 
+#include <hpx/config/forecinline.hpp>
 #include <hpx/util/coroutine/exception.hpp>
 #include <hpx/util/coroutine/detail/swap_context.hpp>
 

diff --git a/hpx/util/coroutine/detail/context_linux_x86.hpp b/hpx/util/coroutine/detail/context_linux_x86.hpp
@@ -23,6 +23,7 @@
 #include <boost/assert.hpp>
 #include <boost/detail/atomic_count.hpp>
 
+#include <hpx/config/forceinline.hpp>
 #include <hpx/util/coroutine/detail/config.hpp>
 #include <hpx/util/coroutine/detail/posix_utility.hpp>
 #include <hpx/util/coroutine/detail/swap_context.hpp>

diff --git a/hpx/util/coroutine/detail/context_windows_fibers.hpp b/hpx/util/coroutine/detail/context_windows_fibers.hpp
@@ -41,6 +41,7 @@
 #include <boost/system/error_code.hpp>
 #include <boost/cstdint.hpp>
 #include <boost/detail/atomic_count.hpp>
+#include <hpx/config/forceinline.hpp>
 #include <hpx/util/coroutine/detail/config.hpp>
 #include <hpx/util/coroutine/exception.hpp>
 #include <hpx/util/coroutine/detail/swap_context.hpp>

diff --git a/hpx/util/detail/function_template.hpp b/hpx/util/detail/function_template.hpp
@@ -9,6 +9,8 @@
 #ifndef HPX_UTIL_FUNCTION_TEMPLATE_HPP
 #define HPX_UTIL_FUNCTION_TEMPLATE_HPP
 
+#include <hpx/config/forceinline.hpp>
+
 #include <boost/preprocessor/iteration/iterate.hpp>
 #include <boost/preprocessor/repetition/enum_params.hpp>
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>

diff --git a/hpx/util/detail/get_table.hpp b/hpx/util/detail/get_table.hpp
@@ -8,6 +8,7 @@
 #ifndef HPX_FUNCTION_DETAIL_GET_TABLE_HPP
 #define HPX_FUNCTION_DETAIL_GET_TABLE_HPP
 
+#include <hpx/config/forceinline.hpp>
 #include <boost/detail/sp_typeinfo.hpp>
 #include <boost/preprocessor/iteration/iterate.hpp>
 #include <boost/preprocessor/repetition/enum_params.hpp>

diff --git a/hpx/util/detail/vtable.hpp b/hpx/util/detail/vtable.hpp
@@ -8,6 +8,7 @@
 #ifndef HPX_FUNCTION_DETAIL_VTABLE_HPP
 #define HPX_FUNCTION_DETAIL_VTABLE_HPP
 
+#include <hpx/config/forceinline.hpp>
 #include <boost/ref.hpp>
 #include <boost/detail/sp_typeinfo.hpp>
 #include <boost/preprocessor/iteration/iterate.hpp>