Changeset 435:8f1dece01cc4 in lemon-0.x

Timestamp:

04/27/04 11:26:32 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

misc

Location:

src

Files:

• test/makefile (modified) (1 diff)
• work/marci/graph_wrapper.h (modified) (5 diffs)

src/test/makefile

@@ +1 @@
+#CXX3 := $(shell type -p g++-3.4 || shell type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
 CXX3 := $(shell type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
 CXX2 = g++-2.95

src/work/marci/graph_wrapper.h

@@ -1069 +1069 @@
   };
 
+  template<typename Graph>
+  class stGraphWrapper;
+
+//   template<typename Graph> 
+//   std::ostream& 
+//   operator<<(std::ostream& os, const typename stGraphWrapper<Graph>::Node& i) { 
+//     os << "(node: " << typename Graph::Node(i) << " spec: " << i.spec <<")"; 
+//     return os; 
+//   }
+//   template<typename Graph> 
+//   std::ostream& 
+//   operator<<(std::ostream& os, const typename stGraphWrapper<Graph>::Edge& i) { 
+//     os << "(edge: " << typename Graph::Edge(i) << " spec: " << i.spec << 
+//       " node: " << i.n << ")"; 
+//     return os; 
+//   }
 
   /// experimentral, do not try it.
@@ -1123 +1139 @@
                                     T_NODE(INVALID, 2) { }
 
+    
+//    std::ostream& 
+//    operator<<(std::ostream& os, const /*typename stGraphWrapper<Graph>::*/Node& i);
+//    friend std::ostream& 
+//    operator<<(std::ostream& os, const /*typename stGraphWrapper<Graph>::*/Node& i);
+//    friend std::ostream& 
+//    operator<<(std::ostream& os, const /*typename stGraphWrapper<Graph>::*/Edge& i);
+
     class Node : public Graph::Node {
     protected:
@@ -1148 +1172 @@
                 static_cast<typename Graph::Node>(v));
       }
-      friend std::ostream& operator<<(std::ostream& os, const Node& i);
+//      template<typename G> 
+//      friend std::ostream& 
+//      operator<<(std::ostream& os, const typename stGraphWrapper<G>::Node& i); 
+      friend std::ostream& operator<< (std::ostream& os, const Node& i);
       int getSpec() const { return spec; }
     };
@@ -1193 +1220 @@
                 u.n!=v.n);
       } 
-      friend std::ostream& operator<<(std::ostream& os, const Edge& i);
+//      template<typename G> 
+//      friend std::ostream& 
+//      operator<<(std::ostream& os, const typename stGraphWrapper<G>::Edge& i); 
+      friend std::ostream& operator<< (std::ostream& os, const Edge& i);
       int getSpec() const { return spec; }
     };
@@ -1602 +1632 @@
 //     };
 
-    friend std::ostream& operator<<(std::ostream& os, const Node& i) { 
+//  template<typename G> 
+    friend std::ostream& 
+    operator<<(std::ostream& os, const /*typename stGraphWrapper<Graph>::*/Node& i) { 
       os << "(node: " << typename Graph::Node(i) << " spec: " << i.spec <<")"; 
       return os; 
     }
-    friend std::ostream& operator<<(std::ostream& os, const Edge& i) { 
+//  template<typename G> 
+    friend std::ostream& 
+    operator<<(std::ostream& os, const /*typename stGraphWrapper<Graph>::*/Edge& i) { 
       os << "(edge: " << typename Graph::Edge(i) << " spec: " << i.spec << 
         " node: " << i.n << ")";