Merge pull request #18826 from vespa-engine/toregge/fix-clang-errors-on-fedora-34

Fix forward declaration.

3 files changed, 13 insertions, 1 deletions

diff --git a/eval/src/vespa/eval/eval/compile_tensor_function.h b/eval/src/vespa/eval/eval/compile_tensor_function.h
index cae30805b08..e7657f868d9 100644
--- a/eval/src/vespa/eval/eval/compile_tensor_function.h
+++ b/eval/src/vespa/eval/eval/compile_tensor_function.h
@@ -27,6 +27,12 @@ struct CTFMetaData {
     struct Step {
         vespalib::string class_name;
         vespalib::string symbol_name;
+        Step(vespalib::string &&class_name_in,
+             vespalib::string &&symbol_name_in)
+            : class_name(std::move(class_name_in)),
+              symbol_name(std::move(symbol_name_in))
+        {
+        }
     };
     std::vector<Step> steps;
     ~CTFMetaData();
diff --git a/eval/src/vespa/eval/eval/interpreted_function.h b/eval/src/vespa/eval/eval/interpreted_function.h
index be7c37c3ab4..4e88920b45e 100644
--- a/eval/src/vespa/eval/eval/interpreted_function.h
+++ b/eval/src/vespa/eval/eval/interpreted_function.h
@@ -13,7 +13,7 @@ namespace vespalib::eval {
 namespace nodes { struct Node; }
 struct TensorFunction;
 class TensorSpec;
-class CTFMetaData;
+struct CTFMetaData;
 
 /**
  * A Function that has been prepared for execution. This will
diff --git a/slobrok/src/vespa/slobrok/server/union_service_map.h b/slobrok/src/vespa/slobrok/server/union_service_map.h
index 79c34ed908e..f5e628a58bc 100644
--- a/slobrok/src/vespa/slobrok/server/union_service_map.h
+++ b/slobrok/src/vespa/slobrok/server/union_service_map.h
@@ -20,6 +20,12 @@ private:
     struct CountedSpec {
         vespalib::string spec;
         size_t count;
+        CountedSpec(const vespalib::string &spec_in,
+                    size_t count_in)
+            : spec(spec_in),
+              count(count_in)
+        {
+        }
     };
     using Mappings = std::vector<CountedSpec>;
     std::map<vespalib::string, Mappings> _mappings;