which English word is not define as a macro in MSVC?

gentryx · Feb 21, 2017 · 08ec5f2 · 08ec5f2
1 parent 3d8a424
commit 08ec5f2
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/src/libgeodecomp/geometry/partitions/distributedptscotchunstructuredpartition.h b/src/libgeodecomp/geometry/partitions/distributedptscotchunstructuredpartition.h
@@ -177,23 +177,23 @@ class DistributedPTScotchUnstructuredPartition : public Partition<DIM>
                 nullptr,        // more optional data/hints
                 nullptr);       //
         if (error) {
-            LOG(ERROR, "SCOTCH_graphBuild error: " << error);
+            LOG(FAULT, "SCOTCH_graphBuild error: " << error);
         }
 
         error = SCOTCH_dgraphCheck(&graph);
         if (error) {
-            LOG(ERROR, "SCOTCH_graphCheck error: " << error);
+            LOG(FAULT, "SCOTCH_graphCheck error: " << error);
         }
 
         SCOTCH_Strat *straptr = SCOTCH_stratAlloc();
         error = SCOTCH_stratInit(straptr);
         if (error) {
-            LOG(ERROR, "SCOTCH_stratInit error: " << error);
+            LOG(FAULT, "SCOTCH_stratInit error: " << error);
         }
 
         error = SCOTCH_dgraphPart(&graph, numPartitions, straptr,& indices[0]);
         if (error) {
-            LOG(ERROR, "SCOTCH_graphMap error: " << error);
+            LOG(FAULT, "SCOTCH_graphMap error: " << error);
         }
 
         SCOTCH_dgraphExit(&graph);

diff --git a/src/libgeodecomp/geometry/partitions/ptscotchunstructuredpartition.h b/src/libgeodecomp/geometry/partitions/ptscotchunstructuredpartition.h
@@ -101,23 +101,23 @@ class PTScotchUnstructuredPartition : public Partition<DIM>
                 &edgetabGra[0],
                 nullptr);
         if (error) {
-            LOG(ERROR, "SCOTCH_graphBuild error: " << error);
+            LOG(FAULT, "SCOTCH_graphBuild error: " << error);
         }
 
         error = SCOTCH_graphCheck(&graph);
         if (error) {
-            LOG(ERROR, "SCOTCH_graphCheck error: " << error);
+            LOG(FAULT, "SCOTCH_graphCheck error: " << error);
         }
 
         SCOTCH_Strat *straptr = SCOTCH_stratAlloc();
         error = SCOTCH_stratInit(straptr);
         if (error) {
-            LOG(ERROR, "SCOTCH_stratInit error: " << error);
+            LOG(FAULT, "SCOTCH_stratInit error: " << error);
         }
 
         error = SCOTCH_graphPart(&graph, weights.size(), straptr,& indices[0]);
         if (error) {
-            LOG(ERROR, "SCOTCH_graphMap error: " << error);
+            LOG(FAULT, "SCOTCH_graphMap error: " << error);
         }
 
         SCOTCH_graphExit(&graph);

diff --git a/src/libgeodecomp/io/logger.h b/src/libgeodecomp/io/logger.h
@@ -21,7 +21,7 @@ namespace LibGeoDecomp {
 class Logger {
 public:
     static const int FATAL = 0;
-    static const int ERROR = 1;
+    static const int FAULT = 1;
     static const int WARN  = 2;
     static const int INFO  = 3;
     static const int DBG   = 4;

diff --git a/src/libgeodecomp/loadbalancer/oozebalancer.cpp b/src/libgeodecomp/loadbalancer/oozebalancer.cpp
@@ -85,7 +85,7 @@ OozeBalancer::WeightVec OozeBalancer::balance(
 
     WeightVec ret = equalize(newLoads);
     if (sum(weights) != sum(ret)) {
-        LOG(ERROR, "OozeBalancer::balance() failed\n"
+        LOG(FAULT, "OozeBalancer::balance() failed\n"
             << "  weights.sum() = " << sum(weights) << "\n"
             << "  ret.sum() = " << sum(ret) << "\n"
             << "  expectedOptimal.sum() = " << sum(expectedOptimal) << "\n"

diff --git a/src/libgeodecomp/storage/neighborhoodadapter.h b/src/libgeodecomp/storage/neighborhoodadapter.h
@@ -60,7 +60,7 @@ class NeighborhoodAdapter
             }
         }
 
-        LOG(ERROR, "could not find id " << id << " in neighborhood");
+        LOG(FAULT, "could not find id " << id << " in neighborhood");
         throw std::logic_error("id not found");
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,7 +60,7 @@ class NeighborhoodAdapter @@
                 }
             }
-            LOG(ERROR, "could not find id " << id << " in neighborhood");
+            LOG(FAULT, "could not find id " << id << " in neighborhood");
             throw std::logic_error("id not found");
         }
@@ Expand Down @@