From 917dcbab65a02178f3203687bd260bea761b5645 Mon Sep 17 00:00:00 2001 From: Byoungchan Lee Date: Tue, 11 May 2021 22:27:10 +0900 Subject: [PATCH] Add explicit copy constructors and assign operators for some classes. Xcode 12.5 triggers some warnings for -Wdeprecated-copy, and I believe it is better to fix this problem than to suppress this warning. Bug: webrtc:12749 Change-Id: I5ca5fd8fdcae18fe7d3941f78b3366b5f03b8c00 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/218400 Commit-Queue: Harald Alvestrand Reviewed-by: Harald Alvestrand Cr-Commit-Position: refs/heads/master@{#33990} --- media/base/codec_unittest.cc | 3 ++- rtc_base/ssl_fingerprint.cc | 3 --- rtc_base/ssl_fingerprint.h | 3 ++- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/media/base/codec_unittest.cc b/media/base/codec_unittest.cc index 3f246c66cc..23bae7b7fe 100644 --- a/media/base/codec_unittest.cc +++ b/media/base/codec_unittest.cc @@ -30,7 +30,8 @@ class TestCodec : public Codec { TestCodec(int id, const std::string& name, int clockrate) : Codec(id, name, clockrate) {} TestCodec() : Codec() {} - TestCodec(const TestCodec& c) : Codec(c) {} + TestCodec(const TestCodec& c) = default; + TestCodec& operator=(const TestCodec& c) = default; }; TEST(CodecTest, TestCodecOperators) { diff --git a/rtc_base/ssl_fingerprint.cc b/rtc_base/ssl_fingerprint.cc index 5b261e0f53..358402eb03 100644 --- a/rtc_base/ssl_fingerprint.cc +++ b/rtc_base/ssl_fingerprint.cc @@ -103,9 +103,6 @@ SSLFingerprint::SSLFingerprint(const std::string& algorithm, size_t digest_len) : SSLFingerprint(algorithm, MakeArrayView(digest_in, digest_len)) {} -SSLFingerprint::SSLFingerprint(const SSLFingerprint& from) - : algorithm(from.algorithm), digest(from.digest) {} - bool SSLFingerprint::operator==(const SSLFingerprint& other) const { return algorithm == other.algorithm && digest == other.digest; } diff --git a/rtc_base/ssl_fingerprint.h b/rtc_base/ssl_fingerprint.h index d65d665d83..add3ab7911 100644 --- a/rtc_base/ssl_fingerprint.h +++ b/rtc_base/ssl_fingerprint.h @@ -57,7 +57,8 @@ struct RTC_EXPORT SSLFingerprint { const uint8_t* digest_in, size_t digest_len); - SSLFingerprint(const SSLFingerprint& from); + SSLFingerprint(const SSLFingerprint& from) = default; + SSLFingerprint& operator=(const SSLFingerprint& from) = default; bool operator==(const SSLFingerprint& other) const;