Fix build

arangodb · KVS85 · Mar 31, 2020 · Feb 3, 2020 · Feb 3, 2020 · Feb 6, 2020
commit c35a353e0bb92f9ce632f3317a883947d04cf98c
diff --git a/3rdParty/fuerte/src/H2Connection.cpp b/3rdParty/fuerte/src/H2Connection.cpp
@@ -588,7 +588,7 @@ void H2Connection<T>::queueHttp2Requests() {
                                uint8_t* buf, size_t length, uint32_t* data_flags,
                                nghttp2_data_source* source,
                                void* user_data) -> ssize_t {
-          auto strm = static_cast<H2Connection<T>::Stream*>(source->ptr);
+          auto strm = static_cast<typename H2Connection<T>::Stream*>(source->ptr);
 
           auto payload = strm->request->payload();
 

diff --git a/3rdParty/fuerte/src/types.cpp b/3rdParty/fuerte/src/types.cpp
@@ -23,6 +23,7 @@
 #include <fuerte/types.h>
 
 #include <algorithm>
+#include <stdexcept>
 
 namespace arangodb { namespace fuerte { inline namespace v1 {
 

diff --git a/3rdParty/iresearch/core/utils/arena_allocator.hpp b/3rdParty/iresearch/core/utils/arena_allocator.hpp
@@ -148,9 +148,7 @@ class arena_allocator {
 
   template<typename T1, typename U, typename A1, typename A2>
   friend bool operator==(const arena_allocator<T1, A1>& lhs,
-                         const arena_allocator<U, A2>& rhs) noexcept {
-    return std::is_same<A1, A2>::value && lhs.arena_ == rhs.arena_;
-  }
+                         const arena_allocator<U, A2>& rhs) noexcept;
 
   template <typename U, typename A>
   friend class arena_allocator;
@@ -167,6 +165,13 @@ inline bool operator!=(const arena_allocator<T, A1>& lhs,
   return !(lhs == rhs);
 }
 
+template<typename T1, typename U, typename A1, typename A2>
+inline bool operator==(const arena_allocator<T1, A1>& lhs,
+  const arena_allocator<U, A2>& rhs) noexcept {
+  return std::is_same<A1, A2>::value && 
+    lhs.arena_ == reinterpret_cast<const void*>(rhs.arena_);
+}
+
 template<typename T, size_t N>
 using arena = memory_arena<N*sizeof(T), alignof(T)>;
 

diff --git a/lib/ProgramOptions/Parameters.h b/lib/ProgramOptions/Parameters.h
@@ -36,6 +36,7 @@
 #include <numeric>
 #include <type_traits>
 #include <unordered_set>
+#include <stdexcept>
 
 namespace arangodb {
 namespace options {

diff --git a/lib/Rest/Version.h b/lib/Rest/Version.h
@@ -25,6 +25,7 @@
 #define ARANGODB_REST_VERSION_H 1
 
 #include <map>
+#include <string>
 
 #include "Basics/operating-system.h"
 

diff --git a/tests/IResearch/ExpressionFilter-test.cpp b/tests/IResearch/ExpressionFilter-test.cpp
@@ -200,12 +200,6 @@ struct custom_sort : public irs::sort {
       score_cast(score) = irs::doc_limits::invalid();
     }
 
-    virtual void add(irs::byte_type* dst, irs::byte_type const* src) const override {
-      if (sort_.scorer_add) {
-        sort_.scorer_add(score_cast(dst), score_cast(src));
-      }
-    }
-
     virtual void  merge(irs::byte_type* dst, const irs::byte_type** src_start,
       const size_t size, size_t offset) const  override {
       auto& casted_dst = score_cast(dst + offset);

diff --git a/tests/IResearch/IResearchView-test.cpp b/tests/IResearch/IResearchView-test.cpp
@@ -103,7 +103,6 @@ struct DocIdScorer: public irs::sort {
   virtual sort::prepared::ptr prepare() const override { PTR_NAMED(Prepared, ptr); return ptr; }
 
   struct Prepared: public irs::sort::prepared_base<uint64_t, void> {
-    virtual void add(irs::byte_type* dst, const irs::byte_type* src) const override { score_cast(dst) = score_cast(src); }
     virtual void  merge(irs::byte_type* dst, const irs::byte_type** src_start,
       const size_t size, size_t offset) const  override {
       auto& casted_dst = score_cast(dst + offset);

diff --git a/tests/IResearch/common.cpp b/tests/IResearch/common.cpp
@@ -155,10 +155,6 @@ struct BoostScorer : public irs::sort {
 
     Prepared() = default;
 
-    virtual void add(irs::byte_type* dst, irs::byte_type const* src) const override {
-      score_cast(dst) += score_cast(src);
-    }
-
     virtual void  merge(irs::byte_type* dst, const irs::byte_type** src_start,
       const size_t size, size_t offset) const  override {
       auto& casted_dst = score_cast(dst + offset);
@@ -239,10 +235,6 @@ struct CustomScorer : public irs::sort {
 
     Prepared(float_t i) : i(i) {}
 
-    virtual void add(irs::byte_type* dst, const irs::byte_type* src) const override {
-      score_cast(dst) += score_cast(src);
-    }
-
     virtual void  merge(irs::byte_type* dst, const irs::byte_type** src_start,
       const size_t size, size_t offset) const  override {
       auto& casted_dst = score_cast(dst + offset);