always use actual class name

3 files changed, 2 insertions, 9 deletions

diff --git a/eval/src/vespa/eval/eval/tensor_function.cpp b/eval/src/vespa/eval/eval/tensor_function.cpp
index 97e0c830936..95b5b9f1d6c 100644
--- a/eval/src/vespa/eval/eval/tensor_function.cpp
+++ b/eval/src/vespa/eval/eval/tensor_function.cpp
@@ -9,7 +9,6 @@
 #include "visit_stuff.h"
 #include <vespa/vespalib/objects/visit.hpp>
 #include <vespa/vespalib/objects/objectdumper.h>
-#include <vespa/vespalib/util/classname.h>
 
 namespace vespalib {
 namespace eval {
@@ -22,12 +21,6 @@ TensorFunction::as_string() const
     return dumper.toString();
 }
 
-vespalib::string
-TensorFunction::class_name() const
-{
-    return vespalib::getClassName(*this);
-}
-
 void
 TensorFunction::visit_self(vespalib::ObjectVisitor &visitor) const
 {
diff --git a/eval/src/vespa/eval/eval/tensor_function.h b/eval/src/vespa/eval/eval/tensor_function.h
index 356424d2c2c..c19a5218467 100644
--- a/eval/src/vespa/eval/eval/tensor_function.h
+++ b/eval/src/vespa/eval/eval/tensor_function.h
@@ -96,7 +96,6 @@ struct TensorFunction
 
     // for debug dumping
     vespalib::string as_string() const;
-    virtual vespalib::string class_name() const;
     virtual void visit_self(vespalib::ObjectVisitor &visitor) const;
     virtual void visit_children(vespalib::ObjectVisitor &visitor) const;
 
diff --git a/eval/src/vespa/eval/eval/visit_stuff.cpp b/eval/src/vespa/eval/eval/visit_stuff.cpp
index bc2be32bb5f..821e609ebd0 100644
--- a/eval/src/vespa/eval/eval/visit_stuff.cpp
+++ b/eval/src/vespa/eval/eval/visit_stuff.cpp
@@ -7,6 +7,7 @@
 #include "tensor_nodes.h"
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/vespalib/objects/objectvisitor.h>
+#include <vespa/vespalib/util/classname.h>
 
 namespace vespalib::eval::visit {
 namespace {
@@ -64,7 +65,7 @@ vespalib::string name_of(join_fun_t fun) {
 } // namespace vespalib::eval::visit
 
 void visit(vespalib::ObjectVisitor &visitor, const vespalib::string &name, const vespalib::eval::TensorFunction &value) {
-    visitor.openStruct(name, value.class_name());
+    visitor.openStruct(name, vespalib::getClassName(value));
     {
         value.visit_self(visitor);
         value.visit_children(visitor);