Support for move-only types in SmallMap.

base/containers/small_map.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BASE_CONTAINERS_SMALL_MAP_H_
 #define BASE_CONTAINERS_SMALL_MAP_H_
 
 #include <stddef.h>
 
 #include <map>
@@ skipping 499 matching lines @@
     size_ = 0;
   }
 
   // Invalidates iterators.
   void erase(const iterator& position) {
     if (size_ >= 0) {
       int i = position.array_iter_ - array_;
       array_[i].Destroy();
       --size_;
       if (i != size_) {
-        array_[i].Init(*array_[size_]);
+        array_[i].InitFromMove(std::move(array_[size_]));
         array_[size_].Destroy();
       }
     } else {
       map_->erase(position.hash_iter_);
     }
   }
 
   size_t erase(const key_type& key) {
     iterator iter = find(key);
     if (iter == end()) return 0u;
@@ skipping 56 matching lines @@
     ManualConstructor<value_type> dummy_;
     ManualConstructor<value_type> array_[kArraySize];
     ManualConstructor<NormalMap> map_;
   };
 
   void ConvertToRealMap() {
     // Move the current elements into a temporary array.
     ManualConstructor<value_type> temp_array[kArraySize];
 
     for (int i = 0; i < kArraySize; i++) {
-      temp_array[i].Init(*array_[i]);
+      temp_array[i].InitFromMove(std::move(array_[i]));
       array_[i].Destroy();
     }
 
     // Initialize the map.
     size_ = -1;
     functor_(&map_);
 
     // Insert elements into it.
     for (int i = 0; i < kArraySize; i++) {
-      map_->insert(*temp_array[i]);
+      map_->insert(std::move(*temp_array[i]));
       temp_array[i].Destroy();
     }
   }
 
   // Helpers for constructors and destructors.
   void InitFrom(const SmallMap& src) {
     functor_ = src.functor_;
     size_ = src.size_;
     if (src.size_ >= 0) {
       for (int i = 0; i < size_; i++) {
@@ skipping 26 matching lines @@
           typename Functor>
 inline bool SmallMap<NormalMap, kArraySize, EqualKey,
                      Functor>::iterator::operator!=(
     const const_iterator& other) const {
   return other != *this;
 }
 
 }  // namespace base
 
 #endif  // BASE_CONTAINERS_SMALL_MAP_H_