Merge remote-tracking branch 'origin/develop'

include/boost/unordered/detail/allocate.hpp

@@ -1118,10 +1118,19 @@ BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(10, boost::)
             boost::unordered::detail::func::const_cast_pointer(
                 boost::addressof(address->first)),
             boost::forward<A1>(a1));
-        boost::unordered::detail::func::construct_from_tuple(alloc,
+        BOOST_TRY {
-            boost::unordered::detail::func::const_cast_pointer(
+            boost::unordered::detail::func::construct_from_tuple(alloc,
-                boost::addressof(address->second)),
+                boost::unordered::detail::func::const_cast_pointer(
-            boost::forward<A2>(a2));
+                    boost::addressof(address->second)),
+                boost::forward<A2>(a2));
+        }
+        BOOST_CATCH(...) {
+            boost::unordered::detail::func::call_destroy(alloc,
+                boost::unordered::detail::func::const_cast_pointer(
+                    boost::addressof(address->first)));
+            BOOST_RETHROW;
+        }
+        BOOST_CATCH_END
     }
 
 #else // BOOST_NO_CXX11_VARIADIC_TEMPLATES
@@ -1194,10 +1203,19 @@ BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(10, boost::)
             boost::unordered::detail::func::const_cast_pointer(
                 boost::addressof(address->first)),
             args.a1);
-        boost::unordered::detail::func::construct_from_tuple(alloc,
+        BOOST_TRY {
-            boost::unordered::detail::func::const_cast_pointer(
+            boost::unordered::detail::func::construct_from_tuple(alloc,
-                boost::addressof(address->second)),
+                boost::unordered::detail::func::const_cast_pointer(
-            args.a2);
+                    boost::addressof(address->second)),
+                args.a2);
+        }
+        BOOST_CATCH(...) {
+            boost::unordered::detail::func::call_destroy(alloc,
+                boost::unordered::detail::func::const_cast_pointer(
+                    boost::addressof(address->first)));
+            BOOST_RETHROW;
+        }
+        BOOST_CATCH_END
     }
 
 #endif // BOOST_NO_CXX11_VARIADIC_TEMPLATES
@@ -1362,9 +1380,18 @@ namespace boost { namespace unordered { namespace detail { namespace func {
                 boost::unordered::detail::func::const_cast_pointer(
                     boost::addressof(a.node_->value_ptr()->first)),
                 boost::forward<Key>(k));
-        boost::unordered::detail::func::call_construct(alloc,
+        BOOST_TRY {
+            boost::unordered::detail::func::call_construct(alloc,
+                    boost::unordered::detail::func::const_cast_pointer(
+                        boost::addressof(a.node_->value_ptr()->second)));
+        }
+        BOOST_CATCH(...) {
+            boost::unordered::detail::func::call_destroy(alloc,
                 boost::unordered::detail::func::const_cast_pointer(
-                    boost::addressof(a.node_->value_ptr()->second)));
+                    boost::addressof(a.node_->value_ptr()->first)));
+            BOOST_RETHROW;
+        }
+        BOOST_CATCH_END
         return a.release();
     }
 
@@ -1378,10 +1405,19 @@ namespace boost { namespace unordered { namespace detail { namespace func {
                 boost::unordered::detail::func::const_cast_pointer(
                     boost::addressof(a.node_->value_ptr()->first)),
                 boost::forward<Key>(k));
-        boost::unordered::detail::func::call_construct(alloc,
+        BOOST_TRY {
+            boost::unordered::detail::func::call_construct(alloc,
+                    boost::unordered::detail::func::const_cast_pointer(
+                        boost::addressof(a.node_->value_ptr()->second)),
+                    boost::forward<Mapped>(m));
+        }
+        BOOST_CATCH(...) {
+            boost::unordered::detail::func::call_destroy(alloc,
                 boost::unordered::detail::func::const_cast_pointer(
-                    boost::addressof(a.node_->value_ptr()->second)),
+                    boost::addressof(a.node_->value_ptr()->first)));
-                boost::forward<Mapped>(m));
+            BOOST_RETHROW;
+        }
+        BOOST_CATCH_END
         return a.release();
     }
 }}}}

