diff --git a/include/boost/container/detail/compare_functors.hpp b/include/boost/container/detail/compare_functors.hpp index 6478418..a3e5dcb 100644 --- a/include/boost/container/detail/compare_functors.hpp +++ b/include/boost/container/detail/compare_functors.hpp @@ -32,11 +32,11 @@ class equal_to_value const value_type &t_; public: - explicit equal_to_value(const value_type &t) + BOOST_CONTAINER_FORCEINLINE explicit equal_to_value(const value_type &t) : t_(t) {} - bool operator()(const value_type &t)const + BOOST_CONTAINER_FORCEINLINE bool operator()(const value_type &t)const { return t_ == t; } }; @@ -47,28 +47,28 @@ struct value_to_node_compare typedef Pred predicate_type; typedef Node node_type; - value_to_node_compare() + BOOST_CONTAINER_FORCEINLINE value_to_node_compare() : Pred() {} - explicit value_to_node_compare(Pred pred) + BOOST_CONTAINER_FORCEINLINE explicit value_to_node_compare(Pred pred) : Pred(pred) {} - Ret operator()(const Node &a, const Node &b) const + BOOST_CONTAINER_FORCEINLINE Ret operator()(const Node &a, const Node &b) const { return static_cast(*this)(a.get_data(), b.get_data()); } - Ret operator()(const Node &a) const + BOOST_CONTAINER_FORCEINLINE Ret operator()(const Node &a) const { return static_cast(*this)(a.get_data()); } - Ret operator()(const Node &a, const Node &b) + BOOST_CONTAINER_FORCEINLINE Ret operator()(const Node &a, const Node &b) { return static_cast(*this)(a.get_data(), b.get_data()); } - Ret operator()(const Node &a) + BOOST_CONTAINER_FORCEINLINE Ret operator()(const Node &a) { return static_cast(*this)(a.get_data()); } - predicate_type & predicate() { return static_cast(*this); } - const predicate_type & predicate() const { return static_cast(*this); } + BOOST_CONTAINER_FORCEINLINE predicate_type & predicate() { return static_cast(*this); } + BOOST_CONTAINER_FORCEINLINE const predicate_type & predicate() const { return static_cast(*this); } }; template diff --git a/include/boost/container/detail/node_alloc_holder.hpp b/include/boost/container/detail/node_alloc_holder.hpp index b313730..e5d9e50 100644 --- a/include/boost/container/detail/node_alloc_holder.hpp +++ b/include/boost/container/detail/node_alloc_holder.hpp @@ -221,7 +221,7 @@ struct node_alloc_holder , ICont, hasher, dtl::nat3) intrusive_val_hasher; typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_DEFAULT (boost::container::dtl:: - , ICont, bucket_traits, dtl::natN<0>) intrusive_bucket_traits; + , ICont, bucket_traits, dtl::natN<0>) intrusive_bucket_traits; typedef BOOST_INTRUSIVE_OBTAIN_TYPE_WITH_DEFAULT (boost::container::dtl:: , ICont, bucket_type, dtl::natN<1>) intrusive_bucket_type; @@ -592,10 +592,10 @@ struct node_alloc_holder { return static_cast(*this); } public: - BOOST_CONTAINER_FORCEINLINE ICont &icont() + BOOST_CONTAINER_FORCEINLINE ICont &icont() { return this->m_icont; } - BOOST_CONTAINER_FORCEINLINE const ICont &icont() const + BOOST_CONTAINER_FORCEINLINE const ICont &icont() const { return this->m_icont; } private: