From 44bf02fba2d0d6c2c1b08ea09e2a0cd2e8b93846 Mon Sep 17 00:00:00 2001 From: kwiberg Date: Mon, 20 Jun 2016 02:39:48 -0700 Subject: [PATCH] Remove SdpAudioFormat's default constructor We didn't really want it; it was only necessary because we wanted to use rtc::Optional, and Optional used to require the contained type to be default constructable. But as of May 9th (https://codereview.webrtc.org/1896833004), it no longer does. Review-Url: https://codereview.webrtc.org/2066233002 Cr-Commit-Position: refs/heads/master@{#13211} --- webrtc/modules/audio_coding/codecs/audio_format.cc | 1 - webrtc/modules/audio_coding/codecs/audio_format.h | 3 --- 2 files changed, 4 deletions(-) diff --git a/webrtc/modules/audio_coding/codecs/audio_format.cc b/webrtc/modules/audio_coding/codecs/audio_format.cc index bb69cbdb2f..86d5d80042 100644 --- a/webrtc/modules/audio_coding/codecs/audio_format.cc +++ b/webrtc/modules/audio_coding/codecs/audio_format.cc @@ -12,7 +12,6 @@ namespace webrtc { -SdpAudioFormat::SdpAudioFormat() = default; SdpAudioFormat::SdpAudioFormat(const SdpAudioFormat&) = default; SdpAudioFormat::SdpAudioFormat(SdpAudioFormat&&) = default; diff --git a/webrtc/modules/audio_coding/codecs/audio_format.h b/webrtc/modules/audio_coding/codecs/audio_format.h index 61c0dd9f6f..9b971778f8 100644 --- a/webrtc/modules/audio_coding/codecs/audio_format.h +++ b/webrtc/modules/audio_coding/codecs/audio_format.h @@ -23,9 +23,6 @@ namespace webrtc { struct SdpAudioFormat { using Parameters = std::map; - // TODO(kwiberg): Get rid of the default constructor when rtc::Optional no - // longer requires it. - SdpAudioFormat(); SdpAudioFormat(const SdpAudioFormat&); SdpAudioFormat(SdpAudioFormat&&); SdpAudioFormat(const char* name, int clockrate_hz, int num_channels);