Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: compiled/StringMap.h

Issue 29677755: Issue 6279 - Make HashContainer movable and optimize resizing by moving entries. (Closed) Base URL: https://hg.adblockplus.org/adblockpluscore/
Patch Set: Remove unneeded ctor. Rename _assign() Created Jan. 24, 2018, 7:31 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « compiled/Map.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-present eyeo GmbH 3 * Copyright (C) 2006-present eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 }; 86 };
87 87
88 template<typename Key, typename Value> 88 template<typename Key, typename Value>
89 struct StringMapEntry : StringSetEntry<Key> 89 struct StringMapEntry : StringSetEntry<Key>
90 { 90 {
91 typedef StringSetEntry<Key> super; 91 typedef StringSetEntry<Key> super;
92 typedef Value value_type; 92 typedef Value value_type;
93 93
94 value_type second; 94 value_type second;
95 95
96 StringMapEntry& operator=(const StringMapEntry&) = default;
97 StringMapEntry& operator=(StringMapEntry&&) = default;
98
96 StringMapEntry(typename super::key_type_cref key = Key(), 99 StringMapEntry(typename super::key_type_cref key = Key(),
97 value_type value = value_type()) 100 value_type value = value_type())
98 : super(key), second(value) 101 : super(key), second(std::move(value))
99 { 102 {
100 } 103 }
101 104
102 void erase() 105 void erase()
103 { 106 {
104 super::erase(); 107 super::erase();
105 second = value_type(); 108 second = value_type();
106 } 109 }
107 }; 110 };
108 } 111 }
109 112
110 using StringSet = Set<StringMap_internal::StringSetEntry<DependentString>>; 113 using StringSet = Set<StringMap_internal::StringSetEntry<DependentString>>;
111 114
112 template<typename Value> 115 template<typename Value>
113 using StringMap = Map<StringMap_internal::StringMapEntry<DependentString, Value> >; 116 using StringMap = Map<StringMap_internal::StringMapEntry<DependentString, Value> >;
114 template<typename Value> 117 template<typename Value>
115 using OwnedStringMap = Map<StringMap_internal::StringMapEntry<OwnedString, Value >>; 118 using OwnedStringMap = Map<StringMap_internal::StringMapEntry<OwnedString, Value >>;
OLDNEW
« no previous file with comments | « compiled/Map.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld