GC unused assert includes

4 files changed, 3 insertions, 3 deletions

diff --git a/document/src/vespa/document/annotation/spantree.h b/document/src/vespa/document/annotation/spantree.h
index a0010fafa74..8745fb4421d 100644
--- a/document/src/vespa/document/annotation/spantree.h
+++ b/document/src/vespa/document/annotation/spantree.h
@@ -4,7 +4,6 @@
 
 #include "annotation.h"
 #include <vector>
-#include <cassert>
 
 namespace document {
 struct SpanNode;
@@ -24,7 +23,6 @@ public:
     SpanTree(vespalib::stringref name, std::unique_ptr<T> root)
         : _name(name),
           _root(std::move(root)) {
-        assert(_root.get());
     }
     ~SpanTree();
 
diff --git a/document/src/vespa/document/base/testdocman.cpp b/document/src/vespa/document/base/testdocman.cpp
index 471a2f8c196..d5b24b51f24 100644
--- a/document/src/vespa/document/base/testdocman.cpp
+++ b/document/src/vespa/document/base/testdocman.cpp
@@ -7,6 +7,7 @@
 #include <vespa/document/fieldvalue/stringfieldvalue.h>
 #include <vespa/vespalib/util/rand48.h>
 #include <sstream>
+#include <cassert>
 
 namespace document {
 
diff --git a/document/src/vespa/document/select/valuenodes.cpp b/document/src/vespa/document/select/valuenodes.cpp
index b3052cc07e2..06205e6b7d1 100644
--- a/document/src/vespa/document/select/valuenodes.cpp
+++ b/document/src/vespa/document/select/valuenodes.cpp
@@ -11,6 +11,7 @@
 #include <vespa/vespalib/util/md5.h>
 #include <vespa/document/util/stringutil.h>
 #include <vespa/vespalib/text/lowercase.h>
+#include <cassert>
 #include <iomanip>
 #include <sys/time.h>
 
diff --git a/document/src/vespa/document/serialization/annotationdeserializer.cpp b/document/src/vespa/document/serialization/annotationdeserializer.cpp
index 41bc9ec8aaa..c449029440f 100644
--- a/document/src/vespa/document/serialization/annotationdeserializer.cpp
+++ b/document/src/vespa/document/serialization/annotationdeserializer.cpp
@@ -40,7 +40,7 @@ unique_ptr<SpanTree> AnnotationDeserializer::readSpanTree() {
     deserializer.read(tree_name);
     _nodes.clear();
     SpanNode::UP root = readSpanNode();
-    unique_ptr<SpanTree> span_tree(new SpanTree(tree_name.getValue(), std::move(root)));
+    auto span_tree = std::make_unique<SpanTree>(tree_name.getValue(), std::move(root));
 
     uint32_t annotation_count = getInt1_2_4Bytes(_stream);
     span_tree->reserveAnnotations(annotation_count);