Merge pull request #14692 from vespa-engine/toregge/handle-gcc-8

Handle gcc 8.

4 files changed, 15 insertions, 3 deletions

diff --git a/eval/src/vespa/eval/eval/value_codec.cpp b/eval/src/vespa/eval/eval/value_codec.cpp
index 74d0c5aafcc..762cecea1c3 100644
--- a/eval/src/vespa/eval/eval/value_codec.cpp
+++ b/eval/src/vespa/eval/eval/value_codec.cpp
@@ -184,7 +184,7 @@ struct CreateValueFromTensorSpec {
                 assert(pos != entry.first.end());
                 assert(pos->second.is_mapped() == dim.is_mapped());
                 if (dim.is_mapped()) {
-                    sparse_key.emplace_back(pos->second.name);
+                    sparse_key.push_back(pos->second.name);
                 } else {
                     dense_key = (dense_key * dim.size) + pos->second.index;
                 }
diff --git a/eval/src/vespa/eval/instruction/generic_reduce.cpp b/eval/src/vespa/eval/instruction/generic_reduce.cpp
index d294b478210..0d67789eac9 100644
--- a/eval/src/vespa/eval/instruction/generic_reduce.cpp
+++ b/eval/src/vespa/eval/instruction/generic_reduce.cpp
@@ -95,7 +95,7 @@ struct SparseReduceState {
         std::vector<vespalib::stringref> addr;
         addr.reserve(map_entry.first.size());
         for (const vespalib::string &label: map_entry.first) {
-            addr.emplace_back(label);
+            addr.push_back(label);
         }
         return addr;
     }
diff --git a/storage/src/vespa/storage/storageserver/rpc/rpc_envelope_proto.h b/storage/src/vespa/storage/storageserver/rpc/rpc_envelope_proto.h
new file mode 100644
index 00000000000..dbc048cd504
--- /dev/null
+++ b/storage/src/vespa/storage/storageserver/rpc/rpc_envelope_proto.h
@@ -0,0 +1,12 @@
+// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#pragma once
+
+#pragma GCC diagnostic push
+#ifndef __clang__
+#pragma GCC diagnostic ignored "-Wsuggest-override"
+#endif
+
+#include "rpc_envelope.pb.h"
+
+#pragma GCC diagnostic pop
diff --git a/storage/src/vespa/storage/storageserver/rpc/storage_api_rpc_service.cpp b/storage/src/vespa/storage/storageserver/rpc/storage_api_rpc_service.cpp
index 8b5c7706510..ba3c86a780e 100644
--- a/storage/src/vespa/storage/storageserver/rpc/storage_api_rpc_service.cpp
+++ b/storage/src/vespa/storage/storageserver/rpc/storage_api_rpc_service.cpp
@@ -4,7 +4,7 @@
 #include "caching_rpc_target_resolver.h"
 #include "message_codec_provider.h"
 #include "shared_rpc_resources.h"
-#include "rpc_envelope.pb.h"
+#include "rpc_envelope_proto.h"
 #include <vespa/fnet/frt/supervisor.h>
 #include <vespa/fnet/frt/target.h>
 #include <vespa/slobrok/sbmirror.h>