diff options
| author | <shinichiro.hamaji@gmail.com> | 2010-05-28 03:31:14 +0000 |
|---|---|---|
| committer | <shinichiro.hamaji@gmail.com> | 2010-05-28 03:31:14 +0000 |
| commit | 85f35499a7620c5025f927d8b178e980c00bd1e7 (patch) | |
| tree | d8ab7ed182967e40ecf89fb4dfbc4640cea84727 | |
| parent | e912f200f0f41afbf62c95f1dc40105d7d2758cb (diff) | |
| download | glog-85f35499a7620c5025f927d8b178e980c00bd1e7.tar.gz glog-85f35499a7620c5025f927d8b178e980c00bd1e7.tar.bz2 glog-85f35499a7620c5025f927d8b178e980c00bd1e7.zip | |
Add some more google:: namespaces.
http://code.google.com/p/google-glog/issues/detail?id=40
git-svn-id: https://google-glog.googlecode.com/svn/trunk@81 eb4d4688-79bd-11dd-afb4-1d65580434c0
| -rw-r--r-- | src/glog/logging.h.in | 4 | ||||
| -rwxr-xr-x | src/windows/glog/logging.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in index 4397621..30b7e5c 100644 --- a/src/glog/logging.h.in +++ b/src/glog/logging.h.in @@ -409,7 +409,7 @@ DECLARE_bool(stop_logging_if_full_disk); #ifdef NDEBUG #define COMPACT_GOOGLE_LOG_DFATAL COMPACT_GOOGLE_LOG_ERROR #elif GOOGLE_STRIP_LOG <= 3 -#define COMPACT_GOOGLE_LOG_DFATAL LogMessage( \ +#define COMPACT_GOOGLE_LOG_DFATAL @ac_google_namespace@::LogMessage( \ __FILE__, __LINE__, @ac_google_namespace@::FATAL) #else #define COMPACT_GOOGLE_LOG_DFATAL @ac_google_namespace@::NullStreamFatal() @@ -1180,7 +1180,7 @@ inline void LogAtLevel(int const severity, std::string const &msg) { // version since there are two advantages: 1. this version outputs the // file name and the line number where this macro is put like other // LOG macros, 2. this macro can be used as C++ stream. -#define LOG_AT_LEVEL(severity) LogMessage(__FILE__, __LINE__, severity).stream() +#define LOG_AT_LEVEL(severity) @ac_google_namespace@::LogMessage(__FILE__, __LINE__, severity).stream() // A small helper for CHECK_NOTNULL(). template <typename T> diff --git a/src/windows/glog/logging.h b/src/windows/glog/logging.h index f61ec4e..2e8f2da 100755 --- a/src/windows/glog/logging.h +++ b/src/windows/glog/logging.h @@ -413,7 +413,7 @@ DECLARE_bool(stop_logging_if_full_disk); #ifdef NDEBUG #define COMPACT_GOOGLE_LOG_DFATAL COMPACT_GOOGLE_LOG_ERROR #elif GOOGLE_STRIP_LOG <= 3 -#define COMPACT_GOOGLE_LOG_DFATAL LogMessage( \ +#define COMPACT_GOOGLE_LOG_DFATAL google::LogMessage( \ __FILE__, __LINE__, google::FATAL) #else #define COMPACT_GOOGLE_LOG_DFATAL google::NullStreamFatal() @@ -1184,7 +1184,7 @@ inline void LogAtLevel(int const severity, std::string const &msg) { // version since there are two advantages: 1. this version outputs the // file name and the line number where this macro is put like other // LOG macros, 2. this macro can be used as C++ stream. -#define LOG_AT_LEVEL(severity) LogMessage(__FILE__, __LINE__, severity).stream() +#define LOG_AT_LEVEL(severity) google::LogMessage(__FILE__, __LINE__, severity).stream() // A small helper for CHECK_NOTNULL(). template <typename T> |