diff options
| author | Jeffrey Yasskin <jyasskin@google.com> | 2009-12-12 04:08:32 +0000 |
|---|---|---|
| committer | Jeffrey Yasskin <jyasskin@google.com> | 2009-12-12 04:08:32 +0000 |
| commit | 7f1c9c2ff6d857be195a3c7bab059041e40596d9 (patch) | |
| tree | f24112484f2df0715817f1adf7cc455eb60b181a | |
| parent | 3950e8c4116220d5093ec85a571f5afac8c89665 (diff) | |
| download | bcm5719-llvm-7f1c9c2ff6d857be195a3c7bab059041e40596d9.tar.gz bcm5719-llvm-7f1c9c2ff6d857be195a3c7bab059041e40596d9.zip | |
Make it easier to use the llvm_unreachable and DEBUG macros without "using
namespace llvm" by qualifying their implementations with ::llvm::.
llvm-svn: 91206
| -rw-r--r-- | llvm/include/llvm/Support/Debug.h | 3 | ||||
| -rw-r--r-- | llvm/include/llvm/Support/ErrorHandling.h | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/llvm/include/llvm/Support/Debug.h b/llvm/include/llvm/Support/Debug.h index afa828c3693..e8bc0ce0a26 100644 --- a/llvm/include/llvm/Support/Debug.h +++ b/llvm/include/llvm/Support/Debug.h @@ -63,7 +63,8 @@ void SetCurrentDebugType(const char *Type); /// This will emit the debug information if -debug is present, and -debug-only /// is not specified, or is specified as "bitset". #define DEBUG_WITH_TYPE(TYPE, X) \ - do { if (DebugFlag && isCurrentDebugType(TYPE)) { X; } } while (0) + do { if (::llvm::DebugFlag && ::llvm::isCurrentDebugType(TYPE)) { X; } \ + } while (0) #else #define isCurrentDebugType(X) (false) diff --git a/llvm/include/llvm/Support/ErrorHandling.h b/llvm/include/llvm/Support/ErrorHandling.h index 60677951a25..4d24ada48eb 100644 --- a/llvm/include/llvm/Support/ErrorHandling.h +++ b/llvm/include/llvm/Support/ErrorHandling.h @@ -79,9 +79,10 @@ namespace llvm { /// Use this instead of assert(0), so that the compiler knows this path /// is not reachable even for NDEBUG builds. #ifndef NDEBUG -#define llvm_unreachable(msg) llvm_unreachable_internal(msg, __FILE__, __LINE__) +#define llvm_unreachable(msg) \ + ::llvm::llvm_unreachable_internal(msg, __FILE__, __LINE__) #else -#define llvm_unreachable(msg) llvm_unreachable_internal() +#define llvm_unreachable(msg) ::llvm::llvm_unreachable_internal() #endif #endif |
