1.1 --- a/src/benchmark/bench_tools.h Wed Nov 10 21:42:28 2004 +0000
1.2 +++ b/src/benchmark/bench_tools.h Wed Nov 10 21:59:59 2004 +0000
1.3 @@ -28,7 +28,10 @@
1.4 ///A primitive primtest
1.5
1.6 ///\bug 2 is not a prime according to this function!
1.7 -bool isPrim(int n)
1.8 +///
1.9 +///\bug This function should go out of header file. I'm making it
1.10 +/// inline for now.
1.11 +inline bool isPrim(int n)
1.12 {
1.13 if(n%2) {
1.14 for(int k=3;n/k>=k;k+=2)
1.15 @@ -39,7 +42,10 @@
1.16 }
1.17
1.18 ///Finds the smallest prime not less then \c n.
1.19 -int nextPrim(int n)
1.20 +
1.21 +///\bug This function should go out of header file. I'm making it
1.22 +/// inline for now.
1.23 +inline int nextPrim(int n)
1.24 {
1.25 for(n+=!(n%2);!isPrim(n);n+=2) ;
1.26 return n;
2.1 --- a/src/lemon/array_map.h Wed Nov 10 21:42:28 2004 +0000
2.2 +++ b/src/lemon/array_map.h Wed Nov 10 21:59:59 2004 +0000
2.3 @@ -364,7 +364,7 @@
2.4
2.5 typedef ArrayMap<Graph, Node, NodeIt, NodeIdMap, _Value> Parent;
2.6
2.7 - typedef typename Parent::Graph Graph;
2.8 + //typedef typename Parent::Graph Graph;
2.9 typedef typename Parent::Value Value;
2.10
2.11 NodeMap(const Graph& g)
2.12 @@ -385,7 +385,7 @@
2.13
2.14 typedef ArrayMap<Graph, Edge, EdgeIt, EdgeIdMap, _Value> Parent;
2.15
2.16 - typedef typename Parent::Graph Graph;
2.17 + //typedef typename Parent::Graph Graph;
2.18 typedef typename Parent::Value Value;
2.19
2.20 EdgeMap(const Graph& g)
3.1 --- a/src/lemon/default_map.h Wed Nov 10 21:42:28 2004 +0000
3.2 +++ b/src/lemon/default_map.h Wed Nov 10 21:59:59 2004 +0000
3.3 @@ -187,7 +187,7 @@
3.4
3.5 typedef DefaultMap<Graph, Node, NodeIt, NodeIdMap, _Value> Parent;
3.6
3.7 - typedef typename Parent::Graph Graph;
3.8 + //typedef typename Parent::Graph Graph;
3.9 typedef typename Parent::ValueType ValueType;
3.10
3.11 NodeMap(const Graph& g)
3.12 @@ -208,7 +208,7 @@
3.13
3.14 typedef DefaultMap<Graph, Edge, EdgeIt, EdgeIdMap, _Value> Parent;
3.15
3.16 - typedef typename Parent::Graph Graph;
3.17 + //typedef typename Parent::Graph Graph;
3.18 typedef typename Parent::ValueType ValueType;
3.19
3.20 EdgeMap(const Graph& g)
4.1 --- a/src/lemon/vector_map.h Wed Nov 10 21:42:28 2004 +0000
4.2 +++ b/src/lemon/vector_map.h Wed Nov 10 21:59:59 2004 +0000
4.3 @@ -248,7 +248,7 @@
4.4
4.5 typedef VectorMap<Graph, Node, NodeIdMap, _Value> Parent;
4.6
4.7 - typedef typename Parent::Graph Graph;
4.8 + //typedef typename Parent::Graph Graph;
4.9 typedef typename Parent::Value Value;
4.10
4.11 NodeMap(const Graph& g)
4.12 @@ -268,7 +268,7 @@
4.13
4.14 typedef VectorMap<Graph, Edge, EdgeIdMap, _Value> Parent;
4.15
4.16 - typedef typename Parent::Graph Graph;
4.17 + //typedef typename Parent::Graph Graph;
4.18 typedef typename Parent::Value Value;
4.19
4.20 EdgeMap(const Graph& g)