Repository: parquet-cpp Updated Branches: refs/heads/master 1b8b875fd -> ac1c1277f
PARQUET-737: Use absolute namespace in macros Author: Korn, Uwe <[email protected]> Closes #171 from xhochy/PARQUET-737 and squashes the following commits: 838fe85 [Korn, Uwe] PARQUET-737: Use absolute namespace in macros Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/ac1c1277 Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/ac1c1277 Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/ac1c1277 Branch: refs/heads/master Commit: ac1c1277f06ef369d169a2490a2ebcd81dbd8bee Parents: 1b8b875 Author: Korn, Uwe <[email protected]> Authored: Thu Oct 6 07:56:51 2016 -0400 Committer: Wes McKinney <[email protected]> Committed: Thu Oct 6 07:56:51 2016 -0400 ---------------------------------------------------------------------- src/parquet/util/logging.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/ac1c1277/src/parquet/util/logging.h ---------------------------------------------------------------------- diff --git a/src/parquet/util/logging.h b/src/parquet/util/logging.h index 4f2091b..7ec5a8f 100644 --- a/src/parquet/util/logging.h +++ b/src/parquet/util/logging.h @@ -34,7 +34,7 @@ namespace parquet { #define PARQUET_ERROR 2 #define PARQUET_FATAL 3 -#define PARQUET_LOG_INTERNAL(level) parquet::internal::CerrLog(level) +#define PARQUET_LOG_INTERNAL(level) ::parquet::internal::CerrLog(level) #define PARQUET_LOG(level) PARQUET_LOG_INTERNAL(PARQUET_##level) #define PARQUET_IGNORE_EXPR(expr) ((void)(expr)); @@ -47,31 +47,31 @@ namespace parquet { #define DCHECK(condition) \ PARQUET_IGNORE_EXPR(condition) \ while (false) \ - parquet::internal::NullLog() + ::parquet::internal::NullLog() #define DCHECK_EQ(val1, val2) \ PARQUET_IGNORE_EXPR(val1) \ while (false) \ - parquet::internal::NullLog() + ::parquet::internal::NullLog() #define DCHECK_NE(val1, val2) \ PARQUET_IGNORE_EXPR(val1) \ while (false) \ - parquet::internal::NullLog() + ::parquet::internal::NullLog() #define DCHECK_LE(val1, val2) \ PARQUET_IGNORE_EXPR(val1) \ while (false) \ - parquet::internal::NullLog() + ::parquet::internal::NullLog() #define DCHECK_LT(val1, val2) \ PARQUET_IGNORE_EXPR(val1) \ while (false) \ - parquet::internal::NullLog() + ::parquet::internal::NullLog() #define DCHECK_GE(val1, val2) \ PARQUET_IGNORE_EXPR(val1) \ while (false) \ - parquet::internal::NullLog() + ::parquet::internal::NullLog() #define DCHECK_GT(val1, val2) \ PARQUET_IGNORE_EXPR(val1) \ while (false) \ - parquet::internal::NullLog() + ::parquet::internal::NullLog() #else #define PARQUET_DFATAL PARQUET_FATAL
