From 90b2536a99ade12bcd0844049fd23c0f837ea1ed Mon Sep 17 00:00:00 2001 From: Christian Mazakas Date: Mon, 20 Jun 2022 10:53:00 -0700 Subject: [PATCH] Relace usage of `BOOST_FORCEINLINE` with plain `inline` to prevent warnings from certain versions of msvc --- include/boost/unordered/detail/implementation.hpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/include/boost/unordered/detail/implementation.hpp b/include/boost/unordered/detail/implementation.hpp index 51ea00ae..cec99c79 100644 --- a/include/boost/unordered/detail/implementation.hpp +++ b/include/boost/unordered/detail/implementation.hpp @@ -2449,13 +2449,8 @@ namespace boost { k, this->hash_function(), this->key_eq()); } -#if defined(BOOST_MSVC) -#pragma warning(push) -#pragma warning( \ - disable : 4714) // function 'function' marked as __forceinline not inlined -#endif template - BOOST_FORCEINLINE iterator transparent_find( + inline iterator transparent_find( Key const& k, Hash const& h, Pred const& pred) const { std::size_t const key_hash = h(k); @@ -2469,10 +2464,6 @@ namespace boost { return this->end(); } -#if defined(BOOST_MSVC) -#pragma warning(pop) -#endif - template node_pointer* find_prev(Key const& key, bucket_iterator itb) {