diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-04-29 12:06:41 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-29 12:06:41 -0700 |
| commit | 2777ba6f3f22d8120f67c69ad38ad6a27df14c7e (patch) | |
| tree | bb9668fd596dabc0efcc1495a4af25b53682b14b /emulator/qtools/post_trace.cpp | |
| parent | c1a531f750edc95abf16145856b694fe66aa51a1 (diff) | |
| parent | 2e689e4b2f1257cd40cf921277e23fe1b8f9bcbf (diff) | |
| download | sdk-2777ba6f3f22d8120f67c69ad38ad6a27df14c7e.zip sdk-2777ba6f3f22d8120f67c69ad38ad6a27df14c7e.tar.gz sdk-2777ba6f3f22d8120f67c69ad38ad6a27df14c7e.tar.bz2 | |
am 5ea0a94: Merge change 657 into donut
Merge commit '5ea0a9436cda662264cc0dcf92d3559d532383bb'
* commit '5ea0a9436cda662264cc0dcf92d3559d532383bb':
Fix a memory deallocation error that was crashing q2dm.
Diffstat (limited to 'emulator/qtools/post_trace.cpp')
| -rw-r--r-- | emulator/qtools/post_trace.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/emulator/qtools/post_trace.cpp b/emulator/qtools/post_trace.cpp index 99525fb..becfc2b 100644 --- a/emulator/qtools/post_trace.cpp +++ b/emulator/qtools/post_trace.cpp @@ -137,7 +137,7 @@ int main(int argc, char **argv) { double insn_per_sec = 0; if (elapsed_secs != 0) insn_per_sec = num_dynamic_insn / elapsed_secs; - char *suffix = ""; + const char *suffix = ""; if (insn_per_sec >= 1000000) { insn_per_sec /= 1000000.0; suffix = "M"; |