diff options
| author | Steve Block <steveblock@google.com> | 2012-01-09 18:31:54 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-01-17 17:56:20 +0000 |
| commit | 2ac29d02505670ce412a5fb07009f903b300dce5 (patch) | |
| tree | fc3036e594796abe1a05364e052ffa1d004e097b /include | |
| parent | 8aeb6e244a484305428ffbbc4be64d51e9bccdaa (diff) | |
| download | system_core-2ac29d02505670ce412a5fb07009f903b300dce5.tar.gz system_core-2ac29d02505670ce412a5fb07009f903b300dce5.tar.bz2 system_core-2ac29d02505670ce412a5fb07009f903b300dce5.zip | |
Rename LOG_ASSERT to ALOG_ASSERT
Change-Id: Iff15ac5e7ab226d437c08d23f18fd54e6793e65c
Diffstat (limited to 'include')
| -rw-r--r-- | include/cutils/log.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/cutils/log.h b/include/cutils/log.h index c7543fbc..2997a0ce 100644 --- a/include/cutils/log.h +++ b/include/cutils/log.h @@ -389,10 +389,13 @@ extern "C" { * Assertion that generates a log message when the assertion fails. * Stripped out of release builds. Uses the current LOG_TAG. */ +#ifndef ALOG_ASSERT +#define ALOG_ASSERT(cond, ...) LOG_FATAL_IF(!(cond), ## __VA_ARGS__) +//#define ALOG_ASSERT(cond) LOG_FATAL_IF(!(cond), "Assertion failed: " #cond) +// Temporary measure for code still using old LOG macros. #ifndef LOG_ASSERT -#define LOG_ASSERT(cond, ...) LOG_FATAL_IF(!(cond), ## __VA_ARGS__) -//#define LOG_ASSERT(cond) LOG_FATAL_IF(!(cond), "Assertion failed: " #cond) -#define ALOG_ASSERT LOG_ASSERT +#define LOG_ASSERT ALOG_ASSERT +#endif #endif // --------------------------------------------------------------------- @@ -493,7 +496,7 @@ typedef enum { __android_log_vprint(prio, tag, fmt) /* XXX Macros to work around syntax errors in places where format string - * arg is not passed to LOG_ASSERT, LOG_ALWAYS_FATAL or LOG_ALWAYS_FATAL_IF + * arg is not passed to ALOG_ASSERT, LOG_ALWAYS_FATAL or LOG_ALWAYS_FATAL_IF * (happens only in debug builds). */ |