CompoundObject : Default member() template argument to Object

Author: johnhaddon

Changes

@@ -5,6 +5,7 @@ Improvements
 ------------
 
 - MurmurHash : Added specialisation for `std::hash`, among other things allowing the use of MurmurHash as a key in `unordered_map`.
+- CompoundObject : Defaulted template argument to `Object` in `member()` methods.
 
 10.5.3.0 (relative to 10.5.2.1)
 ========

include/IECore/CompoundObject.h

@@ -64,17 +64,17 @@ class IECORE_API CompoundObject : public Object
 		/// or doesn't match the type specified as the template argument, behavior
 		/// is defined by the throwExceptions parameter. When this parameter is true a descriptive
 		/// Exception is thrown, and when false 0 is returned.
-		template<typename T>
+		template<typename T = Object>
 		T *member( const InternedString &name, bool throwExceptions = false );
-		template<typename T>
+		template<typename T = Object>
 		const T *member( const InternedString &name, bool throwExceptions = false ) const;
 
 		/// A Convenience function to find an object in members().
 		/// If the named object doesn't exist, if createIfMissing is true, an object will be added
 		/// with the type's object factory create method. If false, or the named entry does not match the
 		/// type specified as the template argument, behavior is defined by the throwExceptions parameter.
 		/// When this parameter is true a descriptive Exception is thrown, and when false 0 is returned.
-		template<typename T>
+		template<typename T = Object>
 		T *member( const InternedString &name, bool throwExceptions, bool createIfMissing );
 
 		/// Returns an instance of CompoundObject which can be shared by everyone - for instance a procedural

src/IECoreMaya/ParameterisedHolderModificationCmd.cpp

@@ -323,7 +323,7 @@ void ParameterisedHolderModificationCmd::storeParametersWithNewValues( const IEC
 			{
 				childParameterPath = it->first;
 			}
-			storeParametersWithNewValues( it->second.get(), newCompound->member<Object>( it->first ), childParameterPath );
+			storeParametersWithNewValues( it->second.get(), newCompound->member( it->first ), childParameterPath );
 		}
 
 		const CompoundObject::ObjectMap &newChildren = static_cast<const CompoundObject *>( newValue )->members();

src/IECoreNuke/ParameterisedHolder.cpp

@@ -188,7 +188,7 @@ int ParameterisedHolder<BaseType>::knob_changed( DD::Image::Knob *knob )
 			ParameterisedInterface *parameterisedInterface = dynamic_cast<ParameterisedInterface *>( g_getParameterisedResult.get() );
 			// apply current state
 			ConstCompoundObjectPtr classSpecifier = runTimeCast<const CompoundObject>( m_classSpecifierKnob->getValue() );
-			ConstObjectPtr handlerState = classSpecifier->member<Object>( "handlerState" );
+			ConstObjectPtr handlerState = classSpecifier->member( "handlerState" );
 			if( handlerState )
 			{
 				m_parameterHandler->setState( parameterisedInterface->parameters(), handlerState.get() );
@@ -525,7 +525,7 @@ void ParameterisedHolder<BaseType>::updateParameterised( bool reload )
 		// apply the previously stored handler state
 
 		ConstCompoundObjectPtr classSpecifier = runTimeCast<const CompoundObject>( m_classSpecifierKnob->getValue() );
-		ConstObjectPtr handlerState = classSpecifier->member<Object>( "handlerState" );
+		ConstObjectPtr handlerState = classSpecifier->member( "handlerState" );
 		if( handlerState )
 		{
 			m_parameterHandler->setState( parameterisedInterface->parameters(), handlerState.get() );