after merge (mostly tabbing issues)

[satune.git] / src / Translator / decomposeorderresolver.h

diff --git a/src/Translator/decomposeorderresolver.h b/src/Translator/decomposeorderresolver.h
index a6bf955d8c64a5635651c565fb9b604775183f42..507554747f544520688a7595db707eef58826807 100644 (file)
--- a/src/Translator/decomposeorderresolver.h
+++ b/src/Translator/decomposeorderresolver.h
@@ -14,19 +14,21 @@
 #include "orderresolver.h"
 
 class DOREdge {
- public:
- DOREdge(uint64_t _origfirst, uint64_t _origsecond, uint _orderindex, uint64_t _newfirst, uint64_t _newsecond) :
-         origfirst(_origfirst),
+public:
+       DOREdge(uint64_t _origfirst, uint64_t _origsecond, uint _orderindex, uint64_t _newfirst, uint64_t _newsecond) :
+               origfirst(_origfirst),
                origsecond(_origsecond),
                orderindex(_orderindex),
                newfirst(_newfirst),
-               newsecond(_newsecond) {
-       }               
+               newsecond(_newsecond),
+               mustbetrue(false) {
+       }
        uint64_t origfirst;
        uint64_t origsecond;
        uint orderindex;
        uint64_t newfirst;
        uint64_t newsecond;
+       bool mustbetrue;
        CMEMALLOC;
 };
 
@@ -39,10 +41,10 @@ public:
        void remapEdge(uint64_t oldfirst, uint64_t oldsecond, uint64_t newfirst, uint64_t newsecond);
        void setEdgeOrder(uint64_t first, uint64_t second, uint sccNum);
        void setOrder(uint sccNum, Order *order);
-       Order * getOrder(uint sccNum);
+       Order *getOrder(uint sccNum);
        CMEMALLOC;
-       
- private:
+
+private:
        bool resolvePartialOrder(OrderNode *first, OrderNode *second);
        void buildGraph();
        OrderGraph *graph;