diff options
| author | Carl Shapiro <cshapiro@google.com> | 2010-12-01 19:51:36 -0800 |
|---|---|---|
| committer | Carl Shapiro <cshapiro@google.com> | 2010-12-01 19:51:36 -0800 |
| commit | 4a1ef7d56111423fc78bb5e55b710fd9ca0e02ec (patch) | |
| tree | b44d84bbbcf770967a98e51e3be58236644543d1 /vm/Common.h | |
| parent | e8ef2b53866b01fb5a8e73ea867c934777aec57e (diff) | |
| download | android_dalvik-4a1ef7d56111423fc78bb5e55b710fd9ca0e02ec.tar.gz android_dalvik-4a1ef7d56111423fc78bb5e55b710fd9ca0e02ec.tar.bz2 android_dalvik-4a1ef7d56111423fc78bb5e55b710fd9ca0e02ec.zip | |
Fix the typing of the assert macro as required by C++.
Change-Id: Iff70db8bf4f1ae8d1c4abbe565fa7993b0fe0df9
Diffstat (limited to 'vm/Common.h')
| -rw-r--r-- | vm/Common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vm/Common.h b/vm/Common.h index ae0938aea..208ed2045 100644 --- a/vm/Common.h +++ b/vm/Common.h @@ -31,7 +31,7 @@ # undef assert # define assert(x) \ ((x) ? ((void)0) : (LOGE("ASSERT FAILED (%s:%d): %s\n", \ - __FILE__, __LINE__, #x), *(int*)39=39, 0) ) + __FILE__, __LINE__, #x), *(int*)39=39, (void)0) ) #endif #define MIN(x,y) (((x) < (y)) ? (x) : (y)) |