From 393ffba276a2a5b3abf5e4b1004e7ac1c8f98cc8 Mon Sep 17 00:00:00 2001
From: Frank Celler <frank@arangodb.com>
Date: Thu, 12 Sep 2019 14:46:23 +0200
Subject: [PATCH] fixed wrong defines

---
 arangod/Aql/Graphs.cpp        |  4 ++--
 arangod/Aql/TraversalNode.cpp | 10 +++++-----
 arangod/Aql/TraversalNode.h   |  2 +-
 tests/Geo/NearUtilsTest.cpp   |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/arangod/Aql/Graphs.cpp b/arangod/Aql/Graphs.cpp
index 09608a9bf2..1e956fefc7 100644
--- a/arangod/Aql/Graphs.cpp
+++ b/arangod/Aql/Graphs.cpp
@@ -37,7 +37,7 @@ EdgeConditionBuilder::EdgeConditionBuilder(AstNode* modCondition)
       _toCondition(nullptr),
       _modCondition(modCondition),
       _containsCondition(false) {
-#ifdef TRI_ENABLE_MAINTAINER_MODE
+#ifdef ARANGODB_ENABLE_MAINTAINER_MODE
   if (_modCondition != nullptr) {
     TRI_ASSERT(_modCondition->type == NODE_TYPE_OPERATOR_NARY_AND);
   }
@@ -58,7 +58,7 @@ void EdgeConditionBuilder::swapSides(AstNode* cond) {
   TRI_ASSERT(cond == _fromCondition || cond == _toCondition);
   TRI_ASSERT(cond->type == NODE_TYPE_OPERATOR_BINARY_EQ);
   if (_containsCondition) {
-#ifdef TRI_ENABLE_MAINTAINER_MODE
+#ifdef ARANGODB_ENABLE_MAINTAINER_MODE
     // If used correctly this class guarantuees that the last element
     // of the nary-and is the _from or _to part and is exchangable.
     TRI_ASSERT(_modCondition->numMembers() > 0);
diff --git a/arangod/Aql/TraversalNode.cpp b/arangod/Aql/TraversalNode.cpp
index fba659d817..da4fb90db3 100644
--- a/arangod/Aql/TraversalNode.cpp
+++ b/arangod/Aql/TraversalNode.cpp
@@ -149,7 +149,7 @@ TraversalNode::TraversalNode(ExecutionPlan* plan, size_t id, TRI_vocbase_t* vocb
     _pruneExpression->variables(_pruneVariables);
   }
 
-#ifdef TRI_ENABLE_MAINTAINER_MODE
+#ifdef ARANGODB_ENABLE_MAINTAINER_MODE
   checkConditionsDefined();
 #endif
 }
@@ -264,7 +264,7 @@ TraversalNode::TraversalNode(ExecutionPlan* plan, arangodb::velocypack::Slice co
     }
   }
 
-#ifdef TRI_ENABLE_MAINTAINER_MODE
+#ifdef ARANGODB_ENABLE_MAINTAINER_MODE
   checkConditionsDefined();
 #endif
 }
@@ -566,7 +566,7 @@ ExecutionNode* TraversalNode::clone(ExecutionPlan* plan, bool withDependencies,
     c->_conditionVariables.emplace(it->clone());
   }
 
-#ifdef TRI_ENABLE_MAINTAINER_MODE
+#ifdef ARANGODB_ENABLE_MAINTAINER_MODE
   checkConditionsDefined();
 #endif
 
@@ -596,7 +596,7 @@ ExecutionNode* TraversalNode::clone(ExecutionPlan* plan, bool withDependencies,
     c->_vertexConditions.emplace(it.first, it.second->clone(_plan->getAst()));
   }
 
-#ifdef TRI_ENABLE_MAINTAINER_MODE
+#ifdef ARANGODB_ENABLE_MAINTAINER_MODE
   c->checkConditionsDefined();
 #endif
 
@@ -762,7 +762,7 @@ void TraversalNode::getPruneVariables(std::vector<Variable const*>& res) const {
   }
 }
 
-#ifdef TRI_ENABLE_MAINTAINER_MODE
+#ifdef ARANGODB_ENABLE_MAINTAINER_MODE
 void TraversalNode::checkConditionsDefined() const {
   TRI_ASSERT(_tmpObjVariable != nullptr);
   TRI_ASSERT(_tmpObjVarNode != nullptr);
diff --git a/arangod/Aql/TraversalNode.h b/arangod/Aql/TraversalNode.h
index f9741eae00..8ff2af91c5 100644
--- a/arangod/Aql/TraversalNode.h
+++ b/arangod/Aql/TraversalNode.h
@@ -194,7 +194,7 @@ class TraversalNode : public GraphNode {
   Expression* pruneExpression() const { return _pruneExpression.get(); }
 
  private:
-#ifdef TRI_ENABLE_MAINTAINER_MODE
+#ifdef ARANGODB_ENABLE_MAINTAINER_MODE
   void checkConditionsDefined() const;
 #endif
 
diff --git a/tests/Geo/NearUtilsTest.cpp b/tests/Geo/NearUtilsTest.cpp
index 420104f97f..f2603c4510 100644
--- a/tests/Geo/NearUtilsTest.cpp
+++ b/tests/Geo/NearUtilsTest.cpp
@@ -39,7 +39,7 @@
 #include <velocypack/velocypack-aliases.h>
 #include <cmath>
 
-#ifdef WIN32
+#ifdef _WIN32
 #undef near
 #endif