diff options
author | Ola Aunrønning <olaa@verizonmedia.com> | 2021-02-03 11:08:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-03 11:08:25 +0100 |
commit | 4b45a7684bdcbb1c1c044755c5d81a9a3b3e6326 (patch) | |
tree | 25eb84905bee80a47e06a231342041e296d21c52 /config/src | |
parent | 960022afa54672c004f37539452b6f68301a31a4 (diff) | |
parent | 986dc62765dc2264ab07c2f4744d86d48e707193 (diff) |
Merge branch 'master' into olaa/create-cloud-role
Diffstat (limited to 'config/src')
-rw-r--r-- | config/src/tests/configfetcher/configfetcher.cpp | 1 | ||||
-rw-r--r-- | config/src/tests/configholder/configholder.cpp | 1 | ||||
-rw-r--r-- | config/src/tests/configretriever/configretriever.cpp | 7 | ||||
-rw-r--r-- | config/src/tests/frt/frt.cpp | 6 | ||||
-rw-r--r-- | config/src/tests/subscriber/subscriber.cpp | 7 | ||||
-rw-r--r-- | config/src/tests/subscription/subscription.cpp | 1 |
6 files changed, 14 insertions, 9 deletions
diff --git a/config/src/tests/configfetcher/configfetcher.cpp b/config/src/tests/configfetcher/configfetcher.cpp index 508322bb74e..0cff6208873 100644 --- a/config/src/tests/configfetcher/configfetcher.cpp +++ b/config/src/tests/configfetcher/configfetcher.cpp @@ -5,6 +5,7 @@ #include <vespa/vespalib/util/exception.h> #include "config-my.h" #include <atomic> +#include <thread> using namespace config; diff --git a/config/src/tests/configholder/configholder.cpp b/config/src/tests/configholder/configholder.cpp index d69ad8022f9..1f2c1f27df6 100644 --- a/config/src/tests/configholder/configholder.cpp +++ b/config/src/tests/configholder/configholder.cpp @@ -1,6 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/config/common/configholder.h> +#include <thread> using namespace config; diff --git a/config/src/tests/configretriever/configretriever.cpp b/config/src/tests/configretriever/configretriever.cpp index d4ebe2da994..c8157ff7c16 100644 --- a/config/src/tests/configretriever/configretriever.cpp +++ b/config/src/tests/configretriever/configretriever.cpp @@ -1,5 +1,8 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include "config-bootstrap.h" +#include "config-foo.h" +#include "config-bar.h" #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/data/slime/slime.h> #include <vespa/config/print.h> @@ -11,9 +14,7 @@ #include <vespa/config/subscription/configsubscription.h> #include <vespa/config/subscription/sourcespec.h> #include <vespa/config/common/exceptions.h> -#include "config-bootstrap.h" -#include "config-foo.h" -#include "config-bar.h" +#include <thread> #include <atomic> using namespace config; diff --git a/config/src/tests/frt/frt.cpp b/config/src/tests/frt/frt.cpp index 6cffe079dae..cb09b8f7254 100644 --- a/config/src/tests/frt/frt.cpp +++ b/config/src/tests/frt/frt.cpp @@ -1,5 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include "config-my.h" +#include "config-bar.h" #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/config/common/iconfigholder.h> #include <vespa/config/common/trace.h> @@ -15,9 +17,7 @@ #include <vespa/fnet/frt/supervisor.h> #include <vespa/config/frt/protocol.h> #include <lz4.h> -#include "config-my.h" -#include "config-bar.h" - +#include <thread> using namespace config; using namespace vespalib; diff --git a/config/src/tests/subscriber/subscriber.cpp b/config/src/tests/subscriber/subscriber.cpp index 9d5aeddaf37..d58699f26e0 100644 --- a/config/src/tests/subscriber/subscriber.cpp +++ b/config/src/tests/subscriber/subscriber.cpp @@ -1,13 +1,14 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include "config-foo.h" +#include "config-bar.h" +#include "config-baz.h" #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/config/config.h> #include <vespa/config/common/misc.h> #include <vespa/config/common/configholder.h> #include <vespa/config/subscription/configsubscription.h> #include <vespa/config/common/exceptions.h> -#include "config-foo.h" -#include "config-bar.h" -#include "config-baz.h" +#include <thread> using namespace config; using namespace vespalib; diff --git a/config/src/tests/subscription/subscription.cpp b/config/src/tests/subscription/subscription.cpp index 9583111a2f7..7a5fccec019 100644 --- a/config/src/tests/subscription/subscription.cpp +++ b/config/src/tests/subscription/subscription.cpp @@ -4,6 +4,7 @@ #include <vespa/config/common/configholder.h> #include <vespa/config/subscription/configsubscription.h> #include <config-my.h> +#include <thread> using namespace config; using namespace std::chrono_literals; |