Changeset 979:b5fb023cdb7b in lemon-0.x

Timestamp:

11/10/04 22:59:59 (20 years ago)

Author:

Mihaly Barasz

Branch:

default

Phase:

public

Convert:

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

Message:

"make check" pass under icc v8.0

• There are _many_ remarks which are worth examinating! Non-inline (and even not template) functions in header files for example.

Location:

src

Files:

• benchmark/bench_tools.h (modified) (2 diffs)
• lemon/array_map.h (modified) (2 diffs)
• lemon/default_map.h (modified) (2 diffs)
• lemon/vector_map.h (modified) (2 diffs)

src/benchmark/bench_tools.h

@@ -29 +29 @@
 
 ///\bug 2 is not a prime according to this function!
-bool isPrim(int n)
+///
+///\bug This function should go out of header file. I'm making it
+/// inline for now.
+inline bool isPrim(int n)
 {
   if(n%2) {
@@ -40 +43 @@
 
 ///Finds the smallest prime not less then \c n.
-int nextPrim(int n)
+
+///\bug This function should go out of header file. I'm making it
+/// inline for now.
+inline int nextPrim(int n)
 {
   for(n+=!(n%2);!isPrim(n);n+=2) ;

src/lemon/array_map.h

@@ -365 +365 @@
       typedef ArrayMap<Graph, Node, NodeIt, NodeIdMap, _Value> Parent;
 
-      typedef typename Parent::Graph Graph;
+      //typedef typename Parent::Graph Graph;
       typedef typename Parent::Value Value;
 
@@ -386 +386 @@
       typedef ArrayMap<Graph, Edge, EdgeIt, EdgeIdMap, _Value> Parent;
 
-      typedef typename Parent::Graph Graph;
+      //typedef typename Parent::Graph Graph;
       typedef typename Parent::Value Value;
 

src/lemon/default_map.h

@@ -188 +188 @@
       typedef DefaultMap<Graph, Node, NodeIt, NodeIdMap, _Value> Parent;
 
-      typedef typename Parent::Graph Graph;
+      //typedef typename Parent::Graph Graph;
       typedef typename Parent::ValueType ValueType;
 
@@ -209 +209 @@
       typedef DefaultMap<Graph, Edge, EdgeIt, EdgeIdMap, _Value> Parent;
 
-      typedef typename Parent::Graph Graph;
+      //typedef typename Parent::Graph Graph;
       typedef typename Parent::ValueType ValueType;
 

src/lemon/vector_map.h

@@ -249 +249 @@
       typedef VectorMap<Graph, Node, NodeIdMap, _Value> Parent;
 
-      typedef typename Parent::Graph Graph;
+      //typedef typename Parent::Graph Graph;
       typedef typename Parent::Value Value;
 
@@ -269 +269 @@
       typedef VectorMap<Graph, Edge, EdgeIdMap, _Value> Parent;
 
-      typedef typename Parent::Graph Graph;
+      //typedef typename Parent::Graph Graph;
       typedef typename Parent::Value Value;