Merge "Help inline LogMessage::stream method." into dalvik-dev

2 files changed, 5 insertions, 5 deletions

diff --git a/src/base/logging.cc b/src/base/logging.cc
index c9f28c81d..a19580cbd 100644
--- a/src/base/logging.cc
+++ b/src/base/logging.cc
@@ -139,10 +139,6 @@ LogMessage::~LogMessage() {
   delete data_;
 }
 
-std::ostream& LogMessage::stream() {
-  return data_->buffer;
-}
-
 HexDump::HexDump(const void* address, size_t byte_count, bool show_actual_addresses)
     : address_(address), byte_count_(byte_count), show_actual_addresses_(show_actual_addresses) {
 }
diff --git a/src/base/logging.h b/src/base/logging.h
index f250ce01b..8d89e4d0c 100644
--- a/src/base/logging.h
+++ b/src/base/logging.h
@@ -184,8 +184,12 @@ class LogMessage {
   LogMessage(const char* file, int line, LogSeverity severity, int error)
     : data_(new LogMessageData(file, line, severity, error)) {
   }
+
   ~LogMessage() LOCKS_EXCLUDED(Locks::logging_lock_);
-  std::ostream& stream();
+
+  std::ostream& stream() {
+    return data_->buffer;
+  }
 
  private:
   static void LogLine(const LogMessageData& data, const char*);