diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-06 22:13:24 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-07 09:50:24 +0200 |
commit | 777943d3194383ab5492b285ae83dc3e92328514 (patch) | |
tree | 3a98819d239df0f943056f9196170351385a34f3 /vespalog/src | |
parent | 0b37a1b9eecf9b38310bde4a11c01a7962234450 (diff) |
Do not provide unnecessary fastos/mutex.h by default.
Diffstat (limited to 'vespalog/src')
-rw-r--r-- | vespalog/src/logctl/logctl.cpp | 14 | ||||
-rw-r--r-- | vespalog/src/vespa/log/bufferedlogger.cpp | 18 | ||||
-rw-r--r-- | vespalog/src/vespa/log/bufferedlogger.h | 1 | ||||
-rw-r--r-- | vespalog/src/vespa/log/log-target-file.cpp | 8 | ||||
-rw-r--r-- | vespalog/src/vespa/log/log-target.cpp | 4 |
5 files changed, 16 insertions, 29 deletions
diff --git a/vespalog/src/logctl/logctl.cpp b/vespalog/src/logctl/logctl.cpp index 8457fb944ce..72891769eee 100644 --- a/vespalog/src/logctl/logctl.cpp +++ b/vespalog/src/logctl/logctl.cpp @@ -1,19 +1,13 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <sys/types.h> -#include <cstdio> -#include <cstdlib> -#include <unistd.h> -#include <cstring> -#include <limits.h> - -#include <memory> -#include <vector> -#include <string> #include <vespa/defaults.h> #include <vespa/log/control-file.h> #include <vespa/log/internal.h> #include <vespa/log/component.h> +#include <unistd.h> +#include <dirent.h> +#include <sys/stat.h> + LOG_SETUP("logctl", "$Id$"); using namespace ns_log; diff --git a/vespalog/src/vespa/log/bufferedlogger.cpp b/vespalog/src/vespa/log/bufferedlogger.cpp index 30f3dcb648d..db2021324c3 100644 --- a/vespalog/src/vespa/log/bufferedlogger.cpp +++ b/vespalog/src/vespa/log/bufferedlogger.cpp @@ -1,14 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/bufferedlogger.h> - -#include <iomanip> -#include <iostream> -#include <sstream> -#include <vector> -#include <stdarg.h> -#include <sys/time.h> - +#include "bufferedlogger.h" +#include <vespa/fastos/mutex.h> #include <boost/multi_index_container.hpp> #include <boost/multi_index/identity.hpp> #include <boost/multi_index/member.hpp> @@ -16,6 +9,13 @@ #include <boost/multi_index/ordered_index.hpp> #include <boost/multi_index/sequenced_index.hpp> +#include <iomanip> +#include <iostream> +#include <sstream> +#include <vector> +#include <cstdarg> +#include <ctime> + namespace ns_log { // implementation details for BufferedLogger diff --git a/vespalog/src/vespa/log/bufferedlogger.h b/vespalog/src/vespa/log/bufferedlogger.h index 4f20f46af4c..7ca8d799840 100644 --- a/vespalog/src/vespa/log/bufferedlogger.h +++ b/vespalog/src/vespa/log/bufferedlogger.h @@ -82,7 +82,6 @@ #define VESPA_LOG_LOGENTRYMAXAGE 300 // Max seconds an entry can be cached #define VESPA_LOG_COUNTAGEFACTOR 5 // How many seconds each count counts for -#include <vespa/fastos/mutex.h> #include <vespa/log/log.h> #include <sstream> #include <string> diff --git a/vespalog/src/vespa/log/log-target-file.cpp b/vespalog/src/vespa/log/log-target-file.cpp index 07b638d7f84..e88f1018675 100644 --- a/vespalog/src/vespa/log/log-target-file.cpp +++ b/vespalog/src/vespa/log/log-target-file.cpp @@ -1,16 +1,12 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <sys/types.h> #include <unistd.h> #include <cstring> -#include <sys/stat.h> #include <fcntl.h> -#include <cstdlib> -#include <errno.h> -#include <cstdio> +#include <cerrno> +#include <cassert> #include "log.h" LOG_SETUP(".log"); -LOG_RCSID("$Id$"); #include "log-target-file.h" #include "internal.h" diff --git a/vespalog/src/vespa/log/log-target.cpp b/vespalog/src/vespa/log/log-target.cpp index d34e0067b04..b6692caa308 100644 --- a/vespalog/src/vespa/log/log-target.cpp +++ b/vespalog/src/vespa/log/log-target.cpp @@ -1,11 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <sys/types.h> #include <cstring> -#include <cstdlib> +#include <cassert> #include "log.h" LOG_SETUP(".log"); -LOG_RCSID("$Id$"); #include "log-target-fd.h" #include "log-target-file.h" |