From 9a5c8d4f41dd6e972f9a03860b0a42d136609364 Mon Sep 17 00:00:00 2001 From: Cary Phillips Date: Sun, 3 Nov 2019 17:46:48 -0800 Subject: [PATCH] remove const from arg declaration in move-constructors/move-assignments Signed-off-by: Cary Phillips --- IlmBase/Iex/IexBaseExc.cpp | 28 +++++++++++++++----- IlmBase/Iex/IexBaseExc.h | 20 ++++++++++---- IlmBase/IlmThread/IlmThread.h | 4 +-- IlmBase/IlmThread/IlmThreadPool.cpp | 4 +-- IlmBase/IlmThread/IlmThreadPool.h | 4 +-- OpenEXR/IlmImf/ImfAcesFile.cpp | 8 +++--- OpenEXR/IlmImf/ImfAcesFile.h | 8 +++--- OpenEXR/IlmImf/ImfArray.h | 8 +++--- OpenEXR/IlmImf/ImfAutoArray.h | 4 +-- OpenEXR/IlmImf/ImfB44Compressor.h | 4 +-- OpenEXR/IlmImf/ImfCompositeDeepScanLine.h | 4 +-- OpenEXR/IlmImf/ImfDeepScanLineInputFile.cpp | 4 +-- OpenEXR/IlmImf/ImfDeepScanLineInputFile.h | 4 +-- OpenEXR/IlmImf/ImfDeepScanLineOutputFile.cpp | 4 +-- OpenEXR/IlmImf/ImfDeepScanLineOutputFile.h | 4 +-- OpenEXR/IlmImf/ImfDeepTiledInputFile.cpp | 4 +-- OpenEXR/IlmImf/ImfDeepTiledInputFile.h | 4 +-- OpenEXR/IlmImf/ImfDeepTiledOutputFile.cpp | 8 +++--- OpenEXR/IlmImf/ImfDeepTiledOutputFile.h | 4 +-- OpenEXR/IlmImf/ImfDwaCompressor.h | 4 +-- OpenEXR/IlmImf/ImfFastHuf.h | 4 +-- OpenEXR/IlmImf/ImfInputFile.cpp | 4 +-- OpenEXR/IlmImf/ImfInputFile.h | 4 +-- OpenEXR/IlmImf/ImfMultiPartInputFile.cpp | 4 +-- OpenEXR/IlmImf/ImfMultiPartInputFile.h | 4 +-- OpenEXR/IlmImf/ImfMultiPartOutputFile.cpp | 4 +-- OpenEXR/IlmImf/ImfMultiPartOutputFile.h | 4 +-- OpenEXR/IlmImf/ImfOutputFile.cpp | 4 +-- OpenEXR/IlmImf/ImfOutputFile.h | 4 +-- OpenEXR/IlmImf/ImfPizCompressor.h | 4 +-- OpenEXR/IlmImf/ImfPxr24Compressor.h | 4 +-- OpenEXR/IlmImf/ImfRgbaFile.cpp | 8 +++--- OpenEXR/IlmImf/ImfRgbaFile.h | 8 +++--- OpenEXR/IlmImf/ImfRleCompressor.h | 4 +-- OpenEXR/IlmImf/ImfScanLineInputFile.cpp | 8 +++--- OpenEXR/IlmImf/ImfScanLineInputFile.h | 4 +-- OpenEXR/IlmImf/ImfTiledInputFile.cpp | 8 +++--- OpenEXR/IlmImf/ImfTiledInputFile.h | 4 +-- OpenEXR/IlmImf/ImfTiledOutputFile.cpp | 8 +++--- OpenEXR/IlmImf/ImfTiledOutputFile.h | 4 +-- OpenEXR/IlmImf/ImfTiledRgbaFile.h | 8 +++--- OpenEXR/IlmImf/ImfZip.h | 4 +-- OpenEXR/IlmImf/dwaLookups.cpp | 4 +-- OpenEXR/IlmImfUtil/ImfDeepImageChannel.h | 8 +++--- OpenEXR/IlmImfUtil/ImfFlatImageChannel.h | 8 +++--- OpenEXR/IlmImfUtil/ImfSampleCountChannel.h | 4 +-- OpenEXR/exrmaketiled/Image.h | 4 +-- OpenEXR/exrmultiview/Image.h | 4 +-- PyIlmBase/PyIex/PyIexTypeTranslator.h | 8 +++--- PyIlmBase/PyImath/PyImathUtil.h | 4 +-- 50 files changed, 159 insertions(+), 133 deletions(-) diff --git a/IlmBase/Iex/IexBaseExc.cpp b/IlmBase/Iex/IexBaseExc.cpp index 9884daddba..42943a9928 100644 --- a/IlmBase/Iex/IexBaseExc.cpp +++ b/IlmBase/Iex/IexBaseExc.cpp @@ -99,18 +99,34 @@ BaseExc::BaseExc (std::stringstream &s) throw () : // empty } +BaseExc::BaseExc (const BaseExc &be) throw() + : _message (be._message), + _stackTrace (be._stackTrace) +{ +} -BaseExc::BaseExc (const BaseExc &be) throw () : - _message (be._message), - _stackTrace (be._stackTrace) +BaseExc::~BaseExc () throw () { - // empty } +BaseExc & +BaseExc::operator = (const BaseExc& be) throw () +{ + if (this != &be) + { + _message = be._message; + _stackTrace = be._stackTrace; + } +} -BaseExc::~BaseExc () throw () +BaseExc & +BaseExc::operator = (BaseExc&& be) throw () { - // empty + if (this != &be) + { + _message = std::move (be._message); + _stackTrace = std::move (be._stackTrace); + } } const char * diff --git a/IlmBase/Iex/IexBaseExc.h b/IlmBase/Iex/IexBaseExc.h index 86665c35a3..8e24c2cc36 100644 --- a/IlmBase/Iex/IexBaseExc.h +++ b/IlmBase/Iex/IexBaseExc.h @@ -65,15 +65,16 @@ class BaseExc: public std::exception // Constructors and destructor //---------------------------- - IEX_EXPORT BaseExc (const char *s = 0) throw(); // std::string (s) - IEX_EXPORT BaseExc (const std::string &s) throw(); // std::string (s) - IEX_EXPORT BaseExc (std::stringstream &s) throw(); // std::string (s.str()) + IEX_EXPORT BaseExc (const char *s = nullptr) throw(); // std::string (s) + IEX_EXPORT BaseExc (const std::string &s) throw(); // std::string (s) + IEX_EXPORT BaseExc (std::stringstream &s) throw(); // std::string (s.str()) IEX_EXPORT BaseExc (const BaseExc &be) throw(); + IEX_EXPORT BaseExc (BaseExc &&be) throw(); IEX_EXPORT virtual ~BaseExc () throw (); - IEX_EXPORT BaseExc & operator = (const BaseExc& be) throw () = delete; - IEX_EXPORT BaseExc & operator = (const BaseExc&& be) throw () = delete; + IEX_EXPORT BaseExc & operator = (const BaseExc& be) throw (); + IEX_EXPORT BaseExc & operator = (BaseExc&& be) throw (); //--------------------------------------------------- // what() method -- e.what() returns _message.c_str() @@ -139,13 +140,22 @@ class BaseExc: public std::exception exp name (const char* text) throw(); \ exp name (const std::string &text) throw(); \ exp name (std::stringstream &text) throw(); \ + exp name (const name &other) throw(); \ + exp name (name &&other) throw(); \ + exp name& operator = (name &other) throw(); \ + exp name& operator = (name &&other) throw(); \ exp ~name() throw(); \ }; + #define DEFINE_EXC_EXP_IMPL(exp, name, base) \ exp name::name () throw () : base () {} \ exp name::name (const char* text) throw () : base (text) {} \ exp name::name (const std::string& text) throw () : base (text) {} \ exp name::name (std::stringstream& text) throw () : base (text) {} \ +exp name::name (const name &other) throw() : base (other) {} \ +exp name::name (name &&other) throw() : base (other) {} \ +exp name& name::operator = (name &other) throw() { base::operator=(other); return *this; } \ +exp name& name::operator = (name &&other) throw() { base::operator=(other); return *this; } \ exp name::~name () throw () {} // For backward compatibility. diff --git a/IlmBase/IlmThread/IlmThread.h b/IlmBase/IlmThread/IlmThread.h index 12db8db335..3bd4e45022 100644 --- a/IlmBase/IlmThread/IlmThread.h +++ b/IlmBase/IlmThread/IlmThread.h @@ -143,9 +143,9 @@ class Thread std::thread _thread; Thread &operator= (const Thread& t) = delete; - Thread &operator= (const Thread&& t) = delete; + Thread &operator= (Thread&& t) = delete; Thread (const Thread& t) = delete; - Thread (const Thread&& t) = delete; + Thread (Thread&& t) = delete; #endif }; diff --git a/IlmBase/IlmThread/IlmThreadPool.cpp b/IlmBase/IlmThread/IlmThreadPool.cpp index 97c3225640..ea709eaf84 100644 --- a/IlmBase/IlmThread/IlmThreadPool.cpp +++ b/IlmBase/IlmThread/IlmThreadPool.cpp @@ -91,8 +91,8 @@ struct ThreadPool::Data ~Data(); Data (const Data&) = delete; Data &operator= (const Data&) = delete; - Data (const Data&&) = delete; - Data &operator= (const Data&&) = delete; + Data (Data&&) = delete; + Data &operator= (Data&&) = delete; struct SafeProvider { diff --git a/IlmBase/IlmThread/IlmThreadPool.h b/IlmBase/IlmThread/IlmThreadPool.h index 90f8b2b7d2..1986dcea40 100644 --- a/IlmBase/IlmThread/IlmThreadPool.h +++ b/IlmBase/IlmThread/IlmThreadPool.h @@ -219,8 +219,8 @@ class ILMTHREAD_EXPORT TaskGroup TaskGroup (const TaskGroup& other) = delete; TaskGroup& operator = (const TaskGroup& other) = delete; - TaskGroup (const TaskGroup&& other) = delete; - TaskGroup& operator = (const TaskGroup&& other) = delete; + TaskGroup (TaskGroup&& other) = delete; + TaskGroup& operator = (TaskGroup&& other) = delete; // marks one task as finished // should be used by the thread pool provider to notify diff --git a/OpenEXR/IlmImf/ImfAcesFile.cpp b/OpenEXR/IlmImf/ImfAcesFile.cpp index 9a5f5e9890..8391fb6a7d 100644 --- a/OpenEXR/IlmImf/ImfAcesFile.cpp +++ b/OpenEXR/IlmImf/ImfAcesFile.cpp @@ -74,8 +74,8 @@ class AcesOutputFile::Data Data (const Data& other) = delete; Data& operator = (const Data& other) = delete; - Data (const Data&& other) = delete; - Data& operator = (const Data&& other) = delete; + Data (Data&& other) = delete; + Data& operator = (Data&& other) = delete; RgbaOutputFile * rgbaFile; }; @@ -345,8 +345,8 @@ class AcesInputFile::Data Data (const Data& other) = delete; Data& operator = (const Data& other) = delete; - Data (const Data&& other) = delete; - Data& operator = (const Data&& other) = delete; + Data (Data&& other) = delete; + Data& operator = (Data&& other) = delete; void initColorConversion (); diff --git a/OpenEXR/IlmImf/ImfAcesFile.h b/OpenEXR/IlmImf/ImfAcesFile.h index b653800047..d1a8f71079 100644 --- a/OpenEXR/IlmImf/ImfAcesFile.h +++ b/OpenEXR/IlmImf/ImfAcesFile.h @@ -236,8 +236,8 @@ class AcesOutputFile AcesOutputFile (const AcesOutputFile &) = delete; AcesOutputFile & operator = (const AcesOutputFile &) = delete; - AcesOutputFile (const AcesOutputFile &&) = delete; - AcesOutputFile & operator = (const AcesOutputFile &&) = delete; + AcesOutputFile (AcesOutputFile &&) = delete; + AcesOutputFile & operator = (AcesOutputFile &&) = delete; class Data; @@ -347,8 +347,8 @@ class AcesInputFile AcesInputFile (const AcesInputFile &) = delete; AcesInputFile & operator = (const AcesInputFile &) = delete; - AcesInputFile (const AcesInputFile &&) = delete; - AcesInputFile & operator = (const AcesInputFile &&) = delete; + AcesInputFile (AcesInputFile &&) = delete; + AcesInputFile & operator = (AcesInputFile &&) = delete; class Data; diff --git a/OpenEXR/IlmImf/ImfArray.h b/OpenEXR/IlmImf/ImfArray.h index db65cad690..d56fc97839 100644 --- a/OpenEXR/IlmImf/ImfArray.h +++ b/OpenEXR/IlmImf/ImfArray.h @@ -122,8 +122,8 @@ class Array Array (const Array &) = delete; Array & operator = (const Array &) = delete; - Array (const Array &&) = delete; - Array & operator = (const Array &&) = delete; + Array (Array &&) = delete; + Array & operator = (Array &&) = delete; long _size; T * _data; @@ -180,8 +180,8 @@ class Array2D Array2D (const Array2D &) = delete; Array2D & operator = (const Array2D &) = delete; - Array2D (const Array2D &&) = delete; - Array2D & operator = (const Array2D &&) = delete; + Array2D (Array2D &&) = delete; + Array2D & operator = (Array2D &&) = delete; long _sizeX; long _sizeY; diff --git a/OpenEXR/IlmImf/ImfAutoArray.h b/OpenEXR/IlmImf/ImfAutoArray.h index 493f067a3d..4a275dcefe 100644 --- a/OpenEXR/IlmImf/ImfAutoArray.h +++ b/OpenEXR/IlmImf/ImfAutoArray.h @@ -63,8 +63,8 @@ OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_ENTER AutoArray (const AutoArray& other) = delete; AutoArray& operator = (const AutoArray& other) = delete; - AutoArray (const AutoArray&& other) = delete; - AutoArray& operator = (const AutoArray&& other) = delete; + AutoArray (AutoArray&& other) = delete; + AutoArray& operator = (AutoArray&& other) = delete; operator T * () {return _data;} operator const T * () const {return _data;} diff --git a/OpenEXR/IlmImf/ImfB44Compressor.h b/OpenEXR/IlmImf/ImfB44Compressor.h index fcf34bd187..13619b104c 100644 --- a/OpenEXR/IlmImf/ImfB44Compressor.h +++ b/OpenEXR/IlmImf/ImfB44Compressor.h @@ -65,8 +65,8 @@ class B44Compressor: public Compressor B44Compressor (const B44Compressor& other) = delete; B44Compressor& operator = (const B44Compressor& other) = delete; - B44Compressor (const B44Compressor&& other) = delete; - B44Compressor& operator = (const B44Compressor&& other) = delete; + B44Compressor (B44Compressor&& other) = delete; + B44Compressor& operator = (B44Compressor&& other) = delete; IMF_EXPORT virtual int numScanLines () const; diff --git a/OpenEXR/IlmImf/ImfCompositeDeepScanLine.h b/OpenEXR/IlmImf/ImfCompositeDeepScanLine.h index b1e0531db6..3ed06da409 100644 --- a/OpenEXR/IlmImf/ImfCompositeDeepScanLine.h +++ b/OpenEXR/IlmImf/ImfCompositeDeepScanLine.h @@ -145,8 +145,8 @@ class CompositeDeepScanLine CompositeDeepScanLine(const CompositeDeepScanLine &) = delete; CompositeDeepScanLine & operator=(const CompositeDeepScanLine &) = delete; - CompositeDeepScanLine(const CompositeDeepScanLine &&) = delete; - CompositeDeepScanLine & operator=(const CompositeDeepScanLine &&) = delete; + CompositeDeepScanLine(CompositeDeepScanLine &&) = delete; + CompositeDeepScanLine & operator=(CompositeDeepScanLine &&) = delete; }; OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_EXIT diff --git a/OpenEXR/IlmImf/ImfDeepScanLineInputFile.cpp b/OpenEXR/IlmImf/ImfDeepScanLineInputFile.cpp index 6651957985..b5e56bdaa6 100644 --- a/OpenEXR/IlmImf/ImfDeepScanLineInputFile.cpp +++ b/OpenEXR/IlmImf/ImfDeepScanLineInputFile.cpp @@ -263,8 +263,8 @@ struct DeepScanLineInputFile::Data: public Mutex Data (const Data& data) = delete; Data& operator = (const Data& data) = delete; - Data (const Data&& data) = delete; - Data& operator = (const Data&& data) = delete; + Data (Data&& data) = delete; + Data& operator = (Data&& data) = delete; inline LineBuffer * getLineBuffer (int number); // hash function from line // buffer indices into our diff --git a/OpenEXR/IlmImf/ImfDeepScanLineInputFile.h b/OpenEXR/IlmImf/ImfDeepScanLineInputFile.h index 03ad1ef524..1ccf4ac716 100644 --- a/OpenEXR/IlmImf/ImfDeepScanLineInputFile.h +++ b/OpenEXR/IlmImf/ImfDeepScanLineInputFile.h @@ -71,8 +71,8 @@ class DeepScanLineInputFile : public GenericInputFile DeepScanLineInputFile (const DeepScanLineInputFile& other) = delete; DeepScanLineInputFile& operator = (const DeepScanLineInputFile& other) = delete; - DeepScanLineInputFile (const DeepScanLineInputFile&& other) = delete; - DeepScanLineInputFile& operator = (const DeepScanLineInputFile&& other) = delete; + DeepScanLineInputFile (DeepScanLineInputFile&& other) = delete; + DeepScanLineInputFile& operator = (DeepScanLineInputFile&& other) = delete; //----------------------------------------- // Destructor -- deallocates internal data diff --git a/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.cpp b/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.cpp index 3dbe7449be..6e302440ba 100644 --- a/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.cpp +++ b/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.cpp @@ -236,8 +236,8 @@ struct DeepScanLineOutputFile::Data Data (const Data& other) = delete; Data& operator = (const Data& other) = delete; - Data (const Data&& other) = delete; - Data& operator = (const Data&& other) = delete; + Data (Data&& other) = delete; + Data& operator = (Data&& other) = delete; inline LineBuffer * getLineBuffer (int number);// hash function from line // buffer indices into our diff --git a/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.h b/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.h index ebac5eca94..3c1ecc175a 100644 --- a/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.h +++ b/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.h @@ -240,8 +240,8 @@ class DeepScanLineOutputFile : public GenericOutputFile DeepScanLineOutputFile (const DeepScanLineOutputFile &) = delete; DeepScanLineOutputFile & operator = (const DeepScanLineOutputFile &) = delete; - DeepScanLineOutputFile (const DeepScanLineOutputFile &&) = delete; - DeepScanLineOutputFile & operator = (const DeepScanLineOutputFile &&) = delete; + DeepScanLineOutputFile (DeepScanLineOutputFile &&) = delete; + DeepScanLineOutputFile & operator = (DeepScanLineOutputFile &&) = delete; void initialize (const Header &header); void initializeLineBuffer(); diff --git a/OpenEXR/IlmImf/ImfDeepTiledInputFile.cpp b/OpenEXR/IlmImf/ImfDeepTiledInputFile.cpp index 639ece85de..835b03cd81 100644 --- a/OpenEXR/IlmImf/ImfDeepTiledInputFile.cpp +++ b/OpenEXR/IlmImf/ImfDeepTiledInputFile.cpp @@ -268,8 +268,8 @@ struct DeepTiledInputFile::Data: public Mutex Data (const Data& other) = delete; Data& operator = (const Data& other) = delete; - Data (const Data&& other) = delete; - Data& operator = (const Data&& other) = delete; + Data (Data&& other) = delete; + Data& operator = (Data&& other) = delete; inline TileBuffer * getTileBuffer (int number); // hash function from tile indices diff --git a/OpenEXR/IlmImf/ImfDeepTiledInputFile.h b/OpenEXR/IlmImf/ImfDeepTiledInputFile.h index 2651f7aa96..f7f136235e 100644 --- a/OpenEXR/IlmImf/ImfDeepTiledInputFile.h +++ b/OpenEXR/IlmImf/ImfDeepTiledInputFile.h @@ -442,8 +442,8 @@ class DeepTiledInputFile : public GenericInputFile DeepTiledInputFile (const DeepTiledInputFile &) = delete; DeepTiledInputFile & operator = (const DeepTiledInputFile &) = delete; - DeepTiledInputFile (const DeepTiledInputFile &&) = delete; - DeepTiledInputFile & operator = (const DeepTiledInputFile &&) = delete; + DeepTiledInputFile (DeepTiledInputFile &&) = delete; + DeepTiledInputFile & operator = (DeepTiledInputFile &&) = delete; DeepTiledInputFile (const Header &header, OPENEXR_IMF_INTERNAL_NAMESPACE::IStream *is, int version, int numThreads); diff --git a/OpenEXR/IlmImf/ImfDeepTiledOutputFile.cpp b/OpenEXR/IlmImf/ImfDeepTiledOutputFile.cpp index 0063c1c3a2..9654e3116e 100644 --- a/OpenEXR/IlmImf/ImfDeepTiledOutputFile.cpp +++ b/OpenEXR/IlmImf/ImfDeepTiledOutputFile.cpp @@ -205,8 +205,8 @@ struct BufferedTile BufferedTile (const BufferedTile& other) = delete; BufferedTile& operator = (const BufferedTile& other) = delete; - BufferedTile (const BufferedTile&& other) = delete; - BufferedTile& operator = (const BufferedTile&& other) = delete; + BufferedTile (BufferedTile&& other) = delete; + BufferedTile& operator = (BufferedTile&& other) = delete; }; @@ -318,8 +318,8 @@ struct DeepTiledOutputFile::Data Data (const Data& other) = delete; Data& operator = (const Data& other) = delete; - Data (const Data&& other) = delete; - Data& operator = (const Data&& other) = delete; + Data (Data&& other) = delete; + Data& operator = (Data&& other) = delete; inline TileBuffer * getTileBuffer (int number); // hash function from tile diff --git a/OpenEXR/IlmImf/ImfDeepTiledOutputFile.h b/OpenEXR/IlmImf/ImfDeepTiledOutputFile.h index 2675432860..c119e33933 100644 --- a/OpenEXR/IlmImf/ImfDeepTiledOutputFile.h +++ b/OpenEXR/IlmImf/ImfDeepTiledOutputFile.h @@ -484,8 +484,8 @@ class DeepTiledOutputFile : public GenericOutputFile DeepTiledOutputFile (const DeepTiledOutputFile &) = delete; DeepTiledOutputFile & operator = (const DeepTiledOutputFile &) = delete; - DeepTiledOutputFile (const DeepTiledOutputFile &&) = delete; - DeepTiledOutputFile & operator = (const DeepTiledOutputFile &&) = delete; + DeepTiledOutputFile (DeepTiledOutputFile &&) = delete; + DeepTiledOutputFile & operator = (DeepTiledOutputFile &&) = delete; void initialize (const Header &header); diff --git a/OpenEXR/IlmImf/ImfDwaCompressor.h b/OpenEXR/IlmImf/ImfDwaCompressor.h index 15f1b3d0cc..04550a1dac 100644 --- a/OpenEXR/IlmImf/ImfDwaCompressor.h +++ b/OpenEXR/IlmImf/ImfDwaCompressor.h @@ -73,8 +73,8 @@ class DwaCompressor: public Compressor DwaCompressor (const DwaCompressor& other) = delete; DwaCompressor& operator = (const DwaCompressor& other) = delete; - DwaCompressor (const DwaCompressor&& other) = delete; - DwaCompressor& operator = (const DwaCompressor&& other) = delete; + DwaCompressor (DwaCompressor&& other) = delete; + DwaCompressor& operator = (DwaCompressor&& other) = delete; IMF_EXPORT virtual int numScanLines () const; diff --git a/OpenEXR/IlmImf/ImfFastHuf.h b/OpenEXR/IlmImf/ImfFastHuf.h index 95ba918ec0..4c9a599bfe 100644 --- a/OpenEXR/IlmImf/ImfFastHuf.h +++ b/OpenEXR/IlmImf/ImfFastHuf.h @@ -94,8 +94,8 @@ class FastHufDecoder FastHufDecoder (const FastHufDecoder& other) = delete; FastHufDecoder& operator = (const FastHufDecoder& other) = delete; - FastHufDecoder (const FastHufDecoder&& other) = delete; - FastHufDecoder& operator = (const FastHufDecoder&& other) = delete; + FastHufDecoder (FastHufDecoder&& other) = delete; + FastHufDecoder& operator = (FastHufDecoder&& other) = delete; IMF_EXPORT static bool enabled (); diff --git a/OpenEXR/IlmImf/ImfInputFile.cpp b/OpenEXR/IlmImf/ImfInputFile.cpp index 305efed0f8..106cb6ecbc 100644 --- a/OpenEXR/IlmImf/ImfInputFile.cpp +++ b/OpenEXR/IlmImf/ImfInputFile.cpp @@ -114,8 +114,8 @@ struct InputFile::Data : public Mutex Data (const Data& other) = delete; Data& operator = (const Data& other) = delete; - Data (const Data&& other) = delete; - Data& operator = (const Data&& other) = delete; + Data (Data&& other) = delete; + Data& operator = (Data&& other) = delete; void deleteCachedBuffer(); }; diff --git a/OpenEXR/IlmImf/ImfInputFile.h b/OpenEXR/IlmImf/ImfInputFile.h index 28936f3f07..f2bd11fcb1 100644 --- a/OpenEXR/IlmImf/ImfInputFile.h +++ b/OpenEXR/IlmImf/ImfInputFile.h @@ -259,8 +259,8 @@ class InputFile : public GenericInputFile InputFile (const InputFile &) = delete; InputFile & operator = (const InputFile &) = delete; - InputFile (const InputFile &&) = delete; - InputFile & operator = (const InputFile &&) = delete; + InputFile (InputFile &&) = delete; + InputFile & operator = (InputFile &&) = delete; void initialize (); void multiPartInitialize(InputPartData* part); diff --git a/OpenEXR/IlmImf/ImfMultiPartInputFile.cpp b/OpenEXR/IlmImf/ImfMultiPartInputFile.cpp index d00a85cd06..0c574fa84c 100644 --- a/OpenEXR/IlmImf/ImfMultiPartInputFile.cpp +++ b/OpenEXR/IlmImf/ImfMultiPartInputFile.cpp @@ -120,8 +120,8 @@ struct MultiPartInputFile::Data: public InputStreamMutex Data (const Data& other) = delete; Data& operator = (const Data& other) = delete; - Data (const Data&& other) = delete; - Data& operator = (const Data&& other) = delete; + Data (Data&& other) = delete; + Data& operator = (Data&& other) = delete; template T* createInputPartT(int partNumber) diff --git a/OpenEXR/IlmImf/ImfMultiPartInputFile.h b/OpenEXR/IlmImf/ImfMultiPartInputFile.h index 0ce9b1799a..f3651d9ee0 100644 --- a/OpenEXR/IlmImf/ImfMultiPartInputFile.h +++ b/OpenEXR/IlmImf/ImfMultiPartInputFile.h @@ -99,8 +99,8 @@ class MultiPartInputFile : public GenericInputFile MultiPartInputFile(const MultiPartInputFile &) = delete; MultiPartInputFile& operator = (const MultiPartInputFile &) = delete; - MultiPartInputFile(const MultiPartInputFile &&) = delete; - MultiPartInputFile& operator = (const MultiPartInputFile &&) = delete; + MultiPartInputFile(MultiPartInputFile &&) = delete; + MultiPartInputFile& operator = (MultiPartInputFile &&) = delete; // diff --git a/OpenEXR/IlmImf/ImfMultiPartOutputFile.cpp b/OpenEXR/IlmImf/ImfMultiPartOutputFile.cpp index fc0543b64c..89501c4068 100644 --- a/OpenEXR/IlmImf/ImfMultiPartOutputFile.cpp +++ b/OpenEXR/IlmImf/ImfMultiPartOutputFile.cpp @@ -127,8 +127,8 @@ struct MultiPartOutputFile::Data: public OutputStreamMutex Data (const Data& other) = delete; Data& operator = (const Data& other) = delete; - Data (const Data&& other) = delete; - Data& operator = (const Data&& other) = delete; + Data (Data&& other) = delete; + Data& operator = (Data&& other) = delete; }; diff --git a/OpenEXR/IlmImf/ImfMultiPartOutputFile.h b/OpenEXR/IlmImf/ImfMultiPartOutputFile.h index 4d0dc5c206..b74f9cb6f1 100644 --- a/OpenEXR/IlmImf/ImfMultiPartOutputFile.h +++ b/OpenEXR/IlmImf/ImfMultiPartOutputFile.h @@ -102,8 +102,8 @@ class MultiPartOutputFile : public GenericOutputFile MultiPartOutputFile(const MultiPartOutputFile& other) = delete; MultiPartOutputFile& operator = (const MultiPartOutputFile& other) = delete; - MultiPartOutputFile(const MultiPartOutputFile&& other) = delete; - MultiPartOutputFile& operator = (const MultiPartOutputFile&& other) = delete; + MultiPartOutputFile(MultiPartOutputFile&& other) = delete; + MultiPartOutputFile& operator = (MultiPartOutputFile&& other) = delete; struct Data; diff --git a/OpenEXR/IlmImf/ImfOutputFile.cpp b/OpenEXR/IlmImf/ImfOutputFile.cpp index 196ddc0448..d0e34988ee 100644 --- a/OpenEXR/IlmImf/ImfOutputFile.cpp +++ b/OpenEXR/IlmImf/ImfOutputFile.cpp @@ -214,8 +214,8 @@ struct OutputFile::Data Data (const Data& other) = delete; Data& operator = (const Data& other) = delete; - Data (const Data&& other) = delete; - Data& operator = (const Data&& other) = delete; + Data (Data&& other) = delete; + Data& operator = (Data&& other) = delete; inline LineBuffer * getLineBuffer (int number); // hash function from line // buffer indices into our diff --git a/OpenEXR/IlmImf/ImfOutputFile.h b/OpenEXR/IlmImf/ImfOutputFile.h index 24a2529cf7..d928594960 100644 --- a/OpenEXR/IlmImf/ImfOutputFile.h +++ b/OpenEXR/IlmImf/ImfOutputFile.h @@ -259,8 +259,8 @@ class OutputFile : public GenericOutputFile OutputFile (const OutputFile &) = delete; OutputFile & operator = (const OutputFile &) = delete; - OutputFile (const OutputFile &&) = delete; - OutputFile & operator = (const OutputFile &&) = delete; + OutputFile (OutputFile &&) = delete; + OutputFile & operator = (OutputFile &&) = delete; void initialize (const Header &header); diff --git a/OpenEXR/IlmImf/ImfPizCompressor.h b/OpenEXR/IlmImf/ImfPizCompressor.h index 26988e53c0..13c9c5eab7 100644 --- a/OpenEXR/IlmImf/ImfPizCompressor.h +++ b/OpenEXR/IlmImf/ImfPizCompressor.h @@ -65,8 +65,8 @@ class PizCompressor: public Compressor PizCompressor (const PizCompressor& other) = delete; PizCompressor& operator = (const PizCompressor& other) = delete; - PizCompressor (const PizCompressor&& other) = delete; - PizCompressor& operator = (const PizCompressor&& other) = delete; + PizCompressor (PizCompressor&& other) = delete; + PizCompressor& operator = (PizCompressor&& other) = delete; IMF_EXPORT virtual int numScanLines () const; diff --git a/OpenEXR/IlmImf/ImfPxr24Compressor.h b/OpenEXR/IlmImf/ImfPxr24Compressor.h index 0f6020d2d2..2c79c45962 100644 --- a/OpenEXR/IlmImf/ImfPxr24Compressor.h +++ b/OpenEXR/IlmImf/ImfPxr24Compressor.h @@ -62,8 +62,8 @@ class Pxr24Compressor: public Compressor Pxr24Compressor (const Pxr24Compressor& other) = delete; Pxr24Compressor& operator = (const Pxr24Compressor& other) = delete; - Pxr24Compressor (const Pxr24Compressor&& other) = delete; - Pxr24Compressor& operator = (const Pxr24Compressor&& other) = delete; + Pxr24Compressor (Pxr24Compressor&& other) = delete; + Pxr24Compressor& operator = (Pxr24Compressor&& other) = delete; IMF_EXPORT virtual int numScanLines () const; diff --git a/OpenEXR/IlmImf/ImfRgbaFile.cpp b/OpenEXR/IlmImf/ImfRgbaFile.cpp index 43830bf749..1b7c8670aa 100644 --- a/OpenEXR/IlmImf/ImfRgbaFile.cpp +++ b/OpenEXR/IlmImf/ImfRgbaFile.cpp @@ -198,8 +198,8 @@ class RgbaOutputFile::ToYca: public Mutex ToYca (const ToYca& other) = delete; ToYca& operator = (const ToYca& other) = delete; - ToYca (const ToYca&& other) = delete; - ToYca& operator = (const ToYca&& other) = delete; + ToYca (ToYca&& other) = delete; + ToYca& operator = (ToYca&& other) = delete; void setYCRounding (unsigned int roundY, unsigned int roundC); @@ -819,8 +819,8 @@ class RgbaInputFile::FromYca: public Mutex FromYca (const FromYca& other) = delete; FromYca& operator = (const FromYca& other) = delete; - FromYca (const FromYca&& other) = delete; - FromYca& operator = (const FromYca&& other) = delete; + FromYca (FromYca&& other) = delete; + FromYca& operator = (FromYca&& other) = delete; void setFrameBuffer (Rgba *base, size_t xStride, diff --git a/OpenEXR/IlmImf/ImfRgbaFile.h b/OpenEXR/IlmImf/ImfRgbaFile.h index e588f8ece9..3e16716b58 100644 --- a/OpenEXR/IlmImf/ImfRgbaFile.h +++ b/OpenEXR/IlmImf/ImfRgbaFile.h @@ -293,8 +293,8 @@ class RgbaOutputFile RgbaOutputFile (const RgbaOutputFile &) = delete; RgbaOutputFile & operator = (const RgbaOutputFile &) = delete; - RgbaOutputFile (const RgbaOutputFile &&) = delete; - RgbaOutputFile & operator = (const RgbaOutputFile &&) = delete; + RgbaOutputFile (RgbaOutputFile &&) = delete; + RgbaOutputFile & operator = (RgbaOutputFile &&) = delete; class ToYca; @@ -432,8 +432,8 @@ class RgbaInputFile RgbaInputFile (const RgbaInputFile &) = delete; RgbaInputFile & operator = (const RgbaInputFile &) = delete; - RgbaInputFile (const RgbaInputFile &&) = delete; - RgbaInputFile & operator = (const RgbaInputFile &&) = delete; + RgbaInputFile (RgbaInputFile &&) = delete; + RgbaInputFile & operator = (RgbaInputFile &&) = delete; class FromYca; diff --git a/OpenEXR/IlmImf/ImfRleCompressor.h b/OpenEXR/IlmImf/ImfRleCompressor.h index ed2231f900..e0118db0cf 100644 --- a/OpenEXR/IlmImf/ImfRleCompressor.h +++ b/OpenEXR/IlmImf/ImfRleCompressor.h @@ -60,8 +60,8 @@ class RleCompressor: public Compressor RleCompressor (const RleCompressor& other) = delete; RleCompressor& operator = (const RleCompressor& other) = delete; - RleCompressor (const RleCompressor&& other) = delete; - RleCompressor& operator = (const RleCompressor&& other) = delete; + RleCompressor (RleCompressor&& other) = delete; + RleCompressor& operator = (RleCompressor&& other) = delete; IMF_EXPORT virtual int numScanLines () const; diff --git a/OpenEXR/IlmImf/ImfScanLineInputFile.cpp b/OpenEXR/IlmImf/ImfScanLineInputFile.cpp index 6d2d39c992..c4e95d0960 100644 --- a/OpenEXR/IlmImf/ImfScanLineInputFile.cpp +++ b/OpenEXR/IlmImf/ImfScanLineInputFile.cpp @@ -152,8 +152,8 @@ struct LineBuffer LineBuffer (const LineBuffer& other) = delete; LineBuffer& operator = (const LineBuffer& other) = delete; - LineBuffer (const LineBuffer&& other) = delete; - LineBuffer& operator = (const LineBuffer&& other) = delete; + LineBuffer (LineBuffer&& other) = delete; + LineBuffer& operator = (LineBuffer&& other) = delete; inline void wait () {_sem.wait();} inline void post () {_sem.post();} @@ -246,8 +246,8 @@ struct ScanLineInputFile::Data: public Mutex Data (const Data& other) = delete; Data& operator = (const Data& other) = delete; - Data (const Data&& other) = delete; - Data& operator = (const Data&& other) = delete; + Data (Data&& other) = delete; + Data& operator = (Data&& other) = delete; inline LineBuffer * getLineBuffer (int number); // hash function from line // buffer indices into our diff --git a/OpenEXR/IlmImf/ImfScanLineInputFile.h b/OpenEXR/IlmImf/ImfScanLineInputFile.h index a02edbbab9..85242657ed 100644 --- a/OpenEXR/IlmImf/ImfScanLineInputFile.h +++ b/OpenEXR/IlmImf/ImfScanLineInputFile.h @@ -77,8 +77,8 @@ class ScanLineInputFile : public GenericInputFile ScanLineInputFile (const ScanLineInputFile& other) = delete; ScanLineInputFile& operator = (const ScanLineInputFile& other) = delete; - ScanLineInputFile (const ScanLineInputFile&& other) = delete; - ScanLineInputFile& operator = (const ScanLineInputFile&& other) = delete; + ScanLineInputFile (ScanLineInputFile&& other) = delete; + ScanLineInputFile& operator = (ScanLineInputFile&& other) = delete; //------------------------ diff --git a/OpenEXR/IlmImf/ImfTiledInputFile.cpp b/OpenEXR/IlmImf/ImfTiledInputFile.cpp index c2b8931399..e68f713bd1 100644 --- a/OpenEXR/IlmImf/ImfTiledInputFile.cpp +++ b/OpenEXR/IlmImf/ImfTiledInputFile.cpp @@ -151,8 +151,8 @@ struct TileBuffer TileBuffer (const TileBuffer& other) = delete; TileBuffer& operator = (const TileBuffer& other) = delete; - TileBuffer (const TileBuffer&& other) = delete; - TileBuffer& operator = (const TileBuffer&& other) = delete; + TileBuffer (TileBuffer&& other) = delete; + TileBuffer& operator = (TileBuffer&& other) = delete; inline void wait () {_sem.wait();} inline void post () {_sem.post();} @@ -250,8 +250,8 @@ struct TiledInputFile::Data: public Mutex Data (const Data& other) = delete; Data& operator = (const Data& other) = delete; - Data (const Data&& other) = delete; - Data& operator = (const Data&& other) = delete; + Data (Data&& other) = delete; + Data& operator = (Data&& other) = delete; inline TileBuffer * getTileBuffer (int number); // hash function from tile indices diff --git a/OpenEXR/IlmImf/ImfTiledInputFile.h b/OpenEXR/IlmImf/ImfTiledInputFile.h index 73d4c4cbf5..f919df40d9 100644 --- a/OpenEXR/IlmImf/ImfTiledInputFile.h +++ b/OpenEXR/IlmImf/ImfTiledInputFile.h @@ -95,8 +95,8 @@ class TiledInputFile : public GenericInputFile TiledInputFile (const TiledInputFile& other) = delete; TiledInputFile& operator = (const TiledInputFile& other) = delete; - TiledInputFile (const TiledInputFile&& other) = delete; - TiledInputFile& operator = (const TiledInputFile&& other) = delete; + TiledInputFile (TiledInputFile&& other) = delete; + TiledInputFile& operator = (TiledInputFile&& other) = delete; //------------------------ diff --git a/OpenEXR/IlmImf/ImfTiledOutputFile.cpp b/OpenEXR/IlmImf/ImfTiledOutputFile.cpp index 638ede1bf6..0f24381eaa 100644 --- a/OpenEXR/IlmImf/ImfTiledOutputFile.cpp +++ b/OpenEXR/IlmImf/ImfTiledOutputFile.cpp @@ -190,8 +190,8 @@ struct BufferedTile BufferedTile (const BufferedTile& other) = delete; BufferedTile& operator = (const BufferedTile& other) = delete; - BufferedTile (const BufferedTile&& other) = delete; - BufferedTile& operator = (const BufferedTile&& other) = delete; + BufferedTile (BufferedTile&& other) = delete; + BufferedTile& operator = (BufferedTile&& other) = delete; }; @@ -285,8 +285,8 @@ struct TiledOutputFile::Data Data (const Data& other) = delete; Data& operator = (const Data& other) = delete; - Data (const Data&& other) = delete; - Data& operator = (const Data&& other) = delete; + Data (Data&& other) = delete; + Data& operator = (Data&& other) = delete; inline TileBuffer * getTileBuffer (int number); // hash function from tile diff --git a/OpenEXR/IlmImf/ImfTiledOutputFile.h b/OpenEXR/IlmImf/ImfTiledOutputFile.h index 7d846f9b7b..87164311bd 100644 --- a/OpenEXR/IlmImf/ImfTiledOutputFile.h +++ b/OpenEXR/IlmImf/ImfTiledOutputFile.h @@ -505,8 +505,8 @@ class TiledOutputFile : public GenericOutputFile TiledOutputFile (const TiledOutputFile &) = delete; TiledOutputFile & operator = (const TiledOutputFile &) = delete; - TiledOutputFile (const TiledOutputFile &&) = delete; - TiledOutputFile & operator = (const TiledOutputFile &&) = delete; + TiledOutputFile (TiledOutputFile &&) = delete; + TiledOutputFile & operator = (TiledOutputFile &&) = delete; void initialize (const Header &header); diff --git a/OpenEXR/IlmImf/ImfTiledRgbaFile.h b/OpenEXR/IlmImf/ImfTiledRgbaFile.h index a1af19c7a6..2be943c58e 100644 --- a/OpenEXR/IlmImf/ImfTiledRgbaFile.h +++ b/OpenEXR/IlmImf/ImfTiledRgbaFile.h @@ -318,8 +318,8 @@ class TiledRgbaOutputFile TiledRgbaOutputFile (const TiledRgbaOutputFile &) = delete; TiledRgbaOutputFile & operator = (const TiledRgbaOutputFile &) = delete; - TiledRgbaOutputFile (const TiledRgbaOutputFile &&) = delete; - TiledRgbaOutputFile & operator = (const TiledRgbaOutputFile &&) = delete; + TiledRgbaOutputFile (TiledRgbaOutputFile &&) = delete; + TiledRgbaOutputFile & operator = (TiledRgbaOutputFile &&) = delete; class ToYa; @@ -543,8 +543,8 @@ class TiledRgbaInputFile TiledRgbaInputFile (const TiledRgbaInputFile &) = delete; TiledRgbaInputFile & operator = (const TiledRgbaInputFile &) = delete; - TiledRgbaInputFile (const TiledRgbaInputFile &&) = delete; - TiledRgbaInputFile & operator = (const TiledRgbaInputFile &&) = delete; + TiledRgbaInputFile (TiledRgbaInputFile &&) = delete; + TiledRgbaInputFile & operator = (TiledRgbaInputFile &&) = delete; class FromYa; diff --git a/OpenEXR/IlmImf/ImfZip.h b/OpenEXR/IlmImf/ImfZip.h index d1c6361b63..839d68a5dc 100644 --- a/OpenEXR/IlmImf/ImfZip.h +++ b/OpenEXR/IlmImf/ImfZip.h @@ -55,8 +55,8 @@ class Zip Zip (const Zip& other) = delete; Zip& operator = (const Zip& other) = delete; - Zip (const Zip&& other) = delete; - Zip& operator = (const Zip&& other) = delete; + Zip (Zip&& other) = delete; + Zip& operator = (Zip&& other) = delete; IMF_EXPORT size_t maxRawSize(); diff --git a/OpenEXR/IlmImf/dwaLookups.cpp b/OpenEXR/IlmImf/dwaLookups.cpp index 210cbe872d..8afeb7d0f5 100644 --- a/OpenEXR/IlmImf/dwaLookups.cpp +++ b/OpenEXR/IlmImf/dwaLookups.cpp @@ -110,8 +110,8 @@ namespace { LutHeaderWorker(const LutHeaderWorker& other) = delete; LutHeaderWorker& operator = (const LutHeaderWorker& other) = delete; - LutHeaderWorker(const LutHeaderWorker&& other) = delete; - LutHeaderWorker& operator = (const LutHeaderWorker&& other) = delete; + LutHeaderWorker(LutHeaderWorker&& other) = delete; + LutHeaderWorker& operator = (LutHeaderWorker&& other) = delete; ~LutHeaderWorker() { diff --git a/OpenEXR/IlmImfUtil/ImfDeepImageChannel.h b/OpenEXR/IlmImfUtil/ImfDeepImageChannel.h index 566a9a8967..fdb0706258 100644 --- a/OpenEXR/IlmImfUtil/ImfDeepImageChannel.h +++ b/OpenEXR/IlmImfUtil/ImfDeepImageChannel.h @@ -105,8 +105,8 @@ class DeepImageChannel: public ImageChannel DeepImageChannel (const DeepImageChannel& other) = delete; DeepImageChannel& operator = (const DeepImageChannel& other) = delete; - DeepImageChannel (const DeepImageChannel&& other) = delete; - DeepImageChannel& operator = (const DeepImageChannel&& other) = delete; + DeepImageChannel (DeepImageChannel&& other) = delete; + DeepImageChannel& operator = (DeepImageChannel&& other) = delete; virtual void setSamplesToZero (size_t i, @@ -197,8 +197,8 @@ class TypedDeepImageChannel: public DeepImageChannel TypedDeepImageChannel (const TypedDeepImageChannel& other) = delete; TypedDeepImageChannel& operator = (const TypedDeepImageChannel& other) = delete; - TypedDeepImageChannel (const TypedDeepImageChannel&& other) = delete; - TypedDeepImageChannel& operator = (const TypedDeepImageChannel&& other) = delete; + TypedDeepImageChannel (TypedDeepImageChannel&& other) = delete; + TypedDeepImageChannel& operator = (TypedDeepImageChannel&& other) = delete; virtual void setSamplesToZero (size_t i, diff --git a/OpenEXR/IlmImfUtil/ImfFlatImageChannel.h b/OpenEXR/IlmImfUtil/ImfFlatImageChannel.h index f8001e2aab..1b0190e9d0 100644 --- a/OpenEXR/IlmImfUtil/ImfFlatImageChannel.h +++ b/OpenEXR/IlmImfUtil/ImfFlatImageChannel.h @@ -104,8 +104,8 @@ class FlatImageChannel: public ImageChannel FlatImageChannel (const FlatImageChannel& other) = delete; FlatImageChannel& operator = (const FlatImageChannel& other) = delete; - FlatImageChannel (const FlatImageChannel&& other) = delete; - FlatImageChannel& operator = (const FlatImageChannel&& other) = delete; + FlatImageChannel (FlatImageChannel&& other) = delete; + FlatImageChannel& operator = (FlatImageChannel&& other) = delete; IMFUTIL_EXPORT virtual void resize (); @@ -181,8 +181,8 @@ class TypedFlatImageChannel: public FlatImageChannel TypedFlatImageChannel (const TypedFlatImageChannel& other) = delete; TypedFlatImageChannel& operator = (const TypedFlatImageChannel& other) = delete; - TypedFlatImageChannel (const TypedFlatImageChannel&& other) = delete; - TypedFlatImageChannel& operator = (const TypedFlatImageChannel&& other) = delete; + TypedFlatImageChannel (TypedFlatImageChannel&& other) = delete; + TypedFlatImageChannel& operator = (TypedFlatImageChannel&& other) = delete; virtual void resize (); diff --git a/OpenEXR/IlmImfUtil/ImfSampleCountChannel.h b/OpenEXR/IlmImfUtil/ImfSampleCountChannel.h index 8c47fa4400..8e8086c6ba 100644 --- a/OpenEXR/IlmImfUtil/ImfSampleCountChannel.h +++ b/OpenEXR/IlmImfUtil/ImfSampleCountChannel.h @@ -226,8 +226,8 @@ class SampleCountChannel : public ImageChannel Edit (const Edit& other) = delete; Edit& operator = (const Edit& other) = delete; - Edit (const Edit&& other) = delete; - Edit& operator = (const Edit&& other) = delete; + Edit (Edit&& other) = delete; + Edit& operator = (Edit&& other) = delete; // // Access to the writable sample count array. diff --git a/OpenEXR/exrmaketiled/Image.h b/OpenEXR/exrmaketiled/Image.h index b5154c0a93..7b5160ac4e 100644 --- a/OpenEXR/exrmaketiled/Image.h +++ b/OpenEXR/exrmaketiled/Image.h @@ -116,8 +116,8 @@ class Image Image (const Image& other) = delete; Image & operator = (const Image& other) = delete; - Image (const Image&& other) = delete; - Image & operator = (const Image&& other) = delete; + Image (Image&& other) = delete; + Image & operator = (Image&& other) = delete; const IMATH_NAMESPACE::Box2i & dataWindow () const; void resize (const IMATH_NAMESPACE::Box2i &dataWindow); diff --git a/OpenEXR/exrmultiview/Image.h b/OpenEXR/exrmultiview/Image.h index 03e4296a08..e1af8d1a82 100644 --- a/OpenEXR/exrmultiview/Image.h +++ b/OpenEXR/exrmultiview/Image.h @@ -117,8 +117,8 @@ class Image Image (const Image& other) = delete; Image & operator = (const Image& other) = delete; - Image (const Image&& other) = delete; - Image & operator = (const Image&& other) = delete; + Image (Image&& other) = delete; + Image & operator = (Image&& other) = delete; const IMATH_NAMESPACE::Box2i & dataWindow () const; void resize (const IMATH_NAMESPACE::Box2i &dataWindow); diff --git a/PyIlmBase/PyIex/PyIexTypeTranslator.h b/PyIlmBase/PyIex/PyIexTypeTranslator.h index b318dac98c..3270357e41 100644 --- a/PyIlmBase/PyIex/PyIexTypeTranslator.h +++ b/PyIlmBase/PyIex/PyIexTypeTranslator.h @@ -63,8 +63,8 @@ class TypeTranslator TypeTranslator (const TypeTranslator& other) = delete; TypeTranslator& operator = (const TypeTranslator& other) = delete; - TypeTranslator (const TypeTranslator&& other) = delete; - TypeTranslator& operator = (const TypeTranslator&& other) = delete; + TypeTranslator (TypeTranslator&& other) = delete; + TypeTranslator& operator = (TypeTranslator&& other) = delete; PyObject * typeObject (const BaseClass *ptr) const; PyObject * baseTypeObject () const; @@ -88,8 +88,8 @@ class TypeTranslator ClassDesc (const ClassDesc& other) = delete; ClassDesc& operator = (const ClassDesc& other) = delete; - ClassDesc (const ClassDesc&& other) = delete; - ClassDesc& operator = (const ClassDesc&& other) = delete; + ClassDesc (ClassDesc&& other) = delete; + ClassDesc& operator = (ClassDesc&& other) = delete; virtual bool typeMatches (const BaseClass *ptr) const = 0; diff --git a/PyIlmBase/PyImath/PyImathUtil.h b/PyIlmBase/PyImath/PyImathUtil.h index 1e9ffdf582..1149523c94 100644 --- a/PyIlmBase/PyImath/PyImathUtil.h +++ b/PyIlmBase/PyImath/PyImathUtil.h @@ -68,7 +68,7 @@ class PyAcquireLock PYIMATH_EXPORT PyAcquireLock(const PyAcquireLock& other) = delete; PYIMATH_EXPORT PyAcquireLock & operator = (PyAcquireLock& other) = delete; - PYIMATH_EXPORT PyAcquireLock(const PyAcquireLock&& other) = delete; + PYIMATH_EXPORT PyAcquireLock(PyAcquireLock&& other) = delete; PYIMATH_EXPORT PyAcquireLock & operator = (PyAcquireLock&& other) = delete; private: @@ -92,7 +92,7 @@ class PyReleaseLock PYIMATH_EXPORT ~PyReleaseLock(); PYIMATH_EXPORT PyReleaseLock(const PyReleaseLock& other) = delete; PYIMATH_EXPORT PyReleaseLock & operator = (PyReleaseLock& other) = delete; - PYIMATH_EXPORT PyReleaseLock(const PyReleaseLock&& other) = delete; + PYIMATH_EXPORT PyReleaseLock(PyReleaseLock&& other) = delete; PYIMATH_EXPORT PyReleaseLock & operator = (PyReleaseLock&& other) = delete; private: