Changeset 1725:22752dd6c693 in lemon-0.x

Timestamp:

10/14/05 13:00:40 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Using proper return type

Location:

lemon

Files:

• graph_adaptor.h (modified) (4 diffs)
• maps.h (modified) (2 diffs)

lemon/graph_adaptor.h

@@ -1527 +1527 @@
       }
       
-      typename ReferenceMapTraits<NodeImpl>::Reference 
+      typename MapTraits<NodeImpl>::ReturnValue 
       operator[](const Node& key) {
         if (key.entry) { return entry[key]; }
@@ -1533 +1533 @@
       }
 
-      T operator[](const Node& key) const {
+      typename MapTraits<NodeImpl>::ConstReturnValue
+      operator[](const Node& key) const {
         if (key.entry) { return entry[key]; }
         else { return exit[key]; }
@@ -1557 +1558 @@
       }
       
-      typename ReferenceMapTraits<EdgeImpl>::Reference
+      typename MapTraits<EdgeImpl>::ReturnValue
       operator[](const Edge& key) {
         if ((typename Parent::Edge&)key != INVALID) { return orig[key]; }
@@ -1563 +1564 @@
       }
 
-      T operator[](const Edge& key) const {
+      typename MapTraits<EdgeImpl>::ConstReturnValue
+      operator[](const Edge& key) const {
         if ((typename Parent::Edge&)key != INVALID) { return orig[key]; }
         else {return bind[key.bind]; }

lemon/maps.h

@@ -19 +19 @@
 
 #include <lemon/utility.h>
-
+#include <lemon/traits.h>
 
 ///\file
@@ -522 +522 @@
     ///Constructor
     ComposeMap(const M1 &_m1,const M2 &_m2) : m1(_m1), m2(_m2) {};
-    Value operator[](Key k) const {return m1[m2[k]];}
+    
+    typename MapTraits<M1>::ConstReturnValue
+    operator[](Key k) const {return m1[m2[k]];}
   };
   ///Returns a \ref ComposeMap class