Merge pull request #5262 from johnhaddon/moreFormat

johnhaddon · web-flow · commit 5237c3e1f198 · 2023-04-19T08:35:34.000+01:00
More `boost::format` to `fmt::format` conversions
diff --git a/src/GafferImageModule/CoreBinding.cpp b/src/GafferImageModule/CoreBinding.cpp
@@ -55,6 +55,8 @@
 
 #include "IECorePython/SimpleTypedDataBinding.h"
 
+#include "fmt/format.h"
+
 using namespace boost::python;
 using namespace Gaffer;
 using namespace GafferImage;
@@ -240,21 +242,17 @@ std::string formatRepr( const GafferImage::Format &format )
 	else if ( format.getDisplayWindow().min == Imath::V2i( 0 ) )
 	{
 		Imath::Box2i box( format.getDisplayWindow() );
-		return std::string(
-			boost::str( boost::format(
-				"GafferImage.Format( %d, %d, %.3f )" )
-				% box.max.x % box.max.y % format.getPixelAspect()
-			)
+		return fmt::format(
+			"GafferImage.Format( {}, {}, {:.3f} )",
+			box.max.x, box.max.y, format.getPixelAspect()
 		);
 	}
 	else
 	{
 		Imath::Box2i box( format.getDisplayWindow() );
-		return std::string(
-			boost::str( boost::format(
-				"GafferImage.Format( imath.Box2i( imath.V2i( %d, %d ), imath.V2i( %d, %d ) ), %.3f )" )
-				% box.min.x % box.min.y % box.max.x % box.max.y % format.getPixelAspect()
-			)
+		return fmt::format(
+			"GafferImage.Format( imath.Box2i( imath.V2i( {}, {} ), imath.V2i( {}, {} ) ), {:.3f} )",
+			box.min.x, box.min.y, box.max.x, box.max.y, format.getPixelAspect()
 		);
 	}
 }
diff --git a/src/GafferImageTest/ContextSanitiser.cpp b/src/GafferImageTest/ContextSanitiser.cpp
@@ -43,6 +43,8 @@
 
 #include "IECore/MessageHandler.h"
 
+#include "fmt/format.h"
+
 using namespace IECore;
 using namespace Gaffer;
 using namespace GafferImage;
@@ -99,22 +101,22 @@ void ContextSanitiser::warn( const Gaffer::Process &process, const IECore::Inter
 
 	if( m_warningsEmitted.insert( warning ).second )
 	{
-		std::string message = boost::str(
-			boost::format( "%s in context for %s %s" )
-				% contextVariable.string()
-				% process.plug()->relativeName(
-					process.plug()->ancestor<ScriptNode>()
-				)
-				% process.type()
+		std::string message = fmt::format(
+			"{} in context for {} {}",
+			contextVariable.string(),
+			process.plug()->relativeName(
+				process.plug()->ancestor<ScriptNode>()
+			),
+			process.type().string()
 		);
 		if( process.parent() )
 		{
-			message += boost::str(
-				boost::format( " (called from %s %s)" )
-					% process.parent()->plug()->relativeName(
-						process.parent()->plug()->ancestor<ScriptNode>()
-					)
-					% process.parent()->type()
+			message += fmt::format(
+				" (called from {} {})",
+				process.parent()->plug()->relativeName(
+					process.parent()->plug()->ancestor<ScriptNode>()
+				),
+				process.parent()->type().string()
 			);
 		}
 		IECore::msg(
diff --git a/src/GafferModule/AnimationBinding.cpp b/src/GafferModule/AnimationBinding.cpp
@@ -44,6 +44,8 @@
 
 #include "Gaffer/Animation.h"
 
+#include "fmt/format.h"
+
 #include "boost/lexical_cast.hpp"
 
 #include <cmath>
@@ -128,7 +130,7 @@ void setPosition( Animation::Tangent &t, const Imath::V2d& position, const bool
 
 std::string slopeRepr( const double slope )
 {
-	return boost::str( boost::format( ( ( std::isinf( slope ) ) ? "float( '%.9g' )" : "%.9g" ) ) % slope );
+	return fmt::format( std::isinf( slope ) ? "float( '{:.9g}' )" : "{:.9g}", slope );
 }
 
 void setTieMode( Animation::Key &k, const Animation::TieMode mode )
@@ -139,16 +141,16 @@ void setTieMode( Animation::Key &k, const Animation::TieMode mode )
 
 std::string keyRepr( const Animation::Key &k )
 {
-	return boost::str( boost::format(
-		"Gaffer.Animation.Key( %.9g, %.9g, Gaffer.Animation.Interpolation.%s, %s, %.9g, %s, %.9g, Gaffer.Animation.TieMode.%s )" )
-			% k.getTime()
-			% k.getValue()
-			% Animation::toString( k.getInterpolation() )
-			% slopeRepr( k.tangentIn().getSlope() )
-			% k.tangentIn().getScale()
-			% slopeRepr( k.tangentOut().getSlope() )
-			% k.tangentOut().getScale()
-			% Animation::toString( k.getTieMode() )
+	return fmt::format(
+		"Gaffer.Animation.Key( {:.9g}, {:.9g}, Gaffer.Animation.Interpolation.{}, {}, {:.9g}, {}, {:.9g}, Gaffer.Animation.TieMode.{} )",
+		k.getTime(),
+		k.getValue(),
+		Animation::toString( k.getInterpolation() ),
+		slopeRepr( k.tangentIn().getSlope() ),
+		k.tangentIn().getScale(),
+		slopeRepr( k.tangentOut().getSlope() ),
+		k.tangentOut().getScale(),
+		Animation::toString( k.getTieMode() )
 	);
 };
 
diff --git a/src/GafferModule/ScriptNodeBinding.cpp b/src/GafferModule/ScriptNodeBinding.cpp
@@ -62,6 +62,8 @@
 #include "boost/lexical_cast.hpp"
 #include "boost/regex.hpp"
 
+#include "fmt/format.h"
+
 #include <memory>
 
 using namespace boost;
@@ -116,11 +118,9 @@ namespace
 
 const std::string formattedErrorContext( int lineNumber, const std::string &context )
 {
-	return boost::str(
-		boost::format( "Line %d%s%s" ) %
-			lineNumber %
-			(!context.empty() ? " of " : "") %
-			context
+	return fmt::format( "Line {}{}{}",
+		lineNumber, !context.empty() ? " of " : "",
+		context
 	);
 }
 
diff --git a/src/GafferModule/Transform2DPlugBinding.cpp b/src/GafferModule/Transform2DPlugBinding.cpp
@@ -42,6 +42,8 @@
 
 #include "Gaffer/Transform2DPlug.h"
 
+#include "fmt/format.h"
+
 using namespace boost::python;
 using namespace Imath;
 using namespace GafferBindings;
@@ -78,10 +80,9 @@ class Transform2DPlugSerialiser : public ValuePlugSerialiser
 
 			auto appendDefault = [&result]( const V2f &d, const V2f &defaultD, const char *name )
 			{
-				static boost::format formatter( "%1% = imath.V2f( %2%, %3% ), " );
 				if( d != defaultD )
 				{
-					result += boost::str( formatter % name % d.x % d.y );
+					result += fmt::format( "{} = imath.V2f( {}, {} ), ", name, d.x, d.y );
 				}
 			};
 			appendDefault( plug->translatePlug()->defaultValue(), V2f( 0 ), "defaultTranslate" );
diff --git a/src/GafferModule/TransformPlugBinding.cpp b/src/GafferModule/TransformPlugBinding.cpp
@@ -43,6 +43,8 @@
 
 #include "Gaffer/TransformPlug.h"
 
+#include "fmt/format.h"
+
 using namespace boost::python;
 using namespace Imath;
 using namespace GafferBindings;
@@ -78,10 +80,9 @@ class TransformPlugSerialiser : public ValuePlugSerialiser
 
 			auto appendDefault = [&result]( const V3f &d, const V3f &defaultD, const char *name )
 			{
-				static boost::format formatter( "%1% = imath.V3f( %2%, %3%, %4% ), " );
 				if( d != defaultD )
 				{
-					result += boost::str( formatter % name % d.x % d.y % d.z );
+					result += fmt::format( "{} = imath.V3f( {}, {}, {} ), ", name, d.x, d.y, d.z );
 				}
 			};
 			appendDefault( plug->translatePlug()->defaultValue(), V3f( 0 ), "defaultTranslate" );
diff --git a/src/GafferScene/IECoreGLPreview/Renderer.cpp b/src/GafferScene/IECoreGLPreview/Renderer.cpp
@@ -78,10 +78,11 @@
 #endif
 
 #include "boost/algorithm/string/predicate.hpp"
-#include "boost/format.hpp"
 
 #include "tbb/concurrent_queue.h"
 
+#include "fmt/format.h"
+
 #include <functional>
 #include <unordered_map>
 #include <vector>
@@ -185,7 +186,7 @@ T *reportedCast( const IECore::RunTimeTyped *v, const char *type, const IECore::
 		return t;
 	}
 
-	IECore::msg( IECore::Msg::Warning, "IECoreGL::Renderer", boost::format( "Expected %s but got %s for %s \"%s\"." ) % T::staticTypeName() % v->typeName() % type % name.c_str() );
+	IECore::msg( IECore::Msg::Warning, "IECoreGL::Renderer", fmt::format( "Expected {} but got {} for {} \"{}\".", T::staticTypeName(), v->typeName(), type, name.string() ) );
 	return nullptr;
 }
 
@@ -893,7 +894,7 @@ class OpenGLRenderer final : public IECoreScenePreview::Renderer
 			}
 			else
 			{
-				IECore::msg( IECore::Msg::Warning, "IECoreGL::Renderer::option", boost::format( "Unknown option \"%s\"." ) % name.c_str() );
+				IECore::msg( IECore::Msg::Warning, "IECoreGL::Renderer::option", fmt::format( "Unknown option \"{}\".", name.string() ) );
 			}
 		}
 
@@ -1015,7 +1016,7 @@ class OpenGLRenderer final : public IECoreScenePreview::Renderer
 			}
 			else if( boost::starts_with( name.string(), "gl:" ) || name.string().find( ":" ) == string::npos )
 			{
-				IECore::msg( IECore::Msg::Warning, "IECoreGL::Renderer::command", boost::format( "Unknown command \"%s\"." ) % name.c_str() );
+				IECore::msg( IECore::Msg::Warning, "IECoreGL::Renderer::command", fmt::format( "Unknown command \"{}\".", name.string() ) );
 			}
 
 			return nullptr;
@@ -1227,15 +1228,15 @@ class OpenGLRenderer final : public IECoreScenePreview::Renderer
 				}
 				else
 				{
-					IECore::msg( IECore::Msg::Warning, "IECoreGL::Renderer", boost::format( "Unsupported data format \"%s\"." ) % data );
+					IECore::msg( IECore::Msg::Warning, "IECoreGL::Renderer", fmt::format( "Unsupported data format \"{}\".", data ) );
 					return;
 				}
 
 				const string &type = namedOutput.second->getType();
 				IECore::WriterPtr writer = IECore::Writer::create( image, "tmp." + type );
 				if( !writer )
 				{
-					IECore::msg( IECore::Msg::Warning, "IECoreGL::Renderer", boost::format( "Unsupported display type \"%s\"." ) % type );
+					IECore::msg( IECore::Msg::Warning, "IECoreGL::Renderer", fmt::format( "Unsupported display type \"{}\".", type ) );
 					return;
 				}
 
diff --git a/src/GafferScene/IECoreScenePreview/CapturingRenderer.cpp b/src/GafferScene/IECoreScenePreview/CapturingRenderer.cpp
@@ -39,6 +39,8 @@
 #include "IECore/MessageHandler.h"
 #include "IECore/SimpleTypedData.h"
 
+#include "fmt/format.h"
+
 using namespace std;
 using namespace IECore;
 using namespace IECoreScenePreview;
@@ -145,7 +147,7 @@ Renderer::ObjectInterfacePtr CapturingRenderer::object( const std::string &name,
 	if( !m_capturedObjects.insert( a, name ) )
 	{
 		IECore::msg( IECore::Msg::Warning, "CapturingRenderer::object",
-			boost::str( boost::format( "Object named \"%s\" already exists" ) % name )
+			fmt::format( "Object named \"{}\" already exists", name )
 		);
 		return nullptr;
 	}
diff --git a/src/GafferSceneModule/PrimitivesBinding.cpp b/src/GafferSceneModule/PrimitivesBinding.cpp
@@ -57,6 +57,8 @@
 
 #include "GafferBindings/DependencyNodeBinding.h"
 
+#include "fmt/format.h"
+
 using namespace std;
 using namespace boost::python;
 using namespace IECorePython;
@@ -105,7 +107,7 @@ class LightSerialiser : public GafferBindings::NodeSerialiser
 		const std::string shaderName = shaderNamePlug ? shaderNamePlug->getValue() : "";
 		if( shaderName.size() )
 		{
-			return defaultPC + boost::str( boost::format( "%s.loadShader( \"%s\" )\n" ) % identifier % shaderName );
+			return defaultPC + fmt::format( "{}.loadShader( \"{}\" )\n", identifier, shaderName );
 		}
 
 		return defaultPC;
@@ -129,7 +131,7 @@ class LightFilterSerialiser : public GafferBindings::NodeSerialiser
 
 		if( shaderName.size() )
 		{
-			return defaultPostConstructor + boost::str( boost::format( "%s.loadShader( \"%s\" )\n" ) % identifier % shaderName );
+			return defaultPostConstructor + fmt::format( "{}.loadShader( \"{}\" )\n", identifier, shaderName );
 		}
 
 		return defaultPostConstructor;
diff --git a/src/GafferSceneModule/ShaderBinding.cpp b/src/GafferSceneModule/ShaderBinding.cpp
@@ -47,6 +47,8 @@
 
 #include "Gaffer/StringPlug.h"
 
+#include "fmt/format.h"
+
 using namespace boost::python;
 
 using namespace Gaffer;
@@ -110,7 +112,7 @@ class ShaderSerialiser : public GafferBindings::NodeSerialiser
 		const std::string shaderName = shader->namePlug()->getValue();
 		if( shaderName.size() )
 		{
-			return defaultPC + boost::str( boost::format( "%s.loadShader( \"%s\" )\n" ) % identifier % shaderName );
+			return defaultPC + fmt::format( "{}.loadShader( \"{}\" )\n", identifier, shaderName );
 		}
 
 		return defaultPC;
diff --git a/src/GafferSceneTest/ContextSanitiser.cpp b/src/GafferSceneTest/ContextSanitiser.cpp
@@ -45,6 +45,8 @@
 
 #include "IECore/MessageHandler.h"
 
+#include "fmt/format.h"
+
 using namespace IECore;
 using namespace Gaffer;
 using namespace GafferScene;
@@ -128,22 +130,22 @@ void ContextSanitiser::warn( const Gaffer::Process &process, const IECore::Inter
 
 	if( m_warningsEmitted.insert( warning ).second )
 	{
-		std::string message = boost::str(
-			boost::format( "%s in context for %s %s" )
-				% contextVariable.string()
-				% process.plug()->relativeName(
-					process.plug()->ancestor<ScriptNode>()
-				)
-				% process.type()
+		std::string message = fmt::format(
+			"{} in context for {} {}",
+			contextVariable.string(),
+			process.plug()->relativeName(
+				process.plug()->ancestor<ScriptNode>()
+			),
+			process.type().string()
 		);
 		if( process.parent() )
 		{
-			message += boost::str(
-				boost::format( " (called from %s %s)" )
-					% process.parent()->plug()->relativeName(
-						process.parent()->plug()->ancestor<ScriptNode>()
-					)
-					% process.parent()->type()
+			message += fmt::format(
+				" (called from {} {})",
+				process.parent()->plug()->relativeName(
+					process.parent()->plug()->ancestor<ScriptNode>()
+				),
+				process.parent()->type().string()
 			);
 		}
 		IECore::msg(
diff --git a/src/GafferSceneUI/AttributeInspector.cpp b/src/GafferSceneUI/AttributeInspector.cpp
@@ -52,6 +52,8 @@
 #include "Gaffer/ParallelAlgo.h"
 #include "Gaffer/ValuePlug.h"
 
+#include "fmt/format.h"
+
 using namespace boost::placeholders;
 using namespace IECore;
 using namespace IECoreScene;
@@ -280,9 +282,9 @@ Gaffer::ValuePlugPtr AttributeInspector::source( const GafferScene::SceneAlgo::H
 				/// \todo This is overly conservative. We should test to see if there is more than
 				/// one filter match (but make sure to early-out once two are found, rather than test
 				/// the rest of the scene).
-				editWarning = boost::str(
-					boost::format( "Edits to \"%s\" may affect other locations in the scene." )
-						% m_attribute.string()
+				editWarning = fmt::format(
+					"Edits to \"{}\" may affect other locations in the scene.",
+					m_attribute.string()
 				);
 				return plug;
 			}
@@ -330,9 +332,7 @@ Inspector::EditFunctionOrFailure AttributeInspector::editFunction( Gaffer::EditS
 		// If we don't have an edit and the scope is locked, we error,
 		// as we can't add an edit. Other cases where we already _have_
 		// an edit will have been found by `source()`.
-		return boost::str(
-			boost::format( "%s is locked." ) % readOnlyReason->relativeName( readOnlyReason->ancestor<ScriptNode>() )
-		);
+		return fmt::format( "{} is locked.", readOnlyReason->relativeName( readOnlyReason->ancestor<ScriptNode>() ) );
 	}
 	else
 	{
diff --git a/src/GafferSceneUI/CameraTool.cpp b/src/GafferSceneUI/CameraTool.cpp
diff --git a/src/GafferSceneUI/Inspector.cpp b/src/GafferSceneUI/Inspector.cpp
diff --git a/src/GafferSceneUI/ParameterInspector.cpp b/src/GafferSceneUI/ParameterInspector.cpp
diff --git a/src/GafferSceneUI/SceneView.cpp b/src/GafferSceneUI/SceneView.cpp
diff --git a/src/GafferSceneUI/SetMembershipInspector.cpp b/src/GafferSceneUI/SetMembershipInspector.cpp
diff --git a/src/GafferSceneUI/TransformTool.cpp b/src/GafferSceneUI/TransformTool.cpp

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,8 @@`
`42`	`42`
`43`	`43`	`#include "Gaffer/Transform2DPlug.h"`
`44`	`44`
	`45`	`+#include "fmt/format.h"`
	`46`	`+`
`45`	`47`	`using namespace boost::python;`
`46`	`48`	`using namespace Imath;`
`47`	`49`	`using namespace GafferBindings;`
`@@ -78,10 +80,9 @@ class Transform2DPlugSerialiser : public ValuePlugSerialiser`
`78`	`80`
`79`	`81`	`auto appendDefault = [&result]( const V2f &d, const V2f &defaultD, const char *name )`
`80`	`82`	`{`
`81`		`- static boost::format formatter( "%1% = imath.V2f( %2%, %3% ), " );`
`82`	`83`	`if( d != defaultD )`
`83`	`84`	`{`
`84`		`- result += boost::str( formatter % name % d.x % d.y );`
	`85`	`+ result += fmt::format( "{} = imath.V2f( {}, {} ), ", name, d.x, d.y );`
`85`	`86`	`}`
`86`	`87`	`};`
`87`	`88`	`appendDefault( plug->translatePlug()->defaultValue(), V2f( 0 ), "defaultTranslate" );`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,8 @@`
`43`	`43`
`44`	`44`	`#include "Gaffer/TransformPlug.h"`
`45`	`45`
	`46`	`+#include "fmt/format.h"`
	`47`	`+`
`46`	`48`	`using namespace boost::python;`
`47`	`49`	`using namespace Imath;`
`48`	`50`	`using namespace GafferBindings;`
`@@ -78,10 +80,9 @@ class TransformPlugSerialiser : public ValuePlugSerialiser`
`78`	`80`
`79`	`81`	`auto appendDefault = [&result]( const V3f &d, const V3f &defaultD, const char *name )`
`80`	`82`	`{`
`81`		`- static boost::format formatter( "%1% = imath.V3f( %2%, %3%, %4% ), " );`
`82`	`83`	`if( d != defaultD )`
`83`	`84`	`{`
`84`		`- result += boost::str( formatter % name % d.x % d.y % d.z );`
	`85`	`+ result += fmt::format( "{} = imath.V3f( {}, {}, {} ), ", name, d.x, d.y, d.z );`
`85`	`86`	`}`
`86`	`87`	`};`
`87`	`88`	`appendDefault( plug->translatePlug()->defaultValue(), V3f( 0 ), "defaultTranslate" );`
Original file line number	Diff line number	Diff line change
`@@ -78,10 +78,11 @@`
`78`	`78`	`#endif`
`79`	`79`
`80`	`80`	`#include "boost/algorithm/string/predicate.hpp"`
`81`		`-#include "boost/format.hpp"`
`82`	`81`
`83`	`82`	`#include "tbb/concurrent_queue.h"`
`84`	`83`
	`84`	`+#include "fmt/format.h"`
	`85`	`+`
`85`	`86`	`#include <functional>`
`86`	`87`	`#include <unordered_map>`
`87`	`88`	`#include <vector>`
`@@ -185,7 +186,7 @@ T reportedCast( const IECore::RunTimeTyped v, const char *type, const IECore::`
`185`	`186`	`return t;`
`186`	`187`	`}`
`187`	`188`
`188`		`- IECore::msg( IECore::Msg::Warning, "IECoreGL::Renderer", boost::format( "Expected %s but got %s for %s \"%s\"." ) % T::staticTypeName() % v->typeName() % type % name.c_str() );`
	`189`	`+ IECore::msg( IECore::Msg::Warning, "IECoreGL::Renderer", fmt::format( "Expected {} but got {} for {} \"{}\".", T::staticTypeName(), v->typeName(), type, name.string() ) );`
`189`	`190`	`return nullptr;`
`190`	`191`	`}`
`191`	`192`
`@@ -893,7 +894,7 @@ class OpenGLRenderer final : public IECoreScenePreview::Renderer`
`893`	`894`	`}`
`894`	`895`	`else`
`895`	`896`	`{`
`896`		`- IECore::msg( IECore::Msg::Warning, "IECoreGL::Renderer::option", boost::format( "Unknown option \"%s\"." ) % name.c_str() );`
	`897`	`+ IECore::msg( IECore::Msg::Warning, "IECoreGL::Renderer::option", fmt::format( "Unknown option \"{}\".", name.string() ) );`
`897`	`898`	`}`
`898`	`899`	`}`
`899`	`900`
`@@ -1015,7 +1016,7 @@ class OpenGLRenderer final : public IECoreScenePreview::Renderer`
`1015`	`1016`	`}`
`1016`	`1017`	`else if( boost::starts_with( name.string(), "gl:" ) \|\| name.string().find( ":" ) == string::npos )`
`1017`	`1018`	`{`
`1018`		`- IECore::msg( IECore::Msg::Warning, "IECoreGL::Renderer::command", boost::format( "Unknown command \"%s\"." ) % name.c_str() );`
	`1019`	`+ IECore::msg( IECore::Msg::Warning, "IECoreGL::Renderer::command", fmt::format( "Unknown command \"{}\".", name.string() ) );`
`1019`	`1020`	`}`
`1020`	`1021`
`1021`	`1022`	`return nullptr;`
`@@ -1227,15 +1228,15 @@ class OpenGLRenderer final : public IECoreScenePreview::Renderer`
`1227`	`1228`	`}`
`1228`	`1229`	`else`
`1229`	`1230`	`{`
`1230`		`- IECore::msg( IECore::Msg::Warning, "IECoreGL::Renderer", boost::format( "Unsupported data format \"%s\"." ) % data );`
	`1231`	`+ IECore::msg( IECore::Msg::Warning, "IECoreGL::Renderer", fmt::format( "Unsupported data format \"{}\".", data ) );`
`1231`	`1232`	`return;`
`1232`	`1233`	`}`
`1233`	`1234`
`1234`	`1235`	`const string &type = namedOutput.second->getType();`
`1235`	`1236`	`IECore::WriterPtr writer = IECore::Writer::create( image, "tmp." + type );`
`1236`	`1237`	`if( !writer )`
`1237`	`1238`	`{`
`1238`		`- IECore::msg( IECore::Msg::Warning, "IECoreGL::Renderer", boost::format( "Unsupported display type \"%s\"." ) % type );`
	`1239`	`+ IECore::msg( IECore::Msg::Warning, "IECoreGL::Renderer", fmt::format( "Unsupported display type \"{}\".", type ) );`
`1239`	`1240`	`return;`
`1240`	`1241`	`}`
`1241`	`1242`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,8 @@`
`57`	`57`
`58`	`58`	`#include "GafferBindings/DependencyNodeBinding.h"`
`59`	`59`
	`60`	`+#include "fmt/format.h"`
	`61`	`+`
`60`	`62`	`using namespace std;`
`61`	`63`	`using namespace boost::python;`
`62`	`64`	`using namespace IECorePython;`
`@@ -105,7 +107,7 @@ class LightSerialiser : public GafferBindings::NodeSerialiser`
`105`	`107`	`const std::string shaderName = shaderNamePlug ? shaderNamePlug->getValue() : "";`
`106`	`108`	`if( shaderName.size() )`
`107`	`109`	`{`
`108`		`- return defaultPC + boost::str( boost::format( "%s.loadShader( \"%s\" )\n" ) % identifier % shaderName );`
	`110`	`+ return defaultPC + fmt::format( "{}.loadShader( \"{}\" )\n", identifier, shaderName );`
`109`	`111`	`}`
`110`	`112`
`111`	`113`	`return defaultPC;`
`@@ -129,7 +131,7 @@ class LightFilterSerialiser : public GafferBindings::NodeSerialiser`
`129`	`131`
`130`	`132`	`if( shaderName.size() )`
`131`	`133`	`{`
`132`		`- return defaultPostConstructor + boost::str( boost::format( "%s.loadShader( \"%s\" )\n" ) % identifier % shaderName );`
	`134`	`+ return defaultPostConstructor + fmt::format( "{}.loadShader( \"{}\" )\n", identifier, shaderName );`
`133`	`135`	`}`
`134`	`136`
`135`	`137`	`return defaultPostConstructor;`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,8 @@`
`47`	`47`
`48`	`48`	`#include "Gaffer/StringPlug.h"`
`49`	`49`
	`50`	`+#include "fmt/format.h"`
	`51`	`+`
`50`	`52`	`using namespace boost::python;`
`51`	`53`
`52`	`54`	`using namespace Gaffer;`
`@@ -110,7 +112,7 @@ class ShaderSerialiser : public GafferBindings::NodeSerialiser`
`110`	`112`	`const std::string shaderName = shader->namePlug()->getValue();`
`111`	`113`	`if( shaderName.size() )`
`112`	`114`	`{`
`113`		`- return defaultPC + boost::str( boost::format( "%s.loadShader( \"%s\" )\n" ) % identifier % shaderName );`
	`115`	`+ return defaultPC + fmt::format( "{}.loadShader( \"{}\" )\n", identifier, shaderName );`
`114`	`116`	`}`
`115`	`117`
`116`	`118`	`return defaultPC;`