Test inserting and constructing from input iterators.

Check thrown exception types properly.
Return by reference from 'get_key' so that the keys aren't copied.


[SVN r3115]

test/helpers/helpers.hpp

@@ -13,26 +13,26 @@ namespace test
     {
         typedef typename Container::key_type key_type;
 
-        static key_type get_key(key_type const& x)
+        static key_type const& get_key(key_type const& x)
         {
             return x;
         }
 
         template <class T>
-        static key_type get_key(std::pair<key_type, T> const& x, char = 0)
+        static key_type const& get_key(std::pair<key_type, T> const& x, char = 0)
         {
             return x.first;
         }
 
         template <class T>
-        static key_type get_key(std::pair<key_type const, T> const& x, unsigned char = 0)
+        static key_type const& get_key(std::pair<key_type const, T> const& x, unsigned char = 0)
         {
             return x.first;
         }
     };
     
     template <class Container, class T>
-    inline typename Container::key_type get_key(T const& x)
+    inline typename Container::key_type const& get_key(T const& x)
     {
         return get_key_impl<Container>::get_key(x);
     }

test/helpers/input_iterator.hpp

@@ -0,0 +1,37 @@
+
+// Copyright 2005-2006 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#if !defined(BOOST_UNORDERED_TEST_HELPERS_INPUT_ITERATOR_HEADER)
+#define BOOST_UNORDERED_TEST_HELPERS_INPUT_ITERATOR_HEADER
+
+#include <boost/iterator_adaptors.hpp>
+#include <boost/shared_ptr.hpp>
+
+namespace test
+{
+    // TODO: Make this a stricter input iterator.
+    template <class Iterator>
+    struct input_iterator_adaptor
+        : boost::iterator_adaptor<
+            input_iterator_adaptor<Iterator>, Iterator,
+            boost::use_default, std::input_iterator_tag>
+    {
+        typedef boost::iterator_adaptor<
+            input_iterator_adaptor<Iterator>, Iterator,
+            boost::use_default, std::input_iterator_tag> base;
+
+        explicit input_iterator_adaptor(Iterator it = Iterator())
+            : base(it) {}
+    };
+
+    template <class Iterator>
+    input_iterator_adaptor<Iterator> input_iterator(Iterator it)
+    {
+        return input_iterator_adaptor<Iterator>(it);
+    }
+}
+
+#endif
+