From 863b6e0d3246a1db225675710c34adf45e63de3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= Date: Thu, 17 Aug 2017 23:58:58 +0200 Subject: [PATCH] - Remove wrong explicit default constructor for flat_[multi]set. - Add missing forceinline to flat_map --- include/boost/container/flat_map.hpp | 4 ++-- include/boost/container/flat_set.hpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/boost/container/flat_map.hpp b/include/boost/container/flat_map.hpp index 56f12ec..4ef95e6 100644 --- a/include/boost/container/flat_map.hpp +++ b/include/boost/container/flat_map.hpp @@ -199,8 +199,8 @@ class flat_map //! Effects: Default constructs an empty flat_map. //! //! Complexity: Constant. - flat_map() BOOST_NOEXCEPT_IF(container_detail::is_nothrow_default_constructible::value && - container_detail::is_nothrow_default_constructible::value) + BOOST_CONTAINER_FORCEINLINE flat_map() BOOST_NOEXCEPT_IF(container_detail::is_nothrow_default_constructible::value && + container_detail::is_nothrow_default_constructible::value) : m_flat_tree() {} diff --git a/include/boost/container/flat_set.hpp b/include/boost/container/flat_set.hpp index 9e39be8..064145c 100644 --- a/include/boost/container/flat_set.hpp +++ b/include/boost/container/flat_set.hpp @@ -127,8 +127,8 @@ class flat_set //! //! Complexity: Constant. BOOST_CONTAINER_FORCEINLINE - explicit flat_set() BOOST_NOEXCEPT_IF(container_detail::is_nothrow_default_constructible::value && - container_detail::is_nothrow_default_constructible::value) + flat_set() BOOST_NOEXCEPT_IF(container_detail::is_nothrow_default_constructible::value && + container_detail::is_nothrow_default_constructible::value) : base_t() {} @@ -1081,8 +1081,8 @@ class flat_multiset typedef typename BOOST_CONTAINER_IMPDEF(base_t::sequence_type) sequence_type; //! @copydoc ::boost::container::flat_set::flat_set() - BOOST_CONTAINER_FORCEINLINE explicit flat_multiset() BOOST_NOEXCEPT_IF(container_detail::is_nothrow_default_constructible::value && - container_detail::is_nothrow_default_constructible::value) + BOOST_CONTAINER_FORCEINLINE flat_multiset() BOOST_NOEXCEPT_IF(container_detail::is_nothrow_default_constructible::value && + container_detail::is_nothrow_default_constructible::value) : base_t() {}