Misc classes : Explicitly default copy/assign instead of defining one

Author: danieldresser

include/IECore/InternedString.h

@@ -66,10 +66,13 @@ class IECORE_API InternedString
 
 		inline InternedString();
 		inline InternedString( const std::string &value );
-		inline InternedString( const InternedString &other );
 		inline InternedString( const char *value );
 		inline InternedString( const char *value, size_t length );
 
+		InternedString( const InternedString &other ) = default;
+		InternedString &operator= ( const InternedString &rhs ) = default;
+		~InternedString() = default;
+
 #if BOOST_VERSION > 105500
 
 		inline InternedString( const boost::string_view &value );
@@ -78,8 +81,6 @@ class IECORE_API InternedString
 
 		inline InternedString( int64_t number );
 
-		inline ~InternedString();
-
 		// The equality operators are extremely fast because they
 		// need only compare the address of the internal string,
 		// because it was made unique upon construction.

include/IECore/InternedString.inl

@@ -48,11 +48,6 @@ inline InternedString::InternedString( const std::string &value )
 {
 }
 
-inline InternedString::InternedString( const InternedString &other )
-	:	m_value( other.m_value )
-{
-}
-
 inline InternedString::InternedString( const char *value )
 	:	m_value( internedString( value ) )
 {
@@ -77,10 +72,6 @@ inline InternedString::InternedString( int64_t number )
 {
 }
 
-inline InternedString::~InternedString()
-{
-}
-
 inline bool InternedString::operator != ( const InternedString &other ) const
 {
 	return m_value!=other.m_value;

include/IECore/PathMatcher.h

@@ -68,9 +68,11 @@ class IECORE_API PathMatcher
 		};
 
 		PathMatcher();
-		/// Copy constructor. Uses lazy-copy-on-write so
-		/// that copies are cheap until edited.
-		PathMatcher( const PathMatcher &other );
+		/// We use lazy-copy-on-write so that copies are cheap until edited.
+		/// This means we can use default copy and assignment
+		PathMatcher( const PathMatcher &other ) = default;
+		PathMatcher& operator= ( const PathMatcher &other ) = default;
+		~PathMatcher() = default;
 
 		template<typename PathIterator>
 		PathMatcher( PathIterator pathsBegin, PathIterator pathsEnd );

include/IECore/TransformationMatrix.h

@@ -75,8 +75,10 @@ class IECORE_EXPORT TransformationMatrix
 		/// Basic constructor for setting common parameters: scale, rotate and translate.
 		TransformationMatrix( const Imath::Vec3< T > &s, const Imath::Euler< T > &r, const Imath::Vec3< T > &t );
 
-		/// Copy constructor
-		TransformationMatrix( const TransformationMatrix &cp );
+		/// Copying and assignment just sets all members, so we can use the defaults
+		TransformationMatrix( const TransformationMatrix &cp ) = default;
+		TransformationMatrix & operator= ( const TransformationMatrix &rhs ) = default;
+		~TransformationMatrix() = default;
 
 		/// Returns the transform this object represents.
 		Imath::Matrix44<T> transform( ) const;

include/IECore/TransformationMatrix.inl

@@ -51,14 +51,6 @@ TransformationMatrix<T>::TransformationMatrix( const Imath::Vec3< T > &s, const
 {
 }
 
-template <class T>
-TransformationMatrix<T>::TransformationMatrix( const TransformationMatrix &cp ) :
-		scalePivot( cp.scalePivot ), scale( cp.scale ), shear( cp.shear ), scalePivotTranslation( cp.scalePivotTranslation ),
-						rotatePivot( cp.rotatePivot ), rotationOrientation( cp.rotationOrientation ), rotate( cp.rotate ),
-						rotatePivotTranslation( cp.rotatePivotTranslation ), translate( cp.translate )
-{
-}
-
 template <class T>
 Imath::Matrix44<T> TransformationMatrix<T>::transform( ) const
 {

include/IECoreScene/PolygonIterator.h

@@ -65,7 +65,9 @@ class IECORESCENE_API PolygonIterator
 		inline bool operator==( const PolygonIterator &rhs ) const;
 		inline bool operator!=( const PolygonIterator &rhs ) const;
 
-		inline PolygonIterator &operator=( const PolygonIterator &rhs );
+		PolygonIterator &operator=( const PolygonIterator &rhs ) = default;
+		PolygonIterator( const PolygonIterator &p ) = default;
+		~PolygonIterator() = default;
 
 		/// Returns an iterator to the beginning of the range of vertex interpolated values
 		/// for this polygon. Typically you should pass PrimitiveVariable::data::readable()::begin()

include/IECoreScene/PolygonIterator.inl

@@ -71,14 +71,6 @@ inline bool PolygonIterator::operator!=( const PolygonIterator &rhs ) const
 	return ! operator==( rhs );
 }
 
-inline PolygonIterator &PolygonIterator::operator=( const PolygonIterator &rhs )
-{
-	m_vertexIndexIterator = rhs.m_vertexIndexIterator;
-	m_numVerticesIterator = rhs.m_numVerticesIterator;
-	m_faceVaryingOffset = rhs.m_faceVaryingOffset;
-	return *this;
-}
-
 template<typename ValueIterator>
 PolygonVertexIterator<ValueIterator> PolygonIterator::vertexBegin( ValueIterator valuesBegin ) const
 {

include/IECoreScene/PolygonVertexIterator.h

@@ -71,7 +71,9 @@ class PolygonVertexIterator
 		bool operator==( const PolygonVertexIterator &rhs ) const;
 		bool operator!=( const PolygonVertexIterator &rhs ) const;
 
-		PolygonVertexIterator &operator=( const PolygonVertexIterator &rhs );
+		PolygonVertexIterator &operator=( const PolygonVertexIterator &rhs ) = default;
+		PolygonVertexIterator( const PolygonVertexIterator &p ) = default;
+		~PolygonVertexIterator() = default;
 
 	private :
 

include/IECoreScene/PolygonVertexIterator.inl

@@ -88,14 +88,6 @@ bool PolygonVertexIterator<VertexValueIterator, VertexIndexIterator>::operator!=
 	return ! operator==( rhs );
 }
 
-template<typename VertexValueIterator, typename VertexIndexIterator>
-PolygonVertexIterator<VertexValueIterator, VertexIndexIterator> &PolygonVertexIterator<VertexValueIterator, VertexIndexIterator>::operator=( const PolygonVertexIterator &rhs )
-{
-	m_vertexValuesBegin = rhs.m_vertexValuesBegin;
-	m_vertexIndexIterator = rhs.m_vertexIndexIterator;
-	return *this;
-}
-
 } // namespace IECoreScene
 
 #endif // IECORESCENE_POLYGONVERTEXITERATOR_INL

include/IECoreScene/PrimitiveVariable.h

@@ -72,8 +72,11 @@ struct IECORESCENE_API PrimitiveVariable
 	PrimitiveVariable( Interpolation i, IECore::DataPtr d );
 	/// Constructor - Data is not copied but referenced directly.
 	PrimitiveVariable( Interpolation i, IECore::DataPtr d, IECore::IntVectorDataPtr indices );
-	/// Shallow copy constructor - data is not copied just rereferenced
-	PrimitiveVariable( const PrimitiveVariable &other );
+	/// It's OK to make shallow copies where the data is not copied just rereferenced,
+	/// so we can use default copy and assignment
+	PrimitiveVariable( const PrimitiveVariable &other ) = default;
+	PrimitiveVariable & operator= ( const PrimitiveVariable &rhs ) = default;
+	~PrimitiveVariable() = default;
 
 	/// Copy constructor which optionally allows a deep copy of data
 	/// to be taken.