third_party/mojo/src/mojo/public/cpp/environment/logging.h - Issue 1142043005: Update mojo sdk to rev 1dc8a9a5db73d3718d99917fadf31f5fb2ebad4f

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/mojo/src/mojo/public/cpp/environment/logging.h

Issue 1142043005: Update mojo sdk to rev 1dc8a9a5db73d3718d99917fadf31f5fb2ebad4f (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix type conversion errors on win64 for some msvs Created 5 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/mojo/src/mojo/public/cpp/environment/lib/logging.cc ('k') | third_party/mojo/src/mojo/public/cpp/environment/tests/logger_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/mojo/src/mojo/public/cpp/environment/logging.h

diff --git a/third_party/mojo/src/mojo/public/cpp/environment/logging.h b/third_party/mojo/src/mojo/public/cpp/environment/logging.h

index d0fdeafb2475156533f6ecf03ebaf9cccd253635..bfc5c13f6c2e4b1e5dbc945abae9d2bd0750490d 100644

--- a/third_party/mojo/src/mojo/public/cpp/environment/logging.h

+++ b/third_party/mojo/src/mojo/public/cpp/environment/logging.h

@@ -19,7 +19,7 @@

#include "mojo/public/cpp/system/macros.h"

#define MOJO_LOG_STREAM(level) \

- ::mojo::internal::LogMessage(__FILE__, __LINE__, MOJO_LOG_LEVEL_##level) \

+ ::mojo::internal::LogMessage(MOJO_LOG_LEVEL_##level, __FILE__, __LINE__) \

.stream()

#define MOJO_LAZY_LOG_STREAM(level, condition) \

@@ -64,13 +64,15 @@ namespace internal {

class LogMessage {

public:

- LogMessage(const char* file, int line, MojoLogLevel log_level);

+ LogMessage(MojoLogLevel log_level, const char* file, int line);

~LogMessage();

std::ostream& stream() { return stream_; }

private:

const MojoLogLevel log_level_;

+ const char* const file_;

+ const int line_;

std::ostringstream stream_;

MOJO_DISALLOW_COPY_AND_ASSIGN(LogMessage);