Avoid clang warnings.

4 files changed, 5 insertions, 5 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);