Issue 6279 - Make HashContainer movable and optimize resizing by moving entries.

compiled/StringMap.h

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 35 matching lines @@
   template<typename Key,
     class = typename std::enable_if<std::is_base_of<String, Key>::value>::type>
   struct StringSetEntry
   {
     typedef Key key_type;
     typedef const String& key_type_cref;
     typedef size_t size_type;
 
     key_type first;
 
+    StringSetEntry& operator=(const StringSetEntry&) = default;
+    StringSetEntry& operator=(StringSetEntry&&) = default;

[sergei, 2018/01/24 18:37:12]

It seems it's actually not required here and in StringMapEntry, because at least
all requirements for implicitly generated constructor and assignment operator
are satisfied.
http://en.cppreference.com/w/cpp/language/copy_assignment and others.

[hub, 2018/01/24 19:32:01]

ah right.

Done

[sergei, 2018/01/25 10:55:07]

Could you please also do it for StringMapEntry below?

[hub, 2018/01/25 15:11:11]

Done.

(I was convinced they were needed, must have been a side effect, done now)

+
     StringSetEntry(key_type_cref key = key_type())
     {
       if (!key.is_invalid())
         first.reset(key);
     }
 
     bool equals(key_type_cref other) const
     {
       return first.equals(other);
     }
@@ skipping 20 matching lines @@
   };
 
   template<typename Key, typename Value>
   struct StringMapEntry : StringSetEntry<Key>
   {
     typedef StringSetEntry<Key> super;
     typedef Value value_type;
 
     value_type second;
 
+    StringMapEntry& operator=(const StringMapEntry&) = default;
+    StringMapEntry& operator=(StringMapEntry&&) = default;
+
     StringMapEntry(typename super::key_type_cref key = Key(),
                    value_type value = value_type())
-        : super(key), second(value)
+       : super(key), second(std::move(value))
     {
     }
 
     void erase()
     {
       super::erase();
       second = value_type();
     }
   };
 }
 
 using StringSet = Set<StringMap_internal::StringSetEntry<DependentString>>;
 
 template<typename Value>
 using StringMap = Map<StringMap_internal::StringMapEntry<DependentString, Value>>;
 template<typename Value>
 using OwnedStringMap = Map<StringMap_internal::StringMapEntry<OwnedString, Value>>;