diff options
| author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-06-13 18:52:46 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-06-13 18:52:46 +0200 |
| commit | 0155137e7d56730665d406c37aa75649e5a3418a (patch) | |
| tree | 05100870215c7852cc27b6970b60c9ff5f77e763 /vespalog | |
| parent | 4e5d87a9baa4176a1089f7afd1f433a8da275725 (diff) | |
| parent | 6a64952133fc05136a0e445851b49bd0fc71c00e (diff) | |
Merge with master
Diffstat (limited to 'vespalog')
| -rw-r--r-- | vespalog/src/vespa/log/bufferedlogger.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/vespalog/src/vespa/log/bufferedlogger.cpp b/vespalog/src/vespa/log/bufferedlogger.cpp index 6fca39abfbb..106a9bc1dba 100644 --- a/vespalog/src/vespa/log/bufferedlogger.cpp +++ b/vespalog/src/vespa/log/bufferedlogger.cpp @@ -10,11 +10,9 @@ #include <boost/multi_index/sequenced_index.hpp> #include <iomanip> -#include <iostream> #include <sstream> #include <vector> #include <cstdarg> -#include <ctime> namespace ns_log { @@ -381,5 +379,4 @@ BufferedLogger::setTimer(std::unique_ptr<Timer> timer) _backing->_timer = std::move(timer); } - } // ns_log |