From 93b8fc18b65d9e070db55d4f6004c2bd289e1091 Mon Sep 17 00:00:00 2001 From: Timur Doumler Date: Thu, 26 May 2016 12:53:39 +0100 Subject: [PATCH] Reverted MPEZone: added copy constructor and copy assignment operator. (reverted from commit 42a31451538ef85b576fb2b514d72b86233985bd). Reason: the methods auto-generated by the compiler are fine. --- .../juce_audio_basics/mpe/juce_MPEZone.cpp | 21 ------------------- modules/juce_audio_basics/mpe/juce_MPEZone.h | 6 ------ 2 files changed, 27 deletions(-) diff --git a/modules/juce_audio_basics/mpe/juce_MPEZone.cpp b/modules/juce_audio_basics/mpe/juce_MPEZone.cpp index 7c8ee7a18d..ec8e00fbfc 100644 --- a/modules/juce_audio_basics/mpe/juce_MPEZone.cpp +++ b/modules/juce_audio_basics/mpe/juce_MPEZone.cpp @@ -58,27 +58,6 @@ MPEZone::MPEZone (int masterChannel_, checkAndLimitZoneParameters (0, 96, masterPitchbendRange); } -MPEZone::MPEZone (const MPEZone& other) noexcept - : masterChannel (other.masterChannel), - numNoteChannels (other.numNoteChannels), - perNotePitchbendRange (other.perNotePitchbendRange), - masterPitchbendRange (other.masterPitchbendRange) -{ -} - -MPEZone& MPEZone::operator= (const MPEZone& other) noexcept -{ - if (this != &other) - { - masterChannel = other.masterChannel; - numNoteChannels = other.numNoteChannels; - perNotePitchbendRange = other.perNotePitchbendRange; - masterPitchbendRange = other.masterPitchbendRange; - } - - return *this; -} - //============================================================================== int MPEZone::getMasterChannel() const noexcept { diff --git a/modules/juce_audio_basics/mpe/juce_MPEZone.h b/modules/juce_audio_basics/mpe/juce_MPEZone.h index e5092701b4..c677d3c43a 100644 --- a/modules/juce_audio_basics/mpe/juce_MPEZone.h +++ b/modules/juce_audio_basics/mpe/juce_MPEZone.h @@ -69,12 +69,6 @@ struct JUCE_API MPEZone int perNotePitchbendRange = 48, int masterPitchbendRange = 2) noexcept; - /** Copy constructor. */ - MPEZone (const MPEZone& other) noexcept; - - /** Copy assignment operator. */ - MPEZone& operator= (const MPEZone& other) noexcept; - /* Returns the MIDI master channel number (in the range 1-16) of this zone. */ int getMasterChannel() const noexcept;