diff options
| author | 2024-11-06 17:33:14 +0000 | |
|---|---|---|
| committer | 2024-11-11 11:08:09 +0000 | |
| commit | a202343b6dd492bea383f9babc427dfa2e274b7d (patch) | |
| tree | 98cf212e927aec26a85de79eba31a7e367f089e4 /libartbase/base/systrace.h | |
| parent | 01df4b3a9bb31f21f451452f0ce47632dd8916ad (diff) | |
Consolidate the use of some constants.
Bug: 377474232
Test: atest ArtServiceTests
Test: atest art_standalone_artd_tests
Test: atest art_standalone_odrefresh_tests
Test: atest art_standalone_libartbase_tests
Test: atest art_standalone_runtime_tests
Test: atest art_standalone_dex2oat_tests
Change-Id: I66a29ea85176c6c6d676537fe6e4e64152360acc
Diffstat (limited to 'libartbase/base/systrace.h')
| -rw-r--r-- | libartbase/base/systrace.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libartbase/base/systrace.h b/libartbase/base/systrace.h index 6e5e0e013a..c42fe86737 100644 --- a/libartbase/base/systrace.h +++ b/libartbase/base/systrace.h @@ -95,9 +95,12 @@ class ScopedTraceNoStart { }; }; +// Avoid the name clash with the one in gtest/gtest.h. +#ifndef SCOPED_TRACE #define SCOPED_TRACE \ ::art::ScopedTraceNoStart APPEND_TOKENS_AFTER_EVAL(trace, __LINE__) ; \ (ATraceEnabled()) && ::art::ScopedTraceNoStart::ScopedTraceMessageHelper().stream() +#endif // SCOPED_TRACE } // namespace art |