diff options
| -rw-r--r-- | raul/PathTable.hpp | 6 | ||||
| -rw-r--r-- | raul/Table.hpp | 2 | ||||
| -rw-r--r-- | raul/TableImpl.hpp | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/raul/PathTable.hpp b/raul/PathTable.hpp index 90441ac..b842239 100644 --- a/raul/PathTable.hpp +++ b/raul/PathTable.hpp @@ -37,13 +37,15 @@ public: typename Table<Path, T>::iterator find_descendants_end( typename Table<Path, T>::iterator parent) { - return find_range_end(parent, &Path::descendant_comparator); + return Table<Path, T>::find_range_end(parent, + &Path::descendant_comparator); } typename Table<Path, T>::const_iterator find_descendants_end( typename Table<Path, T>::const_iterator parent) const { - return find_range_end(parent, &Path::descendant_comparator); + return Table<Path, T>::find_range_end(parent, + &Path::descendant_comparator); } }; diff --git a/raul/Table.hpp b/raul/Table.hpp index dd5c1d7..8c4f015 100644 --- a/raul/Table.hpp +++ b/raul/Table.hpp @@ -111,7 +111,7 @@ private: bool is_sorted() const; #endif - friend class iterator; + friend struct iterator; typedef std::pair<K, T> Entry; diff --git a/raul/TableImpl.hpp b/raul/TableImpl.hpp index e1ba32d..3f91f10 100644 --- a/raul/TableImpl.hpp +++ b/raul/TableImpl.hpp @@ -241,7 +241,7 @@ Table<K, T>::cram(const Table<K,T>& range) assert(is_sorted()); #endif - return make_pair(iterator(*this, insert_index), true); + return std::make_pair(iterator(*this, insert_index), true); } /** Add an item to the table, using \a entry.first as the search key. @@ -329,7 +329,7 @@ Table<K, T>::operator[](const K& key) if (i != end()) { return i->second; } else { - std::pair<iterator,bool> ret = insert(make_pair(key, T())); + std::pair<iterator,bool> ret = insert(std::make_pair(key, T())); return ret.first->second; } } |