Changeset 433:d9fac1497298 in lemon-0.x for src

Timestamp:

04/27/04 10:19:39 (21 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

g++-3.4.0, misc

Location:

src

Files:

• include/dijkstra.h (modified) (3 diffs)
• work/marci/leda/makefile (modified) (4 diffs)
• work/marci/makefile (modified) (5 diffs)

src/include/dijkstra.h

@@ -44 +44 @@
 #else
   template <typename Graph,
-            typename LengthMap=typename Graph::EdgeMap<int>,
+            typename LengthMap=typename Graph::template EdgeMap<int>,
             template <class,class,class> class Heap = BinHeap >
 #endif
@@ -55 +55 @@
     
     typedef typename LengthMap::ValueType ValueType;
-    typedef typename Graph::NodeMap<Edge> PredMap;
-    typedef typename Graph::NodeMap<Node> PredNodeMap;
-    typedef typename Graph::NodeMap<ValueType> DistMap;
+    typedef typename Graph::template NodeMap<Edge> PredMap;
+    typedef typename Graph::template NodeMap<Node> PredNodeMap;
+    typedef typename Graph::template NodeMap<ValueType> DistMap;
 
   private:
@@ -155 +155 @@
     }
     
-    typename Graph::NodeMap<int> heap_map(G,-1);
-    
-    Heap<Node,ValueType,typename Graph::NodeMap<int> > heap(heap_map);
+    typename Graph::template NodeMap<int> heap_map(G,-1);
+    
+    Heap<Node, ValueType, typename Graph::template NodeMap<int> > 
+      heap(heap_map);
     
     heap.push(s,0); 

src/work/marci/leda/makefile

@@ -1 +1 @@
 CXX2 = g++-2.95
-#CXX3 := $(shell type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
 CXX3=$(CXX)
-#CXX=$(CXX3)
-#CC=$(CXX)
-#LEDAROOT ?= /ledasrc/LEDA-4.1
 BOOSTROOT ?= /home/marci/boost
 INCLUDEDIRS ?= -I../../../include -I../.. -I../../{marci,jacint,alpar,klao,akos,athos} -I$(LEDAROOT)/incl -I.
 LDFLAGS = -L$(LEDAROOT) -lG -lL -lm
-#LEDAINCLUDE ?= -I$(LEDAROOT)/incl
-#CXXFLAGS = -g -O3 -W -Wall $(INCLUDEDIRS) -ansi -pedantic -ftemplate-depth-30
 
 BINARIES = bipartite_matching_leda
-#LEDABINARIES = leda_graph_demo leda_bfs_dfs max_bipartite_matching_demo
-#BINARIES = edmonds_karp_demo iterator_bfs_demo macro_test lg_vs_sg bfsit_vs_byhand bipartite_graph_wrapper_test bipartite_matching_try
-#gw_vs_not preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos edmonds_karp_demo_alpar preflow_demo_leda
 
 include ../../makefile
-#all: $(BINARIES)
-
-#.depend dep depend:
-#       -$(CXX) $(INCLUDEDIRS) -M $(BINARIES:=.cc) > .depend #2>/dev/null
-#       -g++ $(INCLUDEDIRS) $(LEDAINCLUDE) -M $(LEDABINARIES:=.cc) >> .depend #2>/dev/null
-
-
-
-#makefile: .depend
-#sinclude .depend
 
 leda_graph_demo.o:
@@ -33 +14 @@
 leda_graph_demo: leda_graph_demo.o
         $(CXX3) -Wall -O -L$(LEDAROOT) -o leda_graph_demo leda_graph_demo.o -lG -lL -lm
-
-#bipartite_matching_leda.o:
-#       $(CXX3) $(CXXFLAGS) -I$(LEDAROOT)/incl -c bipartite_matching_leda.cc
-#
-#bipartite_matching_leda: bipartite_matching_leda.o
-#       $(CXX3) $(CXXFLAGS) -L$(LEDAROOT) -o bipartite_matching_leda bipartite_matching_leda.o -lG -lL -lm
 
 max_bipartite_matching_demo.o:
@@ -52 +27 @@
         $(CXX3) -Wall -O -L$(LEDAROOT) -o leda_bfs_dfs leda_bfs_dfs.o -lG -lL -lm
 
