diff options
| author | Andrew Morrow <acm@mongodb.com> | 2015-06-19 17:18:25 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2015-06-30 12:16:55 -0400 |
| commit | 6abd1d0e9cdc691e6daf30ce3316ffb820b9bb70 (patch) | |
| tree | 00b5311c157c3623f92e70234bf4e8cc687c4917 /src/mongo/logger | |
| parent | 112ab99be08e3217aa87586a697c576dba0de5fd (diff) | |
| download | mongo-6abd1d0e9cdc691e6daf30ce3316ffb820b9bb70.tar.gz | |
SERVER-19099 Consistently use concurrency and time names via stdx
Diffstat (limited to 'src/mongo/logger')
| -rw-r--r-- | src/mongo/logger/logstream_builder.h | 5 | ||||
| -rw-r--r-- | src/mongo/logger/rotatable_file_writer.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/mongo/logger/logstream_builder.h b/src/mongo/logger/logstream_builder.h index 3cf67ea75d5..275ce871bdd 100644 --- a/src/mongo/logger/logstream_builder.h +++ b/src/mongo/logger/logstream_builder.h @@ -192,7 +192,10 @@ public: template <typename Rep, typename Period> LogstreamBuilder& operator<<(stdx::chrono::duration<Rep, Period> d) { - stream() << d; + // We can't rely on ADL to find our custom stream out class, + // since neither the class (ostream) nor the argument are in + // our namespace. Just manually invoke + mongo::operator<<(stream(), d); return *this; } diff --git a/src/mongo/logger/rotatable_file_writer.h b/src/mongo/logger/rotatable_file_writer.h index b20fb818a9f..06b254b7ef5 100644 --- a/src/mongo/logger/rotatable_file_writer.h +++ b/src/mongo/logger/rotatable_file_writer.h @@ -27,6 +27,8 @@ #pragma once +#include <memory> +#include <ostream> #include <string> #include "mongo/base/disallow_copying.h" |