1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-15 23:59:37 +02:00

Fix windows build...

Defaulted move constructors and assignments introduced at 080dd34 are not
essential but might give a bit more efficiency in std::vector on non-Windows.

Previous compilation fix was incorrect!  Excpliticly defined move assignments
should not have had no-effect bodies!
This commit is contained in:
Paul Licameli 2018-02-22 12:26:20 -05:00
parent e3f2a3e3ff
commit 2a08a3cc07
7 changed files with 13 additions and 13 deletions

View File

@ -28,8 +28,8 @@ struct Syllable {
Syllable() = default;
Syllable( const Syllable& ) = default;
Syllable& operator= ( const Syllable& ) = default;
Syllable( Syllable && ) {}
Syllable& operator= ( Syllable&& ) { return *this;}
//Syllable( Syllable && ) = default;
//Syllable& operator= ( Syllable&& ) = default;
double t;
wxString text;

View File

@ -74,7 +74,7 @@ class AUDACITY_DLL_API Tags final : public XMLTagHandler {
public:
Tags(); // constructor
Tags( const Tags& ) = default;
Tags( Tags && ) {}
//Tags( Tags && ) = default;
virtual ~Tags();
std::shared_ptr<Tags> Duplicate() const;

View File

@ -63,8 +63,8 @@ public:
}
LV2Port( const LV2Port & ) = default;
LV2Port& operator = ( const LV2Port & ) = default;
LV2Port( LV2Port && ) {}
LV2Port& operator = ( LV2Port && ) { return *this;}
//LV2Port( LV2Port && ) = default;
//LV2Port& operator = ( LV2Port && ) = default;
uint32_t mIndex;
wxString mSymbol;

View File

@ -49,8 +49,8 @@ public:
NyqControl() = default;
NyqControl( const NyqControl& ) = default;
NyqControl &operator = ( const NyqControl & ) = default;
NyqControl( NyqControl && ) {}
NyqControl &operator = ( NyqControl && ) { return *this;}
//NyqControl( NyqControl && ) = default;
//NyqControl &operator = ( NyqControl && ) = default;
int type;
wxString var;

View File

@ -41,8 +41,8 @@ class AUDACITY_DLL_API FormatInfo
FormatInfo() {}
FormatInfo( const FormatInfo & ) = default;
FormatInfo &operator = ( const FormatInfo & ) = default;
FormatInfo( FormatInfo && ) {}
FormatInfo &operator = ( FormatInfo && ) { return *this;}
//FormatInfo( FormatInfo && ) = default;
//FormatInfo &operator = ( FormatInfo && ) = default;
~FormatInfo() {}
wxString mFormat;

View File

@ -33,8 +33,8 @@ public:
}
KeyNode( const KeyNode & ) = default;
KeyNode &operator = ( const KeyNode & ) = default;
KeyNode( KeyNode && ) {}
KeyNode &operator = ( KeyNode && ) { return *this;}
//KeyNode( KeyNode && ) = default;
//KeyNode &operator = ( KeyNode && ) = default;
public:
wxString name;

View File

@ -239,8 +239,8 @@ public:
}
NumericField( const NumericField & ) = default;
NumericField &operator = ( const NumericField & ) = default;
NumericField( NumericField && ) {}
NumericField &operator = ( NumericField && ) { return *this;}
//NumericField( NumericField && ) = default;
//NumericField &operator = ( NumericField && ) = default;
void CreateDigitFormatStr()
{
if (range > 1)