After resolving conflicts

[satune.git] / src / Collections / corestructs.h

diff --git a/src/Collections/corestructs.h b/src/Collections/corestructs.h
index 5e8a7de935b8f1e3818ed156efc9d03c7cb150f0..7a8104dcd4453e6994c6fee547e50d0d488028e7 100644 (file)
--- a/src/Collections/corestructs.h
+++ b/src/Collections/corestructs.h
@@ -10,32 +10,32 @@
 #define PTRSHIFT 5
 
 class BooleanEdge {
- public:
- BooleanEdge() : b(NULL) {}
- BooleanEdge(Boolean * _b) : b(_b) {}
+public:
+       BooleanEdge() : b(NULL) {}
+       BooleanEdge(Boolean *_b) : b(_b) {}
        BooleanEdge negate() {return BooleanEdge((Boolean *)(((uintptr_t) b) ^ 1));}
-       bool operator==(BooleanEdge e) { return b==e.b;}
-       bool operator!=(BooleanEdge e) { return b!=e.b;}
+       bool operator==(BooleanEdge e) { return b == e.b;}
+       bool operator!=(BooleanEdge e) { return b != e.b;}
        bool isNegated() { return ((uintptr_t) b) & 1; }
-       Boolean * getBoolean() {return (Boolean *)(((uintptr_t)b) & ~((uintptr_t) 1));}
-       Boolean * getRaw() {return b;}
-       Boolean * operator->() {return getBoolean();}
+       Boolean *getBoolean() {return (Boolean *)(((uintptr_t)b) & ~((uintptr_t) 1));}
+       Boolean *getRaw() {return b;}
+       Boolean *operator->() {return getBoolean();}
        operator bool() const {return b != NULL;}
- private:
+private:
        Boolean *b;
 };
 
 inline bool boolEdgeEquals(BooleanEdge b1, BooleanEdge b2) {
-       return b1==b2;
+       return b1 == b2;
 }
 
 inline unsigned int boolEdgeHash(BooleanEdge b) {
-       return (unsigned int) (((uintptr_t)b.getRaw())>>PTRSHIFT);
+       return (unsigned int) (((uintptr_t)b.getRaw()) >> PTRSHIFT);
 }
-                                                                       
-typedef Hashset<BooleanEdge, uintptr_t, PTRSHIFT, & boolEdgeHash, & boolEdgeEquals> HashsetBooleanEdge;
+
+typedef Hashset<BooleanEdge, uintptr_t, PTRSHIFT, &boolEdgeHash, &boolEdgeEquals> HashsetBooleanEdge;
 typedef Hashset<Order *, uintptr_t, PTRSHIFT> HashsetOrder;
-typedef SetIterator<BooleanEdge, uintptr_t, PTRSHIFT, & boolEdgeHash, & boolEdgeEquals> SetIteratorBooleanEdge;
+typedef SetIterator<BooleanEdge, uintptr_t, PTRSHIFT, &boolEdgeHash, &boolEdgeEquals> SetIteratorBooleanEdge;
 typedef SetIterator<Order *, uintptr_t, PTRSHIFT> SetIteratorOrder;
 
 #endif