summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-03-17 20:22:12 +0100
committerGitHub <noreply@github.com>2019-03-17 20:22:12 +0100
commite3b2d80c3b0cc746353cb0cf14a51c7fb2c426f9 (patch)
tree3cb21051c1df455c21f89227844fa171735058db
parent5efc7975ad8c473bcfd3d606ecfb146af3c0cdb8 (diff)
parent82b721e9dc02abc2e7827f9da5cc95f17bf42e70 (diff)
Merge pull request #8811 from vespa-engine/toregge/adjust-forward-declarations-for-clang
Adjust forward declarations.
-rw-r--r--searchlib/src/vespa/searchlib/engine/trace.h2
-rw-r--r--searchlib/src/vespa/searchlib/queryeval/blueprint.h4
-rw-r--r--searchlib/src/vespa/searchlib/queryeval/searchiterator.h4
-rw-r--r--staging_vespalib/src/vespa/vespalib/objects/object2slime.h2
4 files changed, 6 insertions, 6 deletions
diff --git a/searchlib/src/vespa/searchlib/engine/trace.h b/searchlib/src/vespa/searchlib/engine/trace.h
index e5fea4f2b7f..518485f8775 100644
--- a/searchlib/src/vespa/searchlib/engine/trace.h
+++ b/searchlib/src/vespa/searchlib/engine/trace.h
@@ -6,7 +6,7 @@
#include <vespa/fastos/timestamp.h>
namespace vespalib { class Slime; }
-namespace vespalib::slime { class Cursor; }
+namespace vespalib::slime { struct Cursor; }
namespace search::engine {
diff --git a/searchlib/src/vespa/searchlib/queryeval/blueprint.h b/searchlib/src/vespa/searchlib/queryeval/blueprint.h
index 4b60e7d0d8b..8e828157c70 100644
--- a/searchlib/src/vespa/searchlib/queryeval/blueprint.h
+++ b/searchlib/src/vespa/searchlib/queryeval/blueprint.h
@@ -11,8 +11,8 @@
namespace vespalib { class ObjectVisitor; }
namespace vespalib::slime {
- class Cursor;
- class Inserter;
+ struct Cursor;
+ struct Inserter;
}
namespace search::queryeval {
diff --git a/searchlib/src/vespa/searchlib/queryeval/searchiterator.h b/searchlib/src/vespa/searchlib/queryeval/searchiterator.h
index ab662dd2592..d2a5ed1e5f9 100644
--- a/searchlib/src/vespa/searchlib/queryeval/searchiterator.h
+++ b/searchlib/src/vespa/searchlib/queryeval/searchiterator.h
@@ -11,8 +11,8 @@
namespace vespalib { class ObjectVisitor; }
namespace vespalib::slime {
- class Cursor;
- class Inserter;
+ struct Cursor;
+ struct Inserter;
}
namespace search { class BitVector; }
diff --git a/staging_vespalib/src/vespa/vespalib/objects/object2slime.h b/staging_vespalib/src/vespa/vespalib/objects/object2slime.h
index 4c1ee660502..c52d5025ca2 100644
--- a/staging_vespalib/src/vespa/vespalib/objects/object2slime.h
+++ b/staging_vespalib/src/vespa/vespalib/objects/object2slime.h
@@ -7,7 +7,7 @@
namespace vespalib {
-namespace slime { class Cursor; }
+namespace slime { struct Cursor; }
/**
* This is a concrete object visitor that will build up a structured