fix Windows build

arangod/Aql/AqlValue.cpp

@@ -34,6 +34,7 @@
 #include <velocypack/Slice.h>
 #include <velocypack/velocypack-aliases.h>
 
+using namespace arangodb;
 using namespace arangodb::aql;
 
 ////////////////////////////////////////////////////////////////////////////////

arangod/Aql/Condition.cpp

@@ -30,6 +30,7 @@
 #include "Basics/Exceptions.h"
 #include "Basics/json.h"
 #include "Basics/JsonHelper.h"
+#include "utils/Transaction.h"
 
 #ifdef _WIN32
 // turn off warnings about too long type name for debug symbols blabla in MSVC
@@ -37,6 +38,7 @@
 #pragma warning(disable : 4503)
 #endif
 
+using namespace arangodb;
 using namespace arangodb::aql;
 using CompareResult = ConditionPartCompareResult;
 
@@ -362,7 +364,7 @@ void Condition::andCombine(AstNode const* node) {
 
 std::pair<bool, bool> Condition::findIndexes(
     EnumerateCollectionNode const* node,
-    std::vector<Transaction::IndexHandle>& usedIndexes,
+    std::vector<arangodb::Transaction::IndexHandle>& usedIndexes,
     SortCondition const* sortCondition) {
   TRI_ASSERT(usedIndexes.empty());
   Variable const* reference = node->outVariable();

arangod/Aql/Functions.cpp

@@ -677,7 +677,7 @@ static void GetDocumentByIdentifier(arangodb::AqlTransaction* trx,
     try {
       TRI_voc_cid_t cid;
       RegisterCollectionInTransaction(trx, collectionName, cid);
-    } catch (arangodb::basics::Exception const& ex) {
+    } catch (arangodb::basics::Exception const&) {
       if (ignoreError) {
         return;
       }
@@ -693,7 +693,7 @@ static void GetDocumentByIdentifier(arangodb::AqlTransaction* trx,
       try {
         TRI_voc_cid_t cid;
         RegisterCollectionInTransaction(trx, parts[0], cid);
-      } catch (arangodb::basics::Exception const& ex) {
+      } catch (arangodb::basics::Exception const&) {
         if (ignoreError) {
           return;
         }
@@ -714,7 +714,7 @@ static void GetDocumentByIdentifier(arangodb::AqlTransaction* trx,
       try {
         TRI_voc_cid_t cid;
         RegisterCollectionInTransaction(trx, collectionName, cid);
-      } catch (arangodb::basics::Exception const& ex) {
+      } catch (arangodb::basics::Exception const&) {
         if (ignoreError) {
           return;
         }

arangod/Aql/IndexNode.cpp

@@ -28,6 +28,7 @@
 #include "Aql/ExecutionPlan.h"
 #include "Utils/Transaction.h"
 
+using namespace arangodb;
 using namespace arangodb::aql;
 
 using JsonHelper = arangodb::basics::JsonHelper;
@@ -38,7 +39,7 @@ using JsonHelper = arangodb::basics::JsonHelper;
 
 IndexNode::IndexNode(ExecutionPlan* plan, size_t id, TRI_vocbase_t* vocbase,
             Collection const* collection, Variable const* outVariable,
-            std::vector<Transaction::IndexHandle> const& indexes,
+            std::vector<arangodb::Transaction::IndexHandle> const& indexes,
             Condition* condition, bool reverse)
       : ExecutionNode(plan, id),
         _vocbase(vocbase),

arangod/Cluster/ClusterTraverser.cpp

@@ -24,6 +24,8 @@
 #include "ClusterTraverser.h"
 #include "Cluster/ClusterMethods.h"
 
+using namespace arangodb;
+
 using ClusterTraversalPath = arangodb::traverser::ClusterTraversalPath;
 using ClusterTraverser = arangodb::traverser::ClusterTraverser;
 

arangod/Utils/Transaction.cpp

@@ -105,7 +105,7 @@ static bool indexSupportsSort(Index const* idx, arangodb::aql::Variable const* r
 static OperationResult DBServerResponseBad(std::shared_ptr<VPackBuilder> resultBody) {
   VPackSlice res = resultBody->slice();
   return OperationResult(
-      arangodb::basics::VelocyPackHelper::getNumericValue<uint64_t>(
+      arangodb::basics::VelocyPackHelper::getNumericValue<int>(
           res, "errorNum", TRI_ERROR_INTERNAL),
       arangodb::basics::VelocyPackHelper::getStringValue(
           res, "errorMessage", "JSON sent to DBserver was bad"));

arangosh/Benchmark/BenchFeature.cpp

@@ -207,7 +207,7 @@ void BenchFeature::start() {
 
     BenchmarkThread* thread = new BenchmarkThread(
         benchmark.get(), &startCondition, &BenchFeature::updateStartCounter,
-        i, (unsigned long)_batchSize, &operationsCounter, client, _keepAlive,
+        static_cast<int>(i), (unsigned long)_batchSize, &operationsCounter, client, _keepAlive,
         _async, _verbose);
 
     threads.push_back(thread);

arangosh/Shell/ShellFeature.cpp

@@ -147,7 +147,7 @@ void ShellFeature::start() {
   try {
     switch (_runMode) {
       case RunMode::INTERACTIVE:
-        ok = shell->runShell(_positionals);
+        ok = (shell->runShell(_positionals) == TRI_ERROR_NO_ERROR);
         break;
 
       case RunMode::EXECUTE_SCRIPT:

lib/SimpleHttpClient/GeneralClientConnection.cpp

@@ -88,7 +88,7 @@ GeneralClientConnection* GeneralClientConnection::factory(
 
 GeneralClientConnection* GeneralClientConnection::factory(
     std::unique_ptr<Endpoint>& endpoint, double requestTimeout, double connectTimeout,
-    size_t numRetries, uint32_t sslProtocol) {
+    size_t numRetries, uint64_t sslProtocol) {
   if (endpoint->encryption() == Endpoint::EncryptionType::NONE) {
     return new ClientConnection(endpoint, requestTimeout, connectTimeout,
                                 numRetries);

lib/SimpleHttpClient/GeneralClientConnection.h

@@ -75,7 +75,7 @@ class GeneralClientConnection {
 
   static GeneralClientConnection* factory(
       std::unique_ptr<Endpoint>&, double, double, size_t,
-      uint32_t);
+      uint64_t);
 
   //////////////////////////////////////////////////////////////////////////////
   /// @brief return the endpoint