There is a #define in some header that conflicts with INFINITY, rename it.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3797 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp b/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp
index 45ceadaa930763b650fdfb6aed96dc86f0580c2f..3ba19d7d2a93dee3a84aff89dbc3a354e2ca1266 100644 (file)
--- a/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp
+++ b/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp
@@ -511,7 +511,7 @@ void processGraph(Graph &g,
   //This would hold all 
   //right as long as number of paths in the graph
   //is less than this
-  const int INFINITY=99999999;
+  const int Infinity=99999999;
 
 
   //step 1-3 are already done on the graph when this function is called
@@ -521,14 +521,14 @@ void processGraph(Graph &g,
 
   //now insert exit to root edge
   //if its there earlier, remove it!
-  //assign it weight INFINITY
+  //assign it weight Infinity
   //so that this edge IS ALWAYS IN spanning tree
   //Note than edges in spanning tree do not get 
   //instrumented: and we do not want the
   //edge exit->root to get instrumented
   //as it MAY BE a dummy edge
-  Edge ed(g.getExit(),g.getRoot(),INFINITY);
-  g.addEdge(ed,INFINITY);
+  Edge ed(g.getExit(),g.getRoot(),Infinity);
+  g.addEdge(ed,Infinity);
   Graph g2=g;
 
   //make g2 undirectional: this gives a better

diff --git a/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxillary.cpp b/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxillary.cpp
index 45ceadaa930763b650fdfb6aed96dc86f0580c2f..3ba19d7d2a93dee3a84aff89dbc3a354e2ca1266 100644 (file)
--- a/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxillary.cpp
+++ b/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxillary.cpp
@@ -511,7 +511,7 @@ void processGraph(Graph &g,
   //This would hold all 
   //right as long as number of paths in the graph
   //is less than this
-  const int INFINITY=99999999;
+  const int Infinity=99999999;
 
 
   //step 1-3 are already done on the graph when this function is called
@@ -521,14 +521,14 @@ void processGraph(Graph &g,
 
   //now insert exit to root edge
   //if its there earlier, remove it!
-  //assign it weight INFINITY
+  //assign it weight Infinity
   //so that this edge IS ALWAYS IN spanning tree
   //Note than edges in spanning tree do not get 
   //instrumented: and we do not want the
   //edge exit->root to get instrumented
   //as it MAY BE a dummy edge
-  Edge ed(g.getExit(),g.getRoot(),INFINITY);
-  g.addEdge(ed,INFINITY);
+  Edge ed(g.getExit(),g.getRoot(),Infinity);
+  g.addEdge(ed,Infinity);
   Graph g2=g;
 
   //make g2 undirectional: this gives a better