summaryrefslogtreecommitdiff
path: root/libartbase/base/systrace.h
diff options
context:
space:
mode:
Diffstat (limited to 'libartbase/base/systrace.h')
-rw-r--r--libartbase/base/systrace.h3
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