Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed wrong defines

This commit is contained in:
Frank Celler 2019-09-12 14:46:23 +02:00
parent 86a35e93b6
commit 393ffba276
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/Aql/Graphs.cpp
View File

@ -37,7 +37,7 @@ EdgeConditionBuilder::EdgeConditionBuilder(AstNode* modCondition)
_toCondition(nullptr), _toCondition(nullptr),
_modCondition(modCondition), _modCondition(modCondition),
_containsCondition(false) { _containsCondition(false) {
#ifdef TRI_ENABLE_MAINTAINER_MODE #ifdef ARANGODB_ENABLE_MAINTAINER_MODE
if (_modCondition != nullptr) { if (_modCondition != nullptr) {
TRI_ASSERT(_modCondition->type == NODE_TYPE_OPERATOR_NARY_AND); 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 == _fromCondition || cond == _toCondition);
TRI_ASSERT(cond->type == NODE_TYPE_OPERATOR_BINARY_EQ); TRI_ASSERT(cond->type == NODE_TYPE_OPERATOR_BINARY_EQ);
if (_containsCondition) { if (_containsCondition) {
#ifdef TRI_ENABLE_MAINTAINER_MODE #ifdef ARANGODB_ENABLE_MAINTAINER_MODE
// If used correctly this class guarantuees that the last element // If used correctly this class guarantuees that the last element
// of the nary-and is the _from or _to part and is exchangable. // of the nary-and is the _from or _to part and is exchangable.
TRI_ASSERT(_modCondition->numMembers() > 0); TRI_ASSERT(_modCondition->numMembers() > 0);

10
arangod/Aql/TraversalNode.cpp
View File

@ -149,7 +149,7 @@ TraversalNode::TraversalNode(ExecutionPlan* plan, size_t id, TRI_vocbase_t* vocb
_pruneExpression->variables(_pruneVariables); _pruneExpression->variables(_pruneVariables);
} }
#ifdef TRI_ENABLE_MAINTAINER_MODE #ifdef ARANGODB_ENABLE_MAINTAINER_MODE
checkConditionsDefined(); checkConditionsDefined();
#endif #endif
} }
@ -264,7 +264,7 @@ TraversalNode::TraversalNode(ExecutionPlan* plan, arangodb::velocypack::Slice co
} }
} }
#ifdef TRI_ENABLE_MAINTAINER_MODE #ifdef ARANGODB_ENABLE_MAINTAINER_MODE
checkConditionsDefined(); checkConditionsDefined();
#endif #endif
} }
@ -566,7 +566,7 @@ ExecutionNode* TraversalNode::clone(ExecutionPlan* plan, bool withDependencies,
c->_conditionVariables.emplace(it->clone()); c->_conditionVariables.emplace(it->clone());
} }
#ifdef TRI_ENABLE_MAINTAINER_MODE #ifdef ARANGODB_ENABLE_MAINTAINER_MODE
checkConditionsDefined(); checkConditionsDefined();
#endif #endif
@ -596,7 +596,7 @@ ExecutionNode* TraversalNode::clone(ExecutionPlan* plan, bool withDependencies,
c->_vertexConditions.emplace(it.first, it.second->clone(_plan->getAst())); c->_vertexConditions.emplace(it.first, it.second->clone(_plan->getAst()));
} }
#ifdef TRI_ENABLE_MAINTAINER_MODE #ifdef ARANGODB_ENABLE_MAINTAINER_MODE
c->checkConditionsDefined(); c->checkConditionsDefined();
#endif #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 { void TraversalNode::checkConditionsDefined() const {
TRI_ASSERT(_tmpObjVariable != nullptr); TRI_ASSERT(_tmpObjVariable != nullptr);
TRI_ASSERT(_tmpObjVarNode != nullptr); TRI_ASSERT(_tmpObjVarNode != nullptr);

2
arangod/Aql/TraversalNode.h
View File

@ -194,7 +194,7 @@ class TraversalNode : public GraphNode {
Expression* pruneExpression() const { return _pruneExpression.get(); } Expression* pruneExpression() const { return _pruneExpression.get(); }
private: private:
#ifdef TRI_ENABLE_MAINTAINER_MODE #ifdef ARANGODB_ENABLE_MAINTAINER_MODE
void checkConditionsDefined() const; void checkConditionsDefined() const;
#endif #endif

2
tests/Geo/NearUtilsTest.cpp
View File

@ -39,7 +39,7 @@
#include <velocypack/velocypack-aliases.h> #include <velocypack/velocypack-aliases.h>
#include <cmath> #include <cmath>
#ifdef WIN32 #ifdef _WIN32
#undef near #undef near
#endif #endif