Repository: arrow Updated Branches: refs/heads/master 53583281b -> 430bd9576
ARROW-299: Use absolute namespace in macros Author: Uwe L. Korn <[email protected]> Closes #142 from xhochy/arrow-299 and squashes the following commits: b7967fa [Uwe L. Korn] ARROW-299: Use absolute namespace in macros Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/430bd957 Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/430bd957 Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/430bd957 Branch: refs/heads/master Commit: 430bd9576ceb14456cd6853f6d75ca19b333efc2 Parents: 5358328 Author: Uwe L. Korn <[email protected]> Authored: Wed Sep 21 18:14:00 2016 -0400 Committer: Wes McKinney <[email protected]> Committed: Wed Sep 21 18:14:00 2016 -0400 ---------------------------------------------------------------------- cpp/src/arrow/util/logging.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/430bd957/cpp/src/arrow/util/logging.h ---------------------------------------------------------------------- diff --git a/cpp/src/arrow/util/logging.h b/cpp/src/arrow/util/logging.h index 54f6759..d320d6a 100644 --- a/cpp/src/arrow/util/logging.h +++ b/cpp/src/arrow/util/logging.h @@ -35,7 +35,7 @@ namespace arrow { #define ARROW_ERROR 2 #define ARROW_FATAL 3 -#define ARROW_LOG_INTERNAL(level) arrow::internal::CerrLog(level) +#define ARROW_LOG_INTERNAL(level) ::arrow::internal::CerrLog(level) #define ARROW_LOG(level) ARROW_LOG_INTERNAL(ARROW_##level) #define ARROW_CHECK(condition) \ @@ -47,25 +47,25 @@ namespace arrow { #define DCHECK(condition) \ while (false) \ - arrow::internal::NullLog() + ::arrow::internal::NullLog() #define DCHECK_EQ(val1, val2) \ while (false) \ - arrow::internal::NullLog() + ::arrow::internal::NullLog() #define DCHECK_NE(val1, val2) \ while (false) \ - arrow::internal::NullLog() + ::arrow::internal::NullLog() #define DCHECK_LE(val1, val2) \ while (false) \ - arrow::internal::NullLog() + ::arrow::internal::NullLog() #define DCHECK_LT(val1, val2) \ while (false) \ - arrow::internal::NullLog() + ::arrow::internal::NullLog() #define DCHECK_GE(val1, val2) \ while (false) \ - arrow::internal::NullLog() + ::arrow::internal::NullLog() #define DCHECK_GT(val1, val2) \ while (false) \ - arrow::internal::NullLog() + ::arrow::internal::NullLog() #else #define ARROW_DFATAL ARROW_FATAL
