Changeset 236 for cpp/frams

Timestamp:

04/30/14 05:05:24 (11 years ago)

Author:

Maciej Komosinski

Message:

Changed binary literals to macros (some compilers do not support binary literals yet)

File:

• cpp/frams/model/geometry/geometryutils.h (modified) (7 diffs)

cpp/frams/model/geometry/geometryutils.h

@@ -10 +10 @@
 #include <frams/util/3d.h>
 #include <frams/util/list.h>
+
+//binary literals standardized in C++14
+#define b000 0
+#define b01 1
+#define b001 1
+#define b10 2
+#define b010 2
+#define b100 4
+#define b110 6
 
 namespace CuboidFaces
@@ -25 +34 @@
         };
         
-        inline bool isPositive(Face f) { return f & 0b001; }
+        inline bool isPositive(Face f) { return f & b001; }
         inline bool isNegative(Face f) { return !isPositive(f); }
-        inline bool isX(Face f) { return (f & 0b110) == 0b000; }
-        inline bool isY(Face f) { return (f & 0b110) == 0b010; }
-        inline bool isZ(Face f) { return (f & 0b110) == 0b100; }
+        inline bool isX(Face f) { return (f & b110) == b000; }
+        inline bool isY(Face f) { return (f & b110) == b010; }
+        inline bool isZ(Face f) { return (f & b110) == b100; }
 }
 
@@ -42 +51 @@
         };
         
-        inline bool isPositive(Base b) { return b & 0b001; }
+        inline bool isPositive(Base b) { return b & b001; }
         inline bool isNegative(Base b) { return !isPositive(b); }
 }
@@ -58 +67 @@
         };
         
-        inline bool isPositiveX(QuadrantXY q) { return q & 0b10; }
+        inline bool isPositiveX(QuadrantXY q) { return q & b10; }
         inline bool isNegativeX(QuadrantXY q) { return !isPositiveX(q); }
-        inline bool isPositiveY(QuadrantXY q) { return q & 0b01; }
+        inline bool isPositiveY(QuadrantXY q) { return q & b01; }
         inline bool isNegativeY(QuadrantXY q) { return !isPositiveY(q); }
 }
@@ -76 +85 @@
         };
         
-        inline bool isPositiveY(QuadrantYZ q) { return q & 0b10; }
+        inline bool isPositiveY(QuadrantYZ q) { return q & b10; }
         inline bool isNegativeY(QuadrantYZ q) { return !isPositiveY(q); }
-        inline bool isPositiveZ(QuadrantYZ q) { return q & 0b01; }
+        inline bool isPositiveZ(QuadrantYZ q) { return q & b01; }
         inline bool isNegativeZ(QuadrantYZ q) { return !isPositiveZ(q); }
 }
@@ -94 +103 @@
         };
         
-        inline bool isPositiveZ(QuadrantZX q) { return q & 0b10; }
+        inline bool isPositiveZ(QuadrantZX q) { return q & b10; }
         inline bool isNegativeZ(QuadrantZX q) { return !isPositiveZ(q); }
-        inline bool isPositiveX(QuadrantZX q) { return q & 0b01; }
+        inline bool isPositiveX(QuadrantZX q) { return q & b01; }
         inline bool isNegativeX(QuadrantZX q) { return !isPositiveX(q); }
 }
@@ -116 +125 @@
         };
         
-        inline bool isPositiveX(Octant o) { return o & 0b100; }
+        inline bool isPositiveX(Octant o) { return o & b100; }
         inline bool isNegativeX(Octant o) { return !isPositiveX(o); }
-        inline bool isPositiveY(Octant o) { return o & 0b010; }
+        inline bool isPositiveY(Octant o) { return o & b010; }
         inline bool isNegativeY(Octant o) { return !isPositiveY(o); }
-        inline bool isPositiveZ(Octant o) { return o & 0b001; }
+        inline bool isPositiveZ(Octant o) { return o & b001; }
         inline bool isNegativeZ(Octant o) { return !isPositiveZ(o); }
 }