From b41ad66e93562d8aa0196dddf9f14b15f049fb26 Mon Sep 17 00:00:00 2001 From: "mark@chromium.org" Date: Wed, 3 Apr 2013 18:31:16 +0000 Subject: [PATCH] These are prerequisites needed for a wider effort inside Google to enable structured logging. This is basically wrapping std::ostream within a new type. No functional differences from this change are expected. Patch by Ivan Penkov git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1140 4c0a9323-5329-0410-9bdc-e9ce6186880e --- src/processor/logging.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/processor/logging.h b/src/processor/logging.h index 4925e67f..c082242d 100644 --- a/src/processor/logging.h +++ b/src/processor/logging.h @@ -67,6 +67,18 @@ #include BP_LOGGING_INCLUDE #endif // BP_LOGGING_INCLUDE +#ifndef THIRD_PARTY_BREAKPAD_GOOGLE_GLUE_LOGGING_H_ +namespace base_logging { + +// The open-source copy of logging.h has diverged from Google's internal copy +// (temporarily, at least). To support the transition to structured logging +// a definition for base_logging::LogMessage is needed, which is a ostream- +// like object for streaming arguments to construct a log message. +typedef std::ostream LogMessage; + +} // namespace base_logging +#endif // THIRD_PARTY_BREAKPAD_GOOGLE_GLUE_LOGGING_H_ + namespace google_breakpad { // These are defined in Microsoft headers. @@ -115,7 +127,7 @@ class LogMessageVoidify { // This has to be an operator with a precedence lower than << but higher // than ?: - void operator&(std::ostream &) {} + void operator&(base_logging::LogMessage &) {} }; // Returns number formatted as a hexadecimal string, such as "0x7b".