From 9938ec7216f0c08c45f0cef4a007d887095aca79 Mon Sep 17 00:00:00 2001 From: blueboxd <48254131+blueboxd@users.noreply.github.com> Date: Thu, 30 May 2024 02:34:33 +0900 Subject: [PATCH] fix merge misses --- base/synchronization/waitable_event.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/base/synchronization/waitable_event.cc b/base/synchronization/waitable_event.cc index d1917553033f0f..6fc83cf07a64dc 100644 --- a/base/synchronization/waitable_event.cc +++ b/base/synchronization/waitable_event.cc @@ -16,7 +16,6 @@ namespace base { -#if !BUILDFLAG(IS_MAC) WaitableEvent::~WaitableEvent() { #if BUILDFLAG(ENABLE_BASE_TRACING) // As requested in the documentation of perfetto::Flow::FromPointer, we should @@ -37,7 +36,6 @@ WaitableEvent::~WaitableEvent() { } #endif // BUILDFLAG(ENABLE_BASE_TRACING) } -#endif void WaitableEvent::Signal() { // Must be ordered before SignalImpl() to guarantee it's emitted before the