-#edmonds_karp_demo: 
-#       $(CXX3) $(CXXFLAGS) -o edmonds_karp_demo edmonds_karp_demo.cc
-#       $(CXX3) $(CXXFLAGS) -pg -o edmonds_karp_demo_prof edmonds_karp_demo.cc
-
 gw_vs_not: 
         $(CXX3) $(CXXFLAGS) -o gw_vs_not gw_vs_not.cc
-
-#lg_vs_sg:
-#       $(CXX3) $(CXXFLAGS) -g -I. -I.. -o lg_vs_sg lg_vs_sg.cc
 
 edmonds_karp_demo_alpar: 
@@ -83 +51 @@
         $(CXX3) $(CXXFLAGS) -I. -I.. -I../athos -o preflow_demo_athos preflow_demo_athos.cc
 
-#clean:
-#       $(RM) *.o $(BINARIES) .depend
-#
-#.PHONY: all clean dep depend

src/work/marci/makefile

@@ -1 +1 @@
 CXX2 = g++-2.95
-#CXX3 := $(shell type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
 CXX3=$(CXX)
-#CXX=$(CXX3)
-#CC=$(CXX)
-#LEDAROOT ?= /ledasrc/LEDA-4.1
 BOOSTROOT ?= /home/marci/boost
 INCLUDEDIRS ?= -I../../include -I.. -I../{marci,jacint,alpar,klao,akos,athos} -I$(BOOSTROOT)
-#LEDAINCLUDE ?= -I$(LEDAROOT)/incl
-#CXXFLAGS = -g -O3 -W -Wall $(INCLUDEDIRS) -ansi -pedantic -ftemplate-depth-30
 
 LEDABINARIES = leda_graph_demo leda_bfs_dfs max_bipartite_matching_demo
@@ -15 +9 @@
 
 include ../makefile
-#all: $(BINARIES)
-
-#.depend dep depend:
-#       -$(CXX) $(INCLUDEDIRS) -M $(BINARIES:=.cc) > .depend #2>/dev/null
-#       -g++ $(INCLUDEDIRS) $(LEDAINCLUDE) -M $(LEDABINARIES:=.cc) >> .depend #2>/dev/null
-
-
-
-#makefile: .depend
-#sinclude .depend
 
 leda_graph_demo.o:
@@ -31 +15 @@
 leda_graph_demo: leda_graph_demo.o
         $(CXX3) -Wall -O -L$(LEDAROOT) -o leda_graph_demo leda_graph_demo.o -lG -lL -lm
-
-#bipartite_matching_leda.o:
-#       $(CXX3) $(CXXFLAGS) -I$(LEDAROOT)/incl -c bipartite_matching_leda.cc
-#
-#bipartite_matching_leda: bipartite_matching_leda.o
-#       $(CXX3) $(CXXFLAGS) -L$(LEDAROOT) -o bipartite_matching_leda bipartite_matching_leda.o -lG -lL -lm
 
 max_bipartite_matching_demo.o:
@@ -50 +28 @@
         $(CXX3) -Wall -O -L$(LEDAROOT) -o leda_bfs_dfs leda_bfs_dfs.o -lG -lL -lm
 
-#edmonds_karp_demo: 
-#       $(CXX3) $(CXXFLAGS) -o edmonds_karp_demo edmonds_karp_demo.cc
-#       $(CXX3) $(CXXFLAGS) -pg -o edmonds_karp_demo_prof edmonds_karp_demo.cc
-
 gw_vs_not: 
         $(CXX3) $(CXXFLAGS) -o gw_vs_not gw_vs_not.cc
-
-#lg_vs_sg:
-#       $(CXX3) $(CXXFLAGS) -g -I. -I.. -o lg_vs_sg lg_vs_sg.cc
 
 edmonds_karp_demo_alpar: 
@@ -81 +52 @@
         $(CXX3) $(CXXFLAGS) -I. -I.. -I../athos -o preflow_demo_athos preflow_demo_athos.cc
 
-#clean:
-#       $(RM) *.o $(BINARIES) .depend
-#
-#.PHONY: all clean dep depend