... | ... |
@@ -43,16 +43,17 @@ |
43 | 43 |
public: |
44 | 44 |
/// The key type of the map. |
45 | 45 |
typedef K Key; |
46 | 46 |
/// The value type of the map. (The type of objects associated with the keys). |
47 | 47 |
typedef T Value; |
48 | 48 |
|
49 | 49 |
/// Returns the value associated with a key. |
50 | 50 |
|
51 |
/// Returns the value associated with a key. |
|
51 | 52 |
/// \bug Value shouldn't need to be default constructible. |
52 | 53 |
/// |
53 | 54 |
Value operator[](const Key &) const {return Value();} |
54 | 55 |
|
55 | 56 |
template<typename _ReadMap> |
56 | 57 |
struct Constraints { |
57 | 58 |
|
58 | 59 |
void constraints() { |
... | ... |
@@ -108,17 +109,17 @@ |
108 | 109 |
typename _WriteMap::Value own_val; |
109 | 110 |
Key& key; |
110 | 111 |
typename _WriteMap::Key& own_key; |
111 | 112 |
_WriteMap& m; |
112 | 113 |
|
113 | 114 |
}; |
114 | 115 |
}; |
115 | 116 |
|
116 |
/// Read/ |
|
117 |
/// Read/writable map concept |
|
117 | 118 |
|
118 | 119 |
/// Read/writable map concept. |
119 | 120 |
/// |
120 | 121 |
template<typename K, typename T> |
121 | 122 |
class ReadWriteMap : public ReadMap<K,T>, |
122 | 123 |
public WriteMap<K,T> |
123 | 124 |
{ |
124 | 125 |
public: |
... | ... |
@@ -141,16 +142,17 @@ |
141 | 142 |
}; |
142 | 143 |
}; |
143 | 144 |
|
144 | 145 |
|
145 | 146 |
/// Dereferable map concept |
146 | 147 |
|
147 | 148 |
/// Dereferable map concept. |
148 | 149 |
/// |
150 |
/// \todo Rethink this concept. |
|
149 | 151 |
template<typename K, typename T, typename R, typename CR> |
150 | 152 |
class ReferenceMap : public ReadWriteMap<K,T> |
151 | 153 |
{ |
152 | 154 |
public: |
153 | 155 |
/// Tag for reference maps. |
154 | 156 |
typedef True ReferenceMapTag; |
155 | 157 |
/// The key type of the map. |
156 | 158 |
typedef K Key; |
... | ... |
@@ -160,24 +162,23 @@ |
160 | 162 |
typedef R Reference; |
161 | 163 |
/// The const reference type of the map. |
162 | 164 |
typedef CR ConstReference; |
163 | 165 |
|
164 | 166 |
protected: |
165 | 167 |
Value tmp; |
166 | 168 |
public: |
167 | 169 |
|
168 |
///Returns a reference to the value associated |
|
170 |
///Returns a reference to the value associated with a key. |
|
169 | 171 |
Reference operator[](const Key &) { return tmp; } |
170 |
///Returns a const reference to the value associated |
|
172 |
///Returns a const reference to the value associated with a key. |
|
171 | 173 |
ConstReference operator[](const Key &) const { return tmp; } |
172 | 174 |
/// Sets the value associated with a key. |
173 | 175 |
void set(const Key &k,const Value &t) { operator[](k)=t; } |
174 | 176 |
|
175 |
/// \todo Rethink this concept. |
|
176 | 177 |
template<typename _ReferenceMap> |
177 | 178 |
struct ReferenceMapConcept { |
178 | 179 |
|
179 | 180 |
void constraints() { |
180 | 181 |
checkConcept<ReadWriteMap, _ReferenceMap >(); |
181 | 182 |
m[key] = val; |
182 | 183 |
val = m[key]; |
183 | 184 |
m[key] = ref; |
0 comments (0 inline)