From 002f503dacbf1e4b6bb12fec0cb89f45e2463b51 Mon Sep 17 00:00:00 2001 From: jsteemann Date: Fri, 2 Sep 2016 09:14:34 +0200 Subject: [PATCH] don't use c_str() --- arangod/Aql/ExecutionNode.cpp | 2 +- arangod/Aql/Expression.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arangod/Aql/ExecutionNode.cpp b/arangod/Aql/ExecutionNode.cpp index 0db286488e..e2cdea374f 100644 --- a/arangod/Aql/ExecutionNode.cpp +++ b/arangod/Aql/ExecutionNode.cpp @@ -562,7 +562,7 @@ Variable* ExecutionNode::varFromVPack(Ast* ast, std::string msg; msg += "mandatory variable \"" + std::string(variableName) + "\" not found."; - THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, msg.c_str()); + THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, msg); } return ast->variables()->createVariable(variable); } diff --git a/arangod/Aql/Expression.cpp b/arangod/Aql/Expression.cpp index 24f0e83ac0..8a8b8ebed4 100644 --- a/arangod/Aql/Expression.cpp +++ b/arangod/Aql/Expression.cpp @@ -498,7 +498,7 @@ AqlValue Expression::executeSimpleExpression( std::string msg("unhandled type '"); msg.append(node->getTypeString()); msg.append("' in executeSimpleExpression()"); - THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, msg.c_str()); + THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, msg); } } @@ -848,7 +848,7 @@ AqlValue Expression::executeSimpleExpressionReference( msg.append(v->name); msg.append("' in executeSimpleExpression()"); - THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, msg.c_str()); + THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, msg); } /// @brief execute an expression of type SIMPLE with RANGE @@ -1135,7 +1135,7 @@ AqlValue Expression::executeSimpleExpressionComparison( std::string msg("unhandled type '"); msg.append(node->getTypeString()); msg.append("' in executeSimpleExpression()"); - THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, msg.c_str()); + THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, msg); } }