diff options
| author |  Dan Zhang <danzh@google.com> | 2017-12-20 16:43:29 -0500 |
|---|---|---|
| committer | Dan Zhang <danzh@google.com> | 2017-12-20 16:43:29 -0500 |
| commit | 64f6d3cf14f04e81b637d20f77a25d8ea7daf8a1 (patch) | |
| tree | 36543fa286b8f646f9c88b50a092de3afee92d5d /src/core/lib | |
| parent | 4d48a3d3e733e4b47770e981b634173438f75ea0 (diff) | |
| parent | ffc02054bd19061ed1aa38b90bb5c8dcc324af04 (diff) | |
Merge branch 'master' into startcb
Diffstat (limited to 'src/core/lib')
| -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 |