Merge pull request #66 from Kojoley/partly-mitigate-bad-clang-inlinin…

…g-decision Partly mitigate bad Clang inlining decision
boostorg · May 9, 2019 · f34376e · f34376e
2 parents 15a846f + dd9b0c9
commit f34376e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/include/boost/variant/detail/visitation_impl.hpp b/include/boost/variant/detail/visitation_impl.hpp
@@ -190,7 +190,7 @@ template <
     , typename Visitor, typename VoidPtrCV
     , typename NoBackupFlag
     >
-inline typename Visitor::result_type
+BOOST_FORCEINLINE typename Visitor::result_type
 visitation_impl(
       const int internal_which, const int logical_which
     , Visitor& visitor, VoidPtrCV storage

diff --git a/include/boost/variant/variant.hpp b/include/boost/variant/variant.hpp
@@ -2315,7 +2315,7 @@ class variant
 #endif// !defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS)
 
     template <typename Visitor, typename VoidPtrCV>
-    static typename Visitor::result_type
+    BOOST_FORCEINLINE static typename Visitor::result_type
     internal_apply_visitor_impl(
           int internal_which
         , int logical_which
@@ -2340,7 +2340,7 @@ class variant
     }
 
     template <typename Visitor>
-    typename Visitor::result_type
+    BOOST_FORCEINLINE typename Visitor::result_type
     internal_apply_visitor(Visitor& visitor)
     {
         return internal_apply_visitor_impl(
@@ -2349,7 +2349,7 @@ class variant
     }
 
     template <typename Visitor>
-    typename Visitor::result_type
+    BOOST_FORCEINLINE typename Visitor::result_type
     internal_apply_visitor(Visitor& visitor) const
     {
         return internal_apply_visitor_impl(