Skip to content
This repository was archived by the owner on Oct 25, 2024. It is now read-only.

Commit 0abd518

Browse files
MirkoBonadeiCommit Bot
authored andcommitted
Revert "Introduce RTC_NO_UNIQUE_ADDRESS."
This reverts commit f5e261a. Reason for revert: Breaks downstream projects. Original change's description: > Introduce RTC_NO_UNIQUE_ADDRESS. > > This macro introduces the possibility to suggest the compiler that a > data member doesn't need an address different from other non static > data members. > > The usage of a macro is to maintain portability since at the moment > the attribute [[no_unique_address]] is only supported by clang > with at least -std=c++11 but it should be supported by all the > compilers starting from C++20. > > Bug: webrtc:11495 > Change-Id: I9f12b67b4422a2749649eaa6b004a67d5fd572d8 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/173331 > Commit-Queue: Mirko Bonadei <[email protected]> > Reviewed-by: Karl Wiberg <[email protected]> > Cr-Commit-Position: refs/heads/master@{#32246} [email protected],[email protected] # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:11495 Change-Id: Ice318d1b11ca3dff09c190187a0b0a32ca945fe3 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/186944 Reviewed-by: Mirko Bonadei <[email protected]> Reviewed-by: Per Kjellander <[email protected]> Commit-Queue: Mirko Bonadei <[email protected]> Cr-Commit-Position: refs/heads/master@{#32335}
1 parent 84ba18a commit 0abd518

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+42
-138
lines changed

audio/BUILD.gn

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ rtc_library("audio") {
9494
"../rtc_base/experiments:field_trial_parser",
9595
"../rtc_base/synchronization:mutex",
9696
"../rtc_base/synchronization:sequence_checker",
97-
"../rtc_base/system:no_unique_address",
9897
"../rtc_base/task_utils:to_queued_task",
9998
"../system_wrappers",
10099
"../system_wrappers:field_trial",

audio/channel_receive_frame_transformer_delegate.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
#include "api/frame_transformer_interface.h"
1717
#include "rtc_base/synchronization/sequence_checker.h"
18-
#include "rtc_base/system/no_unique_address.h"
1918
#include "rtc_base/task_queue.h"
2019
#include "rtc_base/thread.h"
2120

@@ -62,7 +61,7 @@ class ChannelReceiveFrameTransformerDelegate : public TransformedFrameCallback {
6261
~ChannelReceiveFrameTransformerDelegate() override = default;
6362

6463
private:
65-
RTC_NO_UNIQUE_ADDRESS SequenceChecker sequence_checker_;
64+
SequenceChecker sequence_checker_;
6665
ReceiveFrameCallback receive_frame_callback_
6766
RTC_GUARDED_BY(sequence_checker_);
6867
rtc::scoped_refptr<FrameTransformerInterface> frame_transformer_

audio/voip/BUILD.gn

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ rtc_library("audio_egress") {
9898
"../../rtc_base:thread_checker",
9999
"../../rtc_base:timeutils",
100100
"../../rtc_base/synchronization:mutex",
101-
"../../rtc_base/system:no_unique_address",
102101
"../utility:audio_frame_operations",
103102
]
104103
}

call/BUILD.gn

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ rtc_library("bitrate_allocator") {
224224
"../rtc_base:rtc_base_approved",
225225
"../rtc_base:safe_minmax",
226226
"../rtc_base/synchronization:sequence_checker",
227-
"../rtc_base/system:no_unique_address",
228227
"../system_wrappers",
229228
"../system_wrappers:field_trial",
230229
"../system_wrappers:metrics",
@@ -285,7 +284,6 @@ rtc_library("call") {
285284
"../rtc_base/experiments:field_trial_parser",
286285
"../rtc_base/network:sent_packet",
287286
"../rtc_base/synchronization:sequence_checker",
288-
"../rtc_base/system:no_unique_address",
289287
"../rtc_base/task_utils:pending_task_safety_flag",
290288
"../system_wrappers",
291289
"../system_wrappers:field_trial",

call/bitrate_allocator.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "api/call/bitrate_allocation.h"
2323
#include "api/transport/network_types.h"
2424
#include "rtc_base/synchronization/sequence_checker.h"
25-
#include "rtc_base/system/no_unique_address.h"
2625

2726
namespace webrtc {
2827

@@ -149,7 +148,7 @@ class BitrateAllocator : public BitrateAllocatorInterface {
149148
// video send stream.
150149
static uint8_t GetTransmissionMaxBitrateMultiplier();
151150

152-
RTC_NO_UNIQUE_ADDRESS SequenceChecker sequenced_checker_;
151+
SequenceChecker sequenced_checker_;
153152
LimitObserver* const limit_observer_ RTC_GUARDED_BY(&sequenced_checker_);
154153
// Stored in a list to keep track of the insertion order.
155154
std::vector<AllocatableTrack> allocatable_tracks_

call/call.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
#include "rtc_base/logging.h"
5252
#include "rtc_base/strings/string_builder.h"
5353
#include "rtc_base/synchronization/sequence_checker.h"
54-
#include "rtc_base/system/no_unique_address.h"
5554
#include "rtc_base/task_utils/pending_task_safety_flag.h"
5655
#include "rtc_base/thread_annotations.h"
5756
#include "rtc_base/time_utils.h"
@@ -533,7 +532,7 @@ class SharedModuleThread::Impl {
533532
}
534533

535534
private:
536-
RTC_NO_UNIQUE_ADDRESS SequenceChecker sequence_checker_;
535+
SequenceChecker sequence_checker_;
537536
mutable int ref_count_ RTC_GUARDED_BY(sequence_checker_) = 0;
538537
std::unique_ptr<ProcessThread> const module_thread_;
539538
std::function<void()> const on_one_ref_remaining_;

call/call_factory.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "call/call.h"
1616
#include "call/call_config.h"
1717
#include "rtc_base/synchronization/sequence_checker.h"
18-
#include "rtc_base/system/no_unique_address.h"
1918

2019
namespace webrtc {
2120

@@ -28,7 +27,7 @@ class CallFactory : public CallFactoryInterface {
2827

2928
Call* CreateCall(const CallConfig& config) override;
3029

31-
RTC_NO_UNIQUE_ADDRESS SequenceChecker call_thread_;
30+
SequenceChecker call_thread_;
3231
rtc::scoped_refptr<SharedModuleThread> module_thread_
3332
RTC_GUARDED_BY(call_thread_);
3433
};

logging/BUILD.gn

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@ if (rtc_enable_protobuf) {
268268
"../rtc_base:rtc_task_queue",
269269
"../rtc_base:safe_minmax",
270270
"../rtc_base/synchronization:sequence_checker",
271-
"../rtc_base/system:no_unique_address",
272271
]
273272
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
274273
}

logging/rtc_event_log/rtc_event_log_impl.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include "api/task_queue/task_queue_factory.h"
2525
#include "logging/rtc_event_log/encoder/rtc_event_log_encoder.h"
2626
#include "rtc_base/synchronization/sequence_checker.h"
27-
#include "rtc_base/system/no_unique_address.h"
2827
#include "rtc_base/task_queue.h"
2928
#include "rtc_base/thread_annotations.h"
3029

@@ -79,7 +78,7 @@ class RtcEventLogImpl final : public RtcEventLog {
7978
int64_t last_output_ms_ RTC_GUARDED_BY(*task_queue_);
8079
bool output_scheduled_ RTC_GUARDED_BY(*task_queue_);
8180

82-
RTC_NO_UNIQUE_ADDRESS SequenceChecker logging_state_checker_;
81+
SequenceChecker logging_state_checker_;
8382
bool logging_state_started_ RTC_GUARDED_BY(logging_state_checker_);
8483

8584
// Since we are posting tasks bound to |this|, it is critical that the event

media/BUILD.gn

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ rtc_library("rtc_simulcast_encoder_adapter") {
196196
"../rtc_base:rtc_base_approved",
197197
"../rtc_base/experiments:rate_control_settings",
198198
"../rtc_base/synchronization:sequence_checker",
199-
"../rtc_base/system:no_unique_address",
200199
"../rtc_base/system:rtc_export",
201200
"../system_wrappers",
202201
"../system_wrappers:field_trial",

0 commit comments

Comments
 (0)