commit cc61802bb201f30566dbb05f7386543da173a827
author Joe Onorato <joeo@android.com> Fri Aug 28 09:34:56 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 28 09:34:56 2009 -0700
tree d960949a6b70a5696a9f56f8f8a9073fd8618770
parent 9b1589102cc1f543d172417510b21d0108200c72
parent ecfd8e73e4d0102ba01139f9b7ea1e97ce7b79d5

am ecfd8e73: acc error tweaks

Merge commit 'ecfd8e73e4d0102ba01139f9b7ea1e97ce7b79d5' into eclair-plus-aosp

* commit 'ecfd8e73e4d0102ba01139f9b7ea1e97ce7b79d5':
  acc error tweaks

libacc/acc.cpp

diff --git a/libacc/acc.cpp b/libacc/acc.cpp
index 0409c10..535361c 100644
--- a/libacc/acc.cpp
+++ b/libacc/acc.cpp
@@ -3837,7 +3837,7 @@
 
     void assertImpl(bool isTrue, int line) {
         if (!isTrue) {
-            LOGD("assertion failed at line %s:%d.", __FILE__, line);
+            LOGD("%d: assertion failed at line %s:%d.", mLineNumber, __FILE__, line);
             internalError();
         }
     }
@@ -5220,7 +5220,6 @@
             String temp;
             decodeToken(temp, tok, true);
             error("Expected name. Got %s", temp.getUnwrapped());
-            assert(false);
             reportFailure = true;
         }
         for(;;) {