Merge pull request #6630 from vespa-engine/balder/make-shared-unique-plusplus

Use std::make_xxx

1 files changed, 3 insertions, 5 deletions

diff --git a/searchlib/src/tests/attribute/stringattribute/stringattribute_test.cpp b/searchlib/src/tests/attribute/stringattribute/stringattribute_test.cpp
index 69aa612d5b8..bc6ce97fc37 100644
--- a/searchlib/src/tests/attribute/stringattribute/stringattribute_test.cpp
+++ b/searchlib/src/tests/attribute/stringattribute/stringattribute_test.cpp
@@ -1,6 +1,4 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/log/log.h>
-LOG_SETUP("stringattribute_test");
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/searchlib/attribute/enumstore.h>
 #include <vespa/searchlib/attribute/singlestringattribute.h>
@@ -14,6 +12,9 @@ LOG_SETUP("stringattribute_test");
 #include <vespa/searchlib/attribute/multistringattribute.h>
 #include <vespa/searchlib/attribute/multistringpostattribute.hpp>
 
+#include <vespa/log/log.h>
+LOG_SETUP("stringattribute_test");
+
 namespace search {
 
 using attribute::CollectionType;
@@ -430,11 +431,8 @@ StringAttributeTest::Main()
     TEST_INIT("stringattribute_test");
 
     testMultiValue();
-
     testMultiValueMultipleClearDocBetweenCommit();
-
     testMultiValueRemove();
-
     testSingleValue();
 
     TEST_DONE();