From fcf030221388cfb0e88955a9b215c1bd5e8cc841 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Sat, 29 Nov 2014 23:12:11 +0300 Subject: [PATCH] Remove noexcept specifications std::function(std::function&&) is only noexcept in libc++, not libstdc++, so calculated signatire of move ctor/assignment of AudioSpec won't match specification --- SDL2pp/Audio.hh | 4 ++-- SDL2pp/AudioSpec.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SDL2pp/Audio.hh b/SDL2pp/Audio.hh index 6158753..bb0f891 100644 --- a/SDL2pp/Audio.hh +++ b/SDL2pp/Audio.hh @@ -45,8 +45,8 @@ public: AudioSpec(int freq, SDL_AudioFormat format, Uint8 channels, Uint16 samples, AudioCallback&& callback); ~AudioSpec(); - AudioSpec(AudioSpec&& other) noexcept; - AudioSpec& operator=(AudioSpec&& other) noexcept; + AudioSpec(AudioSpec&& other); + AudioSpec& operator=(AudioSpec&& other); AudioSpec(const AudioSpec& other) = delete; AudioSpec& operator=(const AudioSpec& other) = delete; diff --git a/SDL2pp/AudioSpec.cc b/SDL2pp/AudioSpec.cc index 2e75e9d..7eb5ff3 100644 --- a/SDL2pp/AudioSpec.cc +++ b/SDL2pp/AudioSpec.cc @@ -44,8 +44,8 @@ AudioSpec::AudioSpec(int freq, SDL_AudioFormat format, Uint8 channels, Uint16 sa AudioSpec::~AudioSpec() { } -AudioSpec::AudioSpec(AudioSpec&&) noexcept = default; -AudioSpec& AudioSpec::operator=(AudioSpec&&) noexcept = default; +AudioSpec::AudioSpec(AudioSpec&&) = default; +AudioSpec& AudioSpec::operator=(AudioSpec&&) = default; void AudioSpec::ChangeCallback(AudioCallback&& callback) { callback_ = callback;