From 821ce84b4b15c4a42ab12346020b9c9db94e709a Mon Sep 17 00:00:00 2001 From: Max Neunhoeffer Date: Fri, 22 Aug 2014 09:28:41 +0200 Subject: [PATCH 1/3] Disable debugging output. --- arangod/Aql/ExecutionPlan.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arangod/Aql/ExecutionPlan.cpp b/arangod/Aql/ExecutionPlan.cpp index 4fcda543e4..46da2cb43f 100644 --- a/arangod/Aql/ExecutionPlan.cpp +++ b/arangod/Aql/ExecutionPlan.cpp @@ -1016,8 +1016,6 @@ void ExecutionPlan::unlinkNodes (std::unordered_set& toRemove) { //////////////////////////////////////////////////////////////////////////////// void ExecutionPlan::unlinkNode (ExecutionNode* node) { - checkLinkage(); - std::cout << toJson(TRI_UNKNOWN_MEM_ZONE, true).toString() << std::endl; auto parents = node->getParents(); if (parents.empty()) { THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, @@ -1035,8 +1033,6 @@ void ExecutionPlan::unlinkNode (ExecutionNode* node) { node->removeDependency(x); } } - std::cout << toJson(TRI_UNKNOWN_MEM_ZONE, true).toString() << std::endl; - checkLinkage(); } //////////////////////////////////////////////////////////////////////////////// From 5d15b4fba58d22ea46fea9745696d61586858da3 Mon Sep 17 00:00:00 2001 From: Max Neunhoeffer Date: Fri, 22 Aug 2014 09:33:26 +0200 Subject: [PATCH 2/3] Silence an (unjustified) compiler warning. --- lib/ProgramOptions/program-options.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ProgramOptions/program-options.cpp b/lib/ProgramOptions/program-options.cpp index 2b556260e8..f18dfa9a69 100644 --- a/lib/ProgramOptions/program-options.cpp +++ b/lib/ProgramOptions/program-options.cpp @@ -1410,7 +1410,7 @@ bool TRI_ParseArgumentsProgramOptions (TRI_program_options_t * options, extern int optind; TRI_string_buffer_t buffer; - TRI_PO_item_t * item; + TRI_PO_item_t* item = nullptr; const char* shortOptions; size_t i; int idx; From c4918e4fb7dd408f7c555c56be504b5344cf4a0f Mon Sep 17 00:00:00 2001 From: Max Neunhoeffer Date: Fri, 22 Aug 2014 09:36:31 +0200 Subject: [PATCH 3/3] Silence another compiler warning. --- arangod/VocBase/transaction.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arangod/VocBase/transaction.cpp b/arangod/VocBase/transaction.cpp index 962f656947..6aa8700bb2 100644 --- a/arangod/VocBase/transaction.cpp +++ b/arangod/VocBase/transaction.cpp @@ -865,7 +865,7 @@ int TRI_AddCollectionTransaction (TRI_transaction_t* trx, } // check if we already have got this collection in the _collections vector - size_t position; + size_t position = 0; TRI_transaction_collection_t* trxCollection = FindCollection(trx, cid, &position); if (trxCollection != nullptr) {