diff options
| author | 2018-04-24 16:55:58 +0000 | |
|---|---|---|
| committer | 2018-04-24 16:55:58 +0000 | |
| commit | 70ffeec2e95e82476827f0dbe2d7edb7688ccc7c (patch) | |
| tree | 83d3b809406d708fe1e08a5018deaf30943f263f | |
| parent | 3ebf5297788230b7703a8afbbe93bcf0ad65f780 (diff) | |
| parent | 837f3f04793851278bb1d2cca21b5a0fbd7e3029 (diff) | |
Merge "ART: Fix SCOPED_TRACE macro"
| -rw-r--r-- | libartbase/base/systrace.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libartbase/base/systrace.h b/libartbase/base/systrace.h index 2ff33e8c84..d995dce285 100644 --- a/libartbase/base/systrace.h +++ b/libartbase/base/systrace.h @@ -24,6 +24,7 @@ #include <string> #include "android-base/stringprintf.h" +#include "macros.h" namespace art { @@ -75,7 +76,7 @@ class ScopedTraceNoStart { }; #define SCOPED_TRACE \ - ::art::ScopedTraceNoStart trace ## __LINE__; \ + ::art::ScopedTraceNoStart APPEND_TOKENS_AFTER_EVAL(trace, __LINE__) ; \ (ATRACE_ENABLED()) && ::art::ScopedTraceNoStart::ScopedTraceMessageHelper().stream() } // namespace art |