diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-08-18 12:04:45 +0200 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-08-18 12:04:45 +0200 |
| commit | 64809ac8367bb4c059f55a8595f47a323237b238 (patch) | |
| tree | 62af23907c274c398b231340c006a76700c8f90c /searchcore | |
| parent | 7bbbf406f3cd920222aba9039c6a460370a4ab14 (diff) | |
Remove more clutter in fastos/types.h
Diffstat (limited to 'searchcore')
5 files changed, 5 insertions, 7 deletions
diff --git a/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp b/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp index f7588a83236..9a351b56eda 100644 --- a/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp +++ b/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp @@ -1,15 +1,13 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/slobrok/sbmirror.h> -#include <vespa/config-slobroks.h> #include <vespa/config/common/configsystem.h> #include <vespa/config/common/exceptions.h> #include <vespa/fnet/frt/frt.h> #include <vespa/vespalib/util/host_name.h> #include <vespa/vespalib/util/stringfmt.h> #include <vespa/fastos/app.h> -#include <algorithm> -#include <string> +#include <sys/time.h> #include <vespa/log/log.h> LOG_SETUP("vespa-proton-cmd"); diff --git a/searchcore/src/vespa/searchcore/proton/common/config_hash.hpp b/searchcore/src/vespa/searchcore/proton/common/config_hash.hpp index 7578f0e33f4..84e5a632c09 100644 --- a/searchcore/src/vespa/searchcore/proton/common/config_hash.hpp +++ b/searchcore/src/vespa/searchcore/proton/common/config_hash.hpp @@ -4,7 +4,7 @@ #include "config_hash.h" #include <vespa/vespalib/stllike/hash_map.hpp> -#include <assert.h> +#include <cassert> namespace proton { diff --git a/searchcore/src/vespa/searchcore/proton/common/monitored_refcount.cpp b/searchcore/src/vespa/searchcore/proton/common/monitored_refcount.cpp index b2a12d8a9c0..3cecc8308ad 100644 --- a/searchcore/src/vespa/searchcore/proton/common/monitored_refcount.cpp +++ b/searchcore/src/vespa/searchcore/proton/common/monitored_refcount.cpp @@ -1,7 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "monitored_refcount.h" -#include <assert.h> +#include <cassert> namespace proton { diff --git a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_handler.cpp b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_handler.cpp index a70fb5b119d..e7b347c4c80 100644 --- a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_handler.cpp +++ b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_handler.cpp @@ -5,7 +5,7 @@ #include <vespa/searchlib/common/lambdatask.h> #include <vespa/searchcorespi/index/i_thread_service.h> #include <vespa/document/base/globalid.h> -#include <assert.h> +#include <cassert> using search::makeLambdaTask; diff --git a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_registrator.cpp b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_registrator.cpp index 19ec153c741..3567a69e8a3 100644 --- a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_registrator.cpp +++ b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_registrator.cpp @@ -2,7 +2,7 @@ #include "gid_to_lid_change_registrator.h" #include "i_gid_to_lid_change_listener.h" -#include <assert.h> +#include <cassert> namespace proton { |