diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2020-10-03 15:15:19 +0200 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@broadpark.no> | 2020-10-03 15:56:07 +0200 |
| commit | b26ae70a5b98d2a47409cd904254db5ab77cef77 (patch) | |
| tree | ff03970eea63b8627c5a51b1e19d02424f93937a /storage | |
| parent | 58c15afd3ea77235e2ea26f4baa2e171574dd3b6 (diff) | |
Handle gcc 8.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/src/vespa/storage/storageserver/rpc/rpc_envelope_proto.h | 12 | ||||
| -rw-r--r-- | storage/src/vespa/storage/storageserver/rpc/storage_api_rpc_service.cpp | 2 |
2 files changed, 13 insertions, 1 deletions
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> |