TypedData : Add move constructors

Author: danieldresser-ie

Changes

@@ -10,6 +10,7 @@ Improvements
   - Improved performance when reading materials from instanced prims.
   - Added loading of `UsdGeomCube` prims (as MeshPrimitives).
 - SceneInterface : Added `_copy` argument to Python bindings for `readAttribute()`, `readTransform()` and `readObject()`. Pass `_copy = False` to receive the original constant result directly instead of a mutable copy. Use with care (typically only for debugging and testing)!
+- TypedData : Added move constructors.
 
 Fixes
 -----

include/IECore/GeometricTypedData.h

@@ -83,6 +83,8 @@ class IECORE_EXPORT GeometricTypedData : public TypedData<T>
 		GeometricTypedData();
 		GeometricTypedData( const ValueType &data );
 		GeometricTypedData( const ValueType &data, GeometricData::Interpretation interpretation );
+		GeometricTypedData( ValueType &&data );
+		GeometricTypedData( ValueType &&data, GeometricData::Interpretation interpretation );
 
 		IECORE_RUNTIMETYPED_DECLARETEMPLATE( GeometricTypedData<T>, TypedData<T> );
 

include/IECore/GeometricTypedData.inl

@@ -59,6 +59,18 @@ GeometricTypedData<T>::GeometricTypedData( const ValueType &data, GeometricData:
 {
 }
 
+template<class T>
+GeometricTypedData<T>::GeometricTypedData( ValueType &&data )
+	: TypedData<T>( std::move( data ) ), m_interpretation( GeometricData::None )
+{
+}
+
+template<class T>
+GeometricTypedData<T>::GeometricTypedData( ValueType &&data, GeometricData::Interpretation interpretation )
+	: TypedData<T>( std::move( data ) ), m_interpretation( interpretation )
+{
+}
+
 template<class T>
 GeometricTypedData<T>::~GeometricTypedData()
 {

include/IECore/TypedData.h

@@ -71,6 +71,9 @@ class IECORE_EXPORT TypedData : public Data
 		TypedData();
 		/// Constructor based on the stored data type.
 		TypedData(const T &data);
+		/// Move constructor, to allow efficient construction if the caller
+		/// uses std::move or calls an in-place constructor for the stored type
+		TypedData(T &&data);
 
 		IECORE_RUNTIMETYPED_DECLARETEMPLATE( TypedData<T>, Data );
 

include/IECore/TypedData.inl

@@ -96,6 +96,11 @@ TypedData<T>::TypedData(const T &data) : m_data ( data )
 {
 }
 
+template<class T>
+TypedData<T>::TypedData(T &&data) : m_data ( std::move( data ) )
+{
+}
+
 template<class T>
 TypedData<T>::~TypedData()
 {

include/IECore/TypedDataInternals.h

@@ -56,6 +56,11 @@ class IECORE_EXPORT SimpleDataHolder
 		{
 		}
 
+		SimpleDataHolder( T &&data )
+			: m_data( std::move( data ) )
+		{
+		}
+
 		const T &readable() const
 		{
 			return m_data;
@@ -98,6 +103,11 @@ class IECORE_EXPORT SharedDataHolder
 		{
 		}
 
+		SharedDataHolder( T &&data )
+			: m_data( new Shareable( std::move( data ) ) )
+		{
+		}
+
 		const T &readable() const
 		{
 			assert( m_data );
@@ -162,6 +172,7 @@ class IECORE_EXPORT SharedDataHolder
 
 				Shareable() : data(), hashValid( false ) {}
 				Shareable( const T &initData ) : data( initData ), hashValid( false ) {}
+				Shareable( T &&initData ) : data( std::move( initData ) ), hashValid( false ) {}
 
 				T data;
 				MurmurHash hash;