test/exception/containers.hpp

@@ -31,5 +31,17 @@ typedef boost::unordered_multimap<
     test::exception::hash,
     test::exception::equal_to,
     test::exception::allocator<test::exception::object> > test_multimap;
+typedef boost::unordered_set<
+    std::pair<test::exception::object, test::exception::object>,
+    test::exception::hash,
+    test::exception::equal_to,
+    test::exception::allocator<test::exception::object> > test_pair_set;
+typedef boost::unordered_multiset<
+    std::pair<test::exception::object, test::exception::object>,
+    test::exception::hash,
+    test::exception::equal_to,
+    test::exception::allocator2<test::exception::object> > test_pair_multiset;
+
 
 #define CONTAINER_SEQ (test_set)(test_multiset)(test_map)(test_multimap)
+#define CONTAINER_PAIR_SEQ (test_pair_set)(test_pair_multiset)(test_map)(test_multimap)

test/exception/insert_exception_tests.cpp

@@ -243,6 +243,62 @@ struct insert_test_rehash3 : public insert_test_base<T>
 #define ALL_TESTS BASIC_TESTS
 #endif
 
-
 EXCEPTION_TESTS(ALL_TESTS, CONTAINER_SEQ)
+
+template <class T>
+struct pair_emplace_test1 : public insert_test_base<T>
+{
+    typedef BOOST_DEDUCED_TYPENAME insert_test_base<T>::strong_type strong_type;
+
+    void run(T& x, strong_type& strong) const {
+        for(BOOST_DEDUCED_TYPENAME test::random_values<T>::const_iterator
+            it = this->values.begin(), end = this->values.end();
+            it != end; ++it)
+        {
+            strong.store(x, test::detail::tracker.count_allocations);
+            x.emplace(boost::unordered::piecewise_construct,
+                boost::make_tuple(it->first),
+                boost::make_tuple(it->second));
+        }
+    }
+};
+
+template <class T>
+struct pair_emplace_test2 : public insert_test_base<T>
+{
+    typedef BOOST_DEDUCED_TYPENAME insert_test_base<T>::strong_type strong_type;
+
+    void run(T& x, strong_type& strong) const {
+        for(BOOST_DEDUCED_TYPENAME test::random_values<T>::const_iterator
+            it = this->values.begin(), end = this->values.end();
+            it != end; ++it)
+        {
+            strong.store(x, test::detail::tracker.count_allocations);
+            x.emplace(boost::unordered::piecewise_construct,
+                boost::make_tuple(it->first),
+                boost::make_tuple(it->second.tag1_, it->second.tag2_));
+        }
+    }
+};
+
+EXCEPTION_TESTS((pair_emplace_test1)(pair_emplace_test2), CONTAINER_PAIR_SEQ)
+
+template <class T>
+struct index_insert_test1 : public insert_test_base<T>
+{
+    typedef BOOST_DEDUCED_TYPENAME insert_test_base<T>::strong_type strong_type;
+
+    void run(T& x, strong_type& strong) const {
+        for(BOOST_DEDUCED_TYPENAME test::random_values<T>::const_iterator
+            it = this->values.begin(), end = this->values.end();
+            it != end; ++it)
+        {
+            strong.store(x, test::detail::tracker.count_allocations);
+            x[it->first];
+        }
+    }
+};
+
+EXCEPTION_TESTS((index_insert_test1), (test_map))
+
 RUN_TESTS()

test/helpers/exception_test.hpp

@@ -7,6 +7,7 @@
 #define BOOST_UNORDERED_EXCEPTION_TEST_HEADER
 
 #include "./test.hpp"
