Merging with branch Master

[satune.git] / src / ASTTransform / transformer.cc

diff --git a/src/ASTTransform/transformer.cc b/src/ASTTransform/transformer.cc
index 03a684101f334fc12b88261af29fd113dee7c3be..b22b87d6c2abe20ccec957e7b1cbf48a844fa6f3 100644 (file)
--- a/src/ASTTransform/transformer.cc
+++ b/src/ASTTransform/transformer.cc
@@ -38,7 +38,7 @@ void Transformer::orderAnalysis() {
                }
 
                OrderGraph *graph = buildOrderGraph(order);
-               if (order->type == PARTIAL) {
+               if (order->type == SATC_PARTIAL) {
                        //Required to do SCC analysis for partial order graphs.  It
                        //makes sure we don't incorrectly optimize graphs with negative
                        //polarity edges
@@ -54,8 +54,8 @@ void Transformer::orderAnalysis() {
                bool mustReachLocal = GETVARTUNABLE(solver->getTuner(), order->type, MUSTREACHLOCAL, &onoff);
 
                if (mustReachLocal) {
-                       //solver pair of analysis is also optional
-                       if (order->type == PARTIAL) {
+                       //This pair of analysis is also optional
+                       if (order->type == SATC_PARTIAL) {
                                localMustAnalysisPartial(solver, graph);
                        } else {
                                localMustAnalysisTotal(solver, graph);