diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2020-09-26 14:00:50 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2020-09-26 14:00:50 +0200 |
commit | 11ef6d3406c037ba8bdde9b42b9ba065fc5f37f7 (patch) | |
tree | 39e6ac373008db58aeee68c8c6b393556c77178e | |
parent | ee30152811a3f3131a951ace109e2ddde78482ef (diff) |
Avoid clang warnings.
10 files changed, 7 insertions, 11 deletions
diff --git a/eval/src/vespa/eval/instruction/generic_join.h b/eval/src/vespa/eval/instruction/generic_join.h index 81e56494897..25647452dff 100644 --- a/eval/src/vespa/eval/instruction/generic_join.h +++ b/eval/src/vespa/eval/instruction/generic_join.h @@ -6,7 +6,7 @@ #include <vespa/eval/eval/interpreted_function.h> namespace vespalib { class Stash; } -namespace vespalib::eval { class ValueBuilderFactory; } +namespace vespalib::eval { struct ValueBuilderFactory; } namespace vespalib::eval::instruction { diff --git a/eval/src/vespa/eval/instruction/generic_rename.h b/eval/src/vespa/eval/instruction/generic_rename.h index e4f0146b9a8..ca9f45bd341 100644 --- a/eval/src/vespa/eval/instruction/generic_rename.h +++ b/eval/src/vespa/eval/instruction/generic_rename.h @@ -7,7 +7,7 @@ #include <vespa/vespalib/stllike/string.h> #include <vector> -namespace vespalib::eval { class ValueBuilderFactory; } +namespace vespalib::eval { struct ValueBuilderFactory; } namespace vespalib::eval::instruction { diff --git a/eval/src/vespa/eval/tensor/mixed/packed_mappings_builder.cpp b/eval/src/vespa/eval/tensor/mixed/packed_mappings_builder.cpp index a78a7423520..fdfe5957a3f 100644 --- a/eval/src/vespa/eval/tensor/mixed/packed_mappings_builder.cpp +++ b/eval/src/vespa/eval/tensor/mixed/packed_mappings_builder.cpp @@ -54,8 +54,8 @@ PackedMappingsBuilder::target_memory(char *mem_start, char *mem_end) const ssize_t avail_sz = mem_end - mem_start; assert(needs_sz <= avail_sz); - uint32_t * int_store_mem = (uint32_t *) mem_start; - uint32_t * offsets_mem = (uint32_t *) (mem_start + int_store_size); + uint32_t * int_store_mem = (uint32_t *) (void *) mem_start; + uint32_t * offsets_mem = (uint32_t *) (void *) (mem_start + int_store_size); char * labels_mem = mem_start + int_store_size + label_offsets_size; ArrayRef<uint32_t> int_store_data(int_store_mem, int_store_cnt); diff --git a/eval/src/vespa/eval/tensor/mixed/packed_mixed_tensor_builder.cpp b/eval/src/vespa/eval/tensor/mixed/packed_mixed_tensor_builder.cpp index d311d589a27..75b307b1aa7 100644 --- a/eval/src/vespa/eval/tensor/mixed/packed_mixed_tensor_builder.cpp +++ b/eval/src/vespa/eval/tensor/mixed/packed_mixed_tensor_builder.cpp @@ -39,7 +39,7 @@ PackedMixedTensorBuilder<T>::build(std::unique_ptr<ValueBuilder<T>>) // copy cells: memcpy(cells_mem, &_cells[0], cells_size); - ConstArrayRef<T> cells((T *)cells_mem, _cells.size()); + ConstArrayRef<T> cells((T *)(void *) cells_mem, _cells.size()); PackedMixedTensor * built = new (mem) PackedMixedTensor(_type, TypedCells(cells), mappings); diff --git a/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp b/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp index 209a35ce4a2..13427d0e3aa 100644 --- a/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp @@ -403,7 +403,6 @@ FeedHandler::FeedHandler(IThreadingService &writeService, _serialNum(0), _prunedSerialNum(0), _numPendingCommit(0), - _numCommitsCompleted(0), _delayedPrune(false), _feedLock(), _feedState(make_shared<InitState>(getDocTypeName())), diff --git a/searchcore/src/vespa/searchcore/proton/server/feedhandler.h b/searchcore/src/vespa/searchcore/proton/server/feedhandler.h index 97629bfc018..395d11ba2fa 100644 --- a/searchcore/src/vespa/searchcore/proton/server/feedhandler.h +++ b/searchcore/src/vespa/searchcore/proton/server/feedhandler.h @@ -77,7 +77,6 @@ private: SerialNum _serialNum; SerialNum _prunedSerialNum; size_t _numPendingCommit; - size_t _numCommitsCompleted; bool _delayedPrune; mutable std::shared_mutex _feedLock; FeedStateSP _feedState; diff --git a/searchcore/src/vespa/searchcore/proton/server/feedstate.h b/searchcore/src/vespa/searchcore/proton/server/feedstate.h index 6de1d7a4322..7d559eb4375 100644 --- a/searchcore/src/vespa/searchcore/proton/server/feedstate.h +++ b/searchcore/src/vespa/searchcore/proton/server/feedstate.h @@ -11,7 +11,7 @@ namespace vespalib { namespace proton { class FeedOperation; -class PacketWrapper; +struct PacketWrapper; /** * Class representing the current state of a feed handler. diff --git a/storage/src/vespa/storage/storageserver/rpc/cluster_controller_api_rpc_service.cpp b/storage/src/vespa/storage/storageserver/rpc/cluster_controller_api_rpc_service.cpp index e34030f9bd7..4c7cf05241a 100644 --- a/storage/src/vespa/storage/storageserver/rpc/cluster_controller_api_rpc_service.cpp +++ b/storage/src/vespa/storage/storageserver/rpc/cluster_controller_api_rpc_service.cpp @@ -20,7 +20,6 @@ ClusterControllerApiRpcService::ClusterControllerApiRpcService( MessageDispatcher& message_dispatcher, SharedRpcResources& rpc_resources) : _message_dispatcher(message_dispatcher), - _rpc_resources(rpc_resources), _closed(false) { register_server_methods(rpc_resources); diff --git a/storage/src/vespa/storage/storageserver/rpc/cluster_controller_api_rpc_service.h b/storage/src/vespa/storage/storageserver/rpc/cluster_controller_api_rpc_service.h index 793644194dc..d5e753ff04b 100644 --- a/storage/src/vespa/storage/storageserver/rpc/cluster_controller_api_rpc_service.h +++ b/storage/src/vespa/storage/storageserver/rpc/cluster_controller_api_rpc_service.h @@ -24,7 +24,6 @@ class SharedRpcResources; class ClusterControllerApiRpcService : public FRT_Invokable { MessageDispatcher& _message_dispatcher; - SharedRpcResources& _rpc_resources; std::atomic<bool> _closed; public: static constexpr uint32_t StateBundleMaxUncompressedSize = 1024 * 1024 * 16; diff --git a/storage/src/vespa/storage/storageserver/rpc/rpc_target_factory.h b/storage/src/vespa/storage/storageserver/rpc/rpc_target_factory.h index 8411a273dc2..ef438e96305 100644 --- a/storage/src/vespa/storage/storageserver/rpc/rpc_target_factory.h +++ b/storage/src/vespa/storage/storageserver/rpc/rpc_target_factory.h @@ -6,7 +6,7 @@ namespace storage::rpc { -class RpcTarget; +struct RpcTarget; /** * Factory for creating instances of RpcTarget based on a connection spec. |