+#include "./count.hpp"
 
 #include <boost/preprocessor/seq/for_each_product.hpp>
 #include <boost/preprocessor/seq/elem.hpp>
@@ -187,6 +188,7 @@ namespace test {
         test_runner(Test const& t) : test_(t), exception_in_check_(false) {}
         void run() {
             DISABLE_EXCEPTIONS;
+            test::check_instances check;
             test::scope = "";
             BOOST_DEDUCED_TYPENAME Test::data_type x(test_.init());
             BOOST_DEDUCED_TYPENAME Test::strong_type strong;

test/objects/exception.hpp

@@ -13,6 +13,7 @@
 #include <boost/limits.hpp>
 #include <new>
 #include "../helpers/fwd.hpp"
+#include "../helpers/count.hpp"
 #include "../helpers/memory.hpp"
 
 namespace test
@@ -24,6 +25,7 @@ namespace exception
     class equal_to;
     template <class T> class allocator;
     object generate(object const*, random_generator);
+    std::pair<object, object> generate(std::pair<object, object> const*, random_generator);
 
     struct true_type
     {
@@ -35,7 +37,7 @@ namespace exception
         enum { value = false };
     };
 
-    class object
+    class object : private counted_object
     {
     public:
         int tag1_, tag2_;
@@ -55,7 +57,7 @@ namespace exception
         }
 
         object(object const& x)
-             : tag1_(x.tag1_), tag2_(x.tag2_)
+             : counted_object(x), tag1_(x.tag1_), tag2_(x.tag2_)
         {
             UNORDERED_SCOPE(object::object(object)) {
                 UNORDERED_EPOINT("Mock object copy constructor.");
@@ -106,6 +108,13 @@ namespace exception
             return object(::test::generate(x, g), ::test::generate(x, g));
         }
 
+        friend std::pair<object, object> generate(std::pair<object, object> const*, random_generator g) {
+            int* x = 0;
+            return std::make_pair(
+                object(::test::generate(x, g), ::test::generate(x, g)),
+                object(::test::generate(x, g), ::test::generate(x, g)));
+        }
+
         friend std::ostream& operator<<(std::ostream& out, object const& o)
         {
             return out<<"("<<o.tag1_<<","<<o.tag2_<<")";
@@ -146,6 +155,18 @@ namespace exception
                 UNORDERED_EPOINT("Mock hash function.");
             }
 
+            return hash_impl(x);
+        }
+
+        std::size_t operator()(std::pair<object, object> const& x) const {
+            UNORDERED_SCOPE(hash::operator()(std::pair<object, object>)) {
+                UNORDERED_EPOINT("Mock hash pair function.");
+            }
+
+            return hash_impl(x.first) * 193ul + hash_impl(x.second) * 97ul + 29ul;
+        }
+
+        std::size_t hash_impl(object const& x) const {
             int result;
             switch(tag_) {
             case 1:
@@ -209,6 +230,18 @@ namespace exception
                 UNORDERED_EPOINT("Mock equal_to function.");
             }
 
+            return equal_impl(x1, x2);
+        }
+
+        bool operator()(std::pair<object, object> const& x1, std::pair<object, object> const& x2) const {
+            UNORDERED_SCOPE(equal_to::operator()(std::pair<object, object>, std::pair<object, object>)) {
+                UNORDERED_EPOINT("Mock equal_to function.");
+            }
+
+            return equal_impl(x1.first, x2.first) && equal_impl(x1.second, x2.second);
+        }
+
+        bool equal_impl(object const& x1, object const& x2) const {
             switch(tag_) {
             case 1:
                 return x1.tag1_ == x2.tag1_;
@@ -596,6 +629,11 @@ namespace test
         random_generator g) {
         return test::exception::generate(x, g);
     }
+
+    std::pair<test::exception::object, test::exception::object> generate(std::pair<test::exception::object, test::exception::object> const* x,
+        random_generator g) {
+        return test::exception::generate(x, g);
+    }
 }
 #endif