diff options
| author | Elliott Hughes <enh@google.com> | 2018-10-25 11:00:00 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2018-10-25 11:00:00 -0700 |
| commit | 5e62b34c0d6fa545b487b9b64fb4a04a0589bc13 (patch) | |
| tree | e08ee44067b3b636ace11b21ec8d63a08d4d2a19 /libc/private/bionic_systrace.h | |
| parent | c89a3971e94c30611c885e4c440eae2fd9937948 (diff) | |
Clean up bionic_macros.h a bit.
Use <android-base/macros.h> instead where possible, and move the bionic
macros out of the way of the libbase ones. Yes, there are folks who manage
to end up with both included at once (thanks OpenGL!), and cleaning that
up doesn't seem nearly as practical as just making this change.
Bug: N/A
Test: builds
Change-Id: I23fc544f39d5addf81dc61471771a5438778895b
Diffstat (limited to 'libc/private/bionic_systrace.h')
| -rw-r--r-- | libc/private/bionic_systrace.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libc/private/bionic_systrace.h b/libc/private/bionic_systrace.h index 304fb8061..86d2a08c5 100644 --- a/libc/private/bionic_systrace.h +++ b/libc/private/bionic_systrace.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef BIONIC_SYSTRACE_H -#define BIONIC_SYSTRACE_H +#pragma once #include "bionic_macros.h" @@ -31,10 +30,8 @@ class __LIBC_HIDDEN__ ScopedTrace { void End(); private: bool called_end_; - DISALLOW_COPY_AND_ASSIGN(ScopedTrace); + BIONIC_DISALLOW_COPY_AND_ASSIGN(ScopedTrace); }; void bionic_trace_begin(const char* message); void bionic_trace_end(); - -#endif |