diff options
| author |  ncteisen <ncteisen@gmail.com> | 2018-01-02 11:44:03 -0800 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-01-02 11:44:03 -0800 |
| commit | 24902641d434005bee6641e62fb2b57fc0b6bd87 (patch) | |
| tree | d9ab96b6531e30ca28044d571f2941f05cad52cb /src/core/lib/support/debug_location.h | |
| parent | d230ad086a894cc963235b27814e19bf686eb7aa (diff) | |
| parent | 63392f682e21543099926251b642cdcd0be2a17f (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into flow-control-part4
Diffstat (limited to 'src/core/lib/support/debug_location.h')
| -rw-r--r-- | src/core/lib/support/debug_location.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/lib/support/debug_location.h b/src/core/lib/support/debug_location.h index 0939da595d..9b3f9220fc 100644 --- a/src/core/lib/support/debug_location.h +++ b/src/core/lib/support/debug_location.h @@ -36,7 +36,7 @@ class DebugLocation { const char* file_; const int line_; }; -#define DEBUG_LOCATION DebugLocation(__FILE__, __LINE__) +#define DEBUG_LOCATION ::grpc_core::DebugLocation(__FILE__, __LINE__) #else class DebugLocation { public: @@ -44,7 +44,7 @@ class DebugLocation { const char* file() const { return nullptr; } int line() const { return -1; } }; -#define DEBUG_LOCATION DebugLocation() +#define DEBUG_LOCATION ::grpc_core::DebugLocation() #endif } // namespace grpc_core |