From 828f46c76b76986c1525511b310ca1568f7c691f Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Fri, 29 Jan 2016 19:19:06 +0100 Subject: [PATCH] shut up compiler --- arangod/Aql/Functions.cpp | 12 ++++++++++-- arangod/Cluster/v8-cluster.cpp | 3 +-- arangod/V8Server/v8-replication.cpp | 2 ++ lib/Basics/win-utils.cpp | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/arangod/Aql/Functions.cpp b/arangod/Aql/Functions.cpp index 6b62295f88..a5ab6c15eb 100644 --- a/arangod/Aql/Functions.cpp +++ b/arangod/Aql/Functions.cpp @@ -363,6 +363,7 @@ static bool ValueToBoolean(TRI_json_t const* json) { return boolValue; } +#if 0 static bool ValueToBoolean(VPackSlice const& slice) { if (slice.isBoolean()) { return slice.getBoolean(); @@ -378,6 +379,7 @@ static bool ValueToBoolean(VPackSlice const& slice) { } return false; } +#endif //////////////////////////////////////////////////////////////////////////////// /// @brief extract a boolean parameter from an array @@ -512,6 +514,7 @@ static bool ListContainsElement(Json const& list, Json const& testee) { return ListContainsElement(list, testee, unused); } +#if 0 static bool ListContainsElement(VPackSlice const& list, VPackSlice const& testee, size_t& index) { TRI_ASSERT(list.isArray()); @@ -524,11 +527,14 @@ static bool ListContainsElement(VPackSlice const& list, } return false; } +#endif +#if 0 static bool ListContainsElement(VPackSlice const& list, VPackSlice const& testee) { size_t unused; return ListContainsElement(list, testee, unused); } +#endif //////////////////////////////////////////////////////////////////////////////// /// @brief Computes the Variance of the given list. @@ -560,6 +566,7 @@ static bool Variance(Json const& values, double& value, size_t& count) { return true; } +#if 0 static bool Variance(VPackSlice const& values, double& value, size_t& count) { TRI_ASSERT(values.isArray()); value = 0.0; @@ -580,8 +587,7 @@ static bool Variance(VPackSlice const& values, double& value, size_t& count) { } return true; } - - +#endif //////////////////////////////////////////////////////////////////////////////// /// @brief Sorts the given list of Numbers in ASC order. @@ -612,6 +618,7 @@ static bool SortNumberList(Json const& values, std::vector& result) { /// Returns false if the list contains non-number values. //////////////////////////////////////////////////////////////////////////////// +#if 0 static bool SortNumberList(VPackSlice const& values, std::vector& result) { TRI_ASSERT(values.isArray()); @@ -628,6 +635,7 @@ static bool SortNumberList(VPackSlice const& values, std::sort(result.begin(), result.end()); return true; } +#endif //////////////////////////////////////////////////////////////////////////////// /// @brief Expands a shaped Json diff --git a/arangod/Cluster/v8-cluster.cpp b/arangod/Cluster/v8-cluster.cpp index 1e2748e81d..524222cbdc 100644 --- a/arangod/Cluster/v8-cluster.cpp +++ b/arangod/Cluster/v8-cluster.cpp @@ -86,9 +86,8 @@ static void JS_CasAgency(v8::FunctionCallbackInfo const& args) { std::string const key = TRI_ObjectToString(args[0]); - int res = TRI_ERROR_NO_ERROR; VPackBuilder oldBuilder; - res = TRI_V8ToVPack(isolate, oldBuilder, args[1], false); + int res = TRI_V8ToVPack(isolate, oldBuilder, args[1], false); if (res != TRI_ERROR_NO_ERROR) { TRI_V8_THROW_EXCEPTION_PARAMETER("cannot convert to VPack"); diff --git a/arangod/V8Server/v8-replication.cpp b/arangod/V8Server/v8-replication.cpp index 3b7559b401..898498ea79 100644 --- a/arangod/V8Server/v8-replication.cpp +++ b/arangod/V8Server/v8-replication.cpp @@ -300,6 +300,7 @@ static void JS_SynchronizeReplication( } } +#if 0 bool forSynchronousReplication = false; if (object->Has(TRI_V8_ASCII_STRING("forSynchronousReplication"))) { if (object->Get(TRI_V8_ASCII_STRING("forSynchronousReplication"))->IsBoolean()) { @@ -307,6 +308,7 @@ static void JS_SynchronizeReplication( TRI_ObjectToBoolean(object->Get(TRI_V8_ASCII_STRING("forSynchronousReplication"))); } } +#endif std::string errorMsg = ""; InitialSyncer syncer(vocbase, &config, restrictCollections, restrictType, diff --git a/lib/Basics/win-utils.cpp b/lib/Basics/win-utils.cpp index 759e495c57..4823ff0b7b 100644 --- a/lib/Basics/win-utils.cpp +++ b/lib/Basics/win-utils.cpp @@ -559,5 +559,5 @@ void TRI_WindowsEmergencyLog(char const* func, char const* file, int line, va_start(ap, fmt); TRI_LogWindowsEventlog(func, file, line, fmt, ap); - va_end(wva); + va_end(ap); }