Avoid using vespalib::Identifiable.

2 files changed, 13 insertions, 12 deletions

diff --git a/searchlib/src/apps/tests/memoryindexstress_test.cpp b/searchlib/src/apps/tests/memoryindexstress_test.cpp
index 07747a66892..d8f8cd9d67c 100644
--- a/searchlib/src/apps/tests/memoryindexstress_test.cpp
+++ b/searchlib/src/apps/tests/memoryindexstress_test.cpp
@@ -1,18 +1,10 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/document/annotation/spanlist.h>
-#include <vespa/document/annotation/spantree.h>
-#include <vespa/document/datatype/documenttype.h>
-#include <vespa/document/fieldvalue/document.h>
-#include <vespa/document/fieldvalue/stringfieldvalue.h>
-#include <vespa/document/repo/configbuilder.h>
-#include <vespa/document/repo/documenttyperepo.h>
-#include <vespa/document/repo/fixedtyperepo.h>
+
 #include <vespa/searchlib/common/scheduletaskcallback.h>
 #include <vespa/searchlib/fef/matchdata.h>
 #include <vespa/searchlib/fef/matchdatalayout.h>
 #include <vespa/searchlib/fef/termfieldmatchdata.h>
-#include <vespa/searchlib/index/i_field_length_inspector.h>
 #include <vespa/searchlib/memoryindex/memory_index.h>
 #include <vespa/searchlib/query/tree/simplequery.h>
 #include <vespa/searchlib/queryeval/fake_requestcontext.h>
@@ -20,11 +12,20 @@
 #include <vespa/searchlib/queryeval/fake_searchable.h>
 #include <vespa/searchlib/queryeval/searchiterator.h>
 #include <vespa/searchlib/test/index/mock_field_length_inspector.h>
+#include <vespa/document/annotation/spanlist.h>
+#include <vespa/document/annotation/spantree.h>
+#include <vespa/document/datatype/documenttype.h>
+#include <vespa/document/fieldvalue/document.h>
+#include <vespa/document/fieldvalue/stringfieldvalue.h>
+#include <vespa/document/repo/configbuilder.h>
+#include <vespa/document/repo/documenttyperepo.h>
+#include <vespa/document/repo/fixedtyperepo.h>
 #include <vespa/vespalib/util/rand48.h>
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/vespalib/util/threadstackexecutor.h>
 #include <vespa/vespalib/util/sequencedtaskexecutor.h>
 #include <vespa/vespalib/util/size_literals.h>
+#include <vespa/vespalib/stllike/asciistream.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP("memoryindexstress_test");
diff --git a/searchlib/src/apps/vespa-attribute-inspect/vespa-attribute-inspect.cpp b/searchlib/src/apps/vespa-attribute-inspect/vespa-attribute-inspect.cpp
index 84a4f43cc8e..d9d6bb56152 100644
--- a/searchlib/src/apps/vespa-attribute-inspect/vespa-attribute-inspect.cpp
+++ b/searchlib/src/apps/vespa-attribute-inspect/vespa-attribute-inspect.cpp
@@ -40,7 +40,7 @@ void
 LoadAttribute::applyUpdate(const AttributePtr & ptr)
 {
     std::cout << "applyUpdate" << std::endl;
-    if (ptr->getClass().inherits(IntegerAttribute::classId)) {
+    if (ptr->isIntegerType()) {
         IntegerAttribute * a = static_cast<IntegerAttribute *>(ptr.get());
         if (ptr->hasMultiValue()) {
             a->append(0, 123456789, 1);
@@ -48,7 +48,7 @@ LoadAttribute::applyUpdate(const AttributePtr & ptr)
             a->update(0, 123456789);
         }
         a->commit();
-    } else if (ptr->getClass().inherits(FloatingPointAttribute::classId)) {
+    } else if (ptr->isFloatingPointType()) {
         FloatingPointAttribute * a = static_cast<FloatingPointAttribute *>(ptr.get());
         if (ptr->hasMultiValue()) {
             a->append(0, 123456789.5f, 1);
@@ -56,7 +56,7 @@ LoadAttribute::applyUpdate(const AttributePtr & ptr)
             a->update(0, 123456789);
         }
         a->commit();
-    } else if (ptr->getClass().inherits(StringAttribute::classId)) {
+    } else if (ptr->isStringType()) {
         StringAttribute * a = static_cast<StringAttribute *>(ptr.get());
         if (ptr->hasMultiValue()) {
             a->append(0, "non-existing string value", 1);