admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use RTC_DISALLOW_COPY_AND_ASSIGN in webrtc/base/sigslottester.h

Browse Source 
It was incorrectly using a older version of the macro, which
wasn't discovered since the code wasn't built in WebRTC until now.

I moved webrtc/base/sigslottester.h from rtc_unittests into
rtc_base_test_utils instead to make it more usable.

BUG=webrtc:6821

Review-Url: https://codereview.webrtc.org/2551813002
Cr-Commit-Position: refs/heads/master@{#15422}
This commit is contained in:
kjellander 2016-12-05 06:14:29 -08:00 committed by Commit bot
parent d654a9b6f0
commit 1d08100b9e
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/BUILD.gn
View File

@ -427,8 +427,7 @@ if (rtc_include_tests) {
"base/sharedexclusivelock_unittest.cc",
"base/signalthread_unittest.cc",
"base/sigslot_unittest.cc",
"base/sigslottester.h",
"base/sigslottester.h.pump",
"base/sigslottester_unittest.cc",
"base/stream_unittest.cc",
"base/stringencode_unittest.cc",
"base/stringutils_unittest.cc",

2
webrtc/base/BUILD.gn
View File

@ -739,6 +739,8 @@ if (rtc_include_tests) {
"firewallsocketserver.cc",
"firewallsocketserver.h",
"gunit.h",
"sigslottester.h",
"sigslottester.h.pump",
"testbase64.h",
"testechoserver.h",
"testutils.h",

2
webrtc/base/sigslottester.h
View File

@ -57,7 +57,7 @@ class SigslotTester0 : public sigslot::has_slots<> {
void OnSignalCallback() { callback_count_++; }
int callback_count_;
DISALLOW_COPY_AND_ASSIGN(SigslotTester0);
RTC_DISALLOW_COPY_AND_ASSIGN(SigslotTester0);
};
// Versions below are for testing signals that pass arguments. For all the

2
webrtc/base/sigslottester.h.pump
View File

@ -53,7 +53,7 @@ class SigslotTester0 : public sigslot::has_slots<> {
void OnSignalCallback() { callback_count_++; }
int callback_count_;
DISALLOW_COPY_AND_ASSIGN(SigslotTester0);
RTC_DISALLOW_COPY_AND_ASSIGN(SigslotTester0);
};
// Versions below are for testing signals that pass arguments. For all the