Changeset 987:87f7c54892df in lemon-0.x for src/lemon/maps.h

Timestamp:

11/13/04 18:07:10 (19 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1377

Message:

Naming changes:

• ValueType? -> Value
• KeyType? -> Key
• ReferenceType? ->Reference
• PointerType? -> Pointer

File:

• src/lemon/maps.h (modified) (3 diffs)

src/lemon/maps.h

@@ -37 +37 @@
   public:
     ///\e
-    typedef K KeyType;
+    typedef K Key;
     ///\e
-    typedef T ValueType;
+    typedef T Value;
   };
 
@@ -109 +109 @@
 
   /// This is essentially a wrapper for \c std::map. With addition that
-  /// you can specify a default value different from \c ValueType() .
+  /// you can specify a default value different from \c Value() .
   ///
   /// \todo Provide allocator parameter...
-  template <typename Key, typename T, typename Compare = std::less<Key> >
-  class StdMap : public std::map<Key,T,Compare> {
-    typedef std::map<Key,T,Compare> parent;
+  template <typename K, typename T, typename Compare = std::less<K> >
+  class StdMap : public std::map<K,T,Compare> {
+    typedef std::map<K,T,Compare> parent;
     T v;
     typedef typename parent::value_type PairType;
 
   public:
-    typedef Key KeyType;
-    typedef T ValueType;
-    typedef T& ReferenceType;
-    typedef const T& ConstReferenceType;
+    typedef K Key;
+    typedef T Value;
+    typedef T& Reference;
+    typedef const T& ConstReference;
 
 
@@ -144 +144 @@
     }
 
-    ReferenceType operator[](const Key &k) {
+    Reference operator[](const Key &k) {
       return insert(PairType(k,v)).first -> second;
     }
-    ConstReferenceType operator[](const Key &k) const {
+    ConstReference operator[](const Key &k) const {
       typename parent::iterator i = lower_bound(k);
       if (i == parent::end() || parent::key_comp()(k, (*i).first))