Fully quality std::* names.

[platform/upstream/libphonenumber.git] / cpp / src / phonenumbers / default_logger.cc

diff --git a/cpp/src/phonenumbers/default_logger.cc b/cpp/src/phonenumbers/default_logger.cc
index 538c1b3..fd68024 100644 (file)
--- a/cpp/src/phonenumbers/default_logger.cc
+++ b/cpp/src/phonenumbers/default_logger.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2011 Google Inc.
+// Copyright (C) 2011 The Libphonenumber Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,28 +21,36 @@
 namespace i18n {
 namespace phonenumbers {
 
-using std::cout;
 using std::string;
 
 void StdoutLogger::WriteMessage(const string& msg) {
-  cout << " " << msg;
+  std::cout << " " << msg;
 }
 
 void StdoutLogger::WriteLevel() {
-  LogLevel log_level = level();
-  cout << "[";
+  int verbosity_level = level();
+  if (verbosity_level <= 0) {
+    verbosity_level = LOG_FATAL;
+  }
+
+  std::cout << "[";
 
-  switch (log_level) {
-    case LOG_FATAL:   cout << "FATAL"; break;
+  // Handle verbose logs first.
+  if (verbosity_level > LOG_DEBUG) {
+    std::cout << "VLOG" << (verbosity_level - LOG_DEBUG);
+  } else {
+    switch (verbosity_level) {
+      case LOG_FATAL:   std::cout << "FATAL"; break;
 #ifdef ERROR  // In case ERROR is defined by MSVC (i.e not set to LOG_ERROR).
-    case ERROR:
+      case ERROR:
 #endif
-    case LOG_ERROR:   cout << "ERROR"; break;
-    case LOG_WARNING: cout << "WARNING"; break;
-    case LOG_INFO:    cout << "INFO"; break;
-    case LOG_DEBUG:   cout << "DEBUG"; break;
+      case LOG_ERROR:   std::cout << "ERROR"; break;
+      case LOG_WARNING: std::cout << "WARNING"; break;
+      case LOG_INFO:    std::cout << "INFO"; break;
+      case LOG_DEBUG:   std::cout << "DEBUG"; break;
+    }
   }
-  cout << "]";
+  std::cout << "]";
 }
 
 }  // namespace phonenumbers