diff options
author | Arnstein Ressem <aressem@yahoo-inc.com> | 2016-06-16 16:29:14 +0200 |
---|---|---|
committer | Arnstein Ressem <aressem@yahoo-inc.com> | 2016-06-16 16:29:14 +0200 |
commit | 0e4c423772926e094370800a35c91b3832b81578 (patch) | |
tree | 16b35b4834d7e2876c3b1776e007d941ca92a033 /searchlib/src | |
parent | db4d9265e66e941891b238bb7c073376daee455e (diff) | |
parent | 88b8aa1f8ddb13994f3f1e356d2687e346909b11 (diff) |
Merge branch 'master' into aressem/vespa-compile-on-centos7
Diffstat (limited to 'searchlib/src')
-rw-r--r-- | searchlib/src/tests/grouping/grouping_serialization_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/searchlib/src/tests/grouping/grouping_serialization_test.cpp b/searchlib/src/tests/grouping/grouping_serialization_test.cpp index 99757af8439..cb3a8281ae1 100644 --- a/searchlib/src/tests/grouping/grouping_serialization_test.cpp +++ b/searchlib/src/tests/grouping/grouping_serialization_test.cpp @@ -1,8 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. // Unit tests for grouping_serialization. -#include <vespa/log/log.h> -LOG_SETUP("grouping_serialization_test"); #include <vespa/fastos/fastos.h> #include <vespa/searchlib/aggregation/aggregation.h> @@ -24,6 +22,8 @@ LOG_SETUP("grouping_serialization_test"); #include <vespa/vespalib/testkit/testapp.h> #include <vespa/vespalib/util/stringfmt.h> #include <fstream> +#include <vespa/log/log.h> +LOG_SETUP("grouping_serialization_test"); using search::HitRank; using vespalib::Identifiable; |