adding unordered map, some cleanup

binary_archive/map.hpp

@@ -6,7 +6,7 @@
 
 namespace cereal
 {
-  //! Saving for std::map all other types to binary
+  //! Saving for std::map to binary
   template <class K, class T, class C, class A>
   void save( BinaryOutputArchive & ar, std::map<K, T, C, A> const & map )
   {
@@ -19,7 +19,7 @@ namespace cereal
     }
   }
 
-  //! Loading for std::map all other types to binary
+  //! Loading for std::map to binary
   template <class K, class T, class C, class A>
   void load( BinaryInputArchive & ar, std::map<K, T, C, A> & map )
   {
@@ -37,7 +37,7 @@ namespace cereal
     }
   }
 
-  //! Saving for std::multimap all other types to binary
+  //! Saving for std::multimap to binary
   template <class K, class T, class C, class A>
   void save( BinaryOutputArchive & ar, std::multimap<K, T, C, A> const & multimap )
   {
@@ -50,7 +50,7 @@ namespace cereal
     }
   }
 
-  //! Loading for std::multimap all other types to binary
+  //! Loading for std::multimap to binary
   template <class K, class T, class C, class A>
   void load( BinaryInputArchive & ar, std::multimap<K, T, C, A> & multimap )
   {

binary_archive/set.hpp

@@ -6,7 +6,7 @@
 
 namespace cereal
 {
-  //! Saving for std::set all other types to binary
+  //! Saving for std::set to binary
   template <class K, class H, class KE, class A>
   void save( BinaryOutputArchive & ar, std::set<K, H, KE, A> const & set )
   {
@@ -16,7 +16,7 @@ namespace cereal
       ar & i;
   }
 
-  //! Loading for std::set all other types to binary
+  //! Loading for std::set to binary
   template <class K, class H, class KE, class A>
   void load( BinaryInputArchive & ar, std::set<K, H, KE, A> & set )
   {
@@ -32,7 +32,7 @@ namespace cereal
     }
   }
 
-  //! Saving for std::multiset all other types to binary
+  //! Saving for std::multiset to binary
   template <class K, class H, class KE, class A>
   void save( BinaryOutputArchive & ar, std::multiset<K, H, KE, A> const & multiset )
   {
@@ -42,7 +42,7 @@ namespace cereal
       ar & i;
   }
 
-  //! Loading for std::multiset all other types to binary
+  //! Loading for std::multiset to binary
   template <class K, class H, class KE, class A>
   void load( BinaryInputArchive & ar, std::multiset<K, H, KE, A> & multiset )
   {

binary_archive/unordered_map.hpp

@@ -0,0 +1,76 @@
+#ifndef CEREAL_BINARY_ARCHIVE_UNORDERED_MAP_HPP_
+#define CEREAL_BINARY_ARCHIVE_UNORDERED_MAP_HPP_
+
+#include <cereal/binary_archive/binary_archive.hpp>
+#include <unordered_map>
+
+namespace cereal
+{
+  //! Saving for std::unordered_map to binary
+  template <class K, class T, class H, class KE, class A>
+  void save( BinaryOutputArchive & ar, std::unordered_map<K, T, H, KE, A> const & unordered_map )
+  {
+    ar & unordered_map.size();
+
+    for( const auto & i : unordered_map )
+    {
+      ar & i.first;
+      ar & i.second;
+    }
+  }
+
+  //! Loading for std::unordered_map to binary
+  template <class K, class T, class H, class KE, class A>
+  void load( BinaryInputArchive & ar, std::unordered_map<K, T, H, KE, A> & unordered_map )
+  {
+    size_t size;
+    ar & size;
+
+    unordered_map.reserve( size );
+
+    for( size_t i = 0; i < size; ++i )
+    {
+      K key;
+      T value;
+
+      ar & key;
+      ar & value;
+      unordered_map.insert( {key, value} );
+    }
+  }
+
+  //! Saving for std::unordered_multimap to binary
+  template <class K, class T, class H, class KE, class A>
+  void save( BinaryOutputArchive & ar, std::unordered_multimap<K, T, H, KE, A> const & unordered_multimap )
+  {
+    ar & unordered_multimap.size();
+
+    for( const auto & i : unordered_multimap )
+    {
+      ar & i.first;
+      ar & i.second;
+    }
+  }
+
+  //! Loading for std::unordered_multimap to binary
+  template <class K, class T, class H, class KE, class A>
+  void load( BinaryInputArchive & ar, std::unordered_multimap<K, T, H, KE, A> & unordered_multimap )
+  {
+    size_t size;
+    ar & size;
+
+    unordered_multimap.reserve( size );
+
+    for( size_t i = 0; i < size; ++i )
+    {
+      K key;
+      T value;
+
+      ar & key;
+      ar & value;
+      unordered_multimap.insert( {key, value} );
+    }
+  }
+} // namespace cereal
+
+#endif // CEREAL_BINARY_ARCHIVE_UNORDERED_MAP_HPP_

binary_archive/unordered_set.hpp

@@ -6,7 +6,7 @@
 
 namespace cereal
 {
-  //! Saving for std::unordered_set all other types to binary
+  //! Saving for std::unordered_set to binary
   template <class K, class H, class KE, class A>
   void save( BinaryOutputArchive & ar, std::unordered_set<K, H, KE, A> const & unordered_set )
   {
@@ -16,7 +16,7 @@ namespace cereal
       ar & i;
   }
 
-  //! Loading for std::unordered_set all other types to binary
+  //! Loading for std::unordered_set to binary
   template <class K, class H, class KE, class A>
   void load( BinaryInputArchive & ar, std::unordered_set<K, H, KE, A> & unordered_set )
   {
@@ -34,29 +34,31 @@ namespace cereal
     }
   }
 
-  //! Saving for std::unordered_multiset all other types to binary
+  //! Saving for std::unordered_multiset to binary
   template <class K, class H, class KE, class A>
   void save( BinaryOutputArchive & ar, std::unordered_multiset<K, H, KE, A> const & unordered_multiset )
   {
-    ar & multiset.size();
+    ar & unordered_multiset.size();
 
-    for( const auto & i : multiset )
+    for( const auto & i : unordered_multiset )
       ar & i;
   }
 
-  //! Loading for std::multiset all other types to binary
+  //! Loading for std::unordered_multiset to binary
   template <class K, class H, class KE, class A>
-  void load( BinaryInputArchive & ar, std::multiset<K, H, KE, A> & multiset )
+  void load( BinaryInputArchive & ar, std::unordered_multiset<K, H, KE, A> & unordered_multiset )
   {
     size_t size;
     ar & size;
 
+    unordered_multiset.reserve( size );
+
     for( size_t i = 0; i < size; ++i )
     {
       K key;
 
       ar & key;
-      multiset.insert( key );
+      unordered_multiset.insert( key );
     }
   }
 } // namespace cereal