Merge "base: Avoid compilation error when compiled with -Wdangling-else." (80b1b188) · Commits · e / os / android_system_core

base/include/android-base/logging.h

+13 −19

Original line number	Diff line number	Diff line
		@@ -100,9 +100,9 @@ class ErrnoRestorer {
		errno = saved_errno_;
		}

		// Allow this object to evaluate to false which is useful in macros.
		// Allow this object to be used as part of && operation.
		operator bool() const {
		return false;
		return true;
		}

		private:
		@@ -124,10 +124,8 @@ class ErrnoRestorer {
		// do-while(0) statement doesn't work here. Because we need to support << operator
		// following the macro, like "LOG(DEBUG) << xxx;".
		#define LOG_TO(dest, severity) \
		if (LIKELY(::android::base::severity < ::android::base::GetMinimumLogSeverity())) \
		; \
		else \
		::android::base::ErrnoRestorer() ? (std::ostream)nullptr : \
		UNLIKELY(::android::base::severity >= ::android::base::GetMinimumLogSeverity()) && \
		::android::base::ErrnoRestorer() && \
		::android::base::LogMessage(__FILE__, __LINE__, \
		::android::base::dest, \
		::android::base::severity, -1).stream()
		@@ -138,10 +136,8 @@ class ErrnoRestorer {

		// Behaves like PLOG, but logs to the specified log ID.
		#define PLOG_TO(dest, severity) \
		if (LIKELY(::android::base::severity < ::android::base::GetMinimumLogSeverity())) \
		; \
		else \
		::android::base::ErrnoRestorer() ? (std::ostream)nullptr : \
		UNLIKELY(::android::base::severity >= ::android::base::GetMinimumLogSeverity()) && \
		::android::base::ErrnoRestorer() && \
		::android::base::LogMessage(__FILE__, __LINE__, \
		::android::base::dest, \
		::android::base::severity, errno).stream()
		@@ -165,9 +161,7 @@ class ErrnoRestorer {
		// CHECK(false == true) results in a log message of
		// "Check failed: false == true".
		#define CHECK(x) \
		if (LIKELY((x))) \
		; \
		else \
		LIKELY((x)) \|\| \
		ABORT_AFTER_LOG_FATAL \
		::android::base::LogMessage(__FILE__, __LINE__, ::android::base::DEFAULT, \
		::android::base::FATAL, -1).stream() \