Roll forward to cl/318932159

Signed-off-by: Alexey Polyudov <apolyudov@google.com>
Change-Id: Ic18f5d83a59deaf81afec14dcf2187b8c70195eb
This commit is contained in:
Alexey Polyudov
2020-06-30 00:31:15 -07:00
parent 3e5ca324f1
commit 31ab07b5d7
39 changed files with 1229 additions and 189 deletions
+6 -1
View File
@@ -43,7 +43,12 @@ class LogMessageVoidify {
location::nearby::api::LogMessage::Severity::kError
#define NEARBY_SEVERITY_FATAL \
location::nearby::api::LogMessage::Severity::kFatal
#if defined(_WIN32)
// wingdi.h defines ERROR to be 0. When we call LOG(ERROR), it gets substituted
// with 0, and it expands to NEARBY_SEVERITY_0. To allow us to keep using this
// syntax, we define this macro to do the same thing as NEARBY_SEVERITY_ERROR.
#define NEARBY_SEVERITY_0 location::nearby::api::LogMessage::Severity::kError
#endif // defined(_WIN32)
#define NEARBY_SEVERITY(severity) NEARBY_SEVERITY_##severity
// Log enabling