Fix Windows build

qgis · May 22, 2017 · 3cd714a · 3cd714a · NathanW2 · May 22, 2017
1 parent 1577a57
commit 3cd714a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/src/core/expression/qgsexpressionutils.cpp b/src/core/expression/qgsexpressionutils.cpp
@@ -16,6 +16,18 @@
 #include "qgsexpressionutils.h"
 #include "qgsexpressionnode.h"
 
-constexpr QgsExpressionUtils::TVL QgsExpressionUtils::AND[3][3];
-constexpr QgsExpressionUtils::TVL QgsExpressionUtils::OR[3][3];
-constexpr QgsExpressionUtils::TVL QgsExpressionUtils::NOT[3];
+QgsExpressionUtils::TVL QgsExpressionUtils::AND[3][3] =
+{
+  // false  true    unknown
+  { False, False,   False },   // false
+  { False, True,    Unknown }, // true
+  { False, Unknown, Unknown }  // unknown
+};
+QgsExpressionUtils::TVL QgsExpressionUtils::OR[3][3] =
+{
+  { False,   True, Unknown },  // false
+  { True,    True, True },     // true
+  { Unknown, True, Unknown }   // unknown
+};
+
+QgsExpressionUtils::TVL QgsExpressionUtils::NOT[3] = { True, False, Unknown };
diff --git a/src/core/expression/qgsexpressionutils.h b/src/core/expression/qgsexpressionutils.h
@@ -45,22 +45,11 @@ class QgsExpressionUtils
     };
 
 
-    static constexpr TVL AND[3][3] =
-    {
-      // false  true    unknown
-      { False, False,   False },   // false
-      { False, True,    Unknown }, // true
-      { False, Unknown, Unknown }  // unknown
-    };
+    static TVL AND[3][3];
 
-    static constexpr TVL OR[3][3] =
-    {
-      { False,   True, Unknown },  // false
-      { True,    True, True },     // true
-      { Unknown, True, Unknown }   // unknown
-    };
+    static TVL OR[3][3];
 
-    static constexpr TVL NOT[3] = { True, False, Unknown };
+    static TVL NOT[3];
 
 #define TVL_True QVariant( 1 )
 #define TVL_False QVariant( 0 )