Skip to content

Commit d9a933f

Browse files
Merge pull request #1519 from johnhaddon/formatFix
CompoundData : Fix broken format tokens
2 parents bece337 + 0871b89 commit d9a933f

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

Changes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
10.7.x.x (relative to 10.7.0.0a5)
22
========
33

4+
Fixes
5+
-----
46

7+
- CompoundData : Fixed bad formatting of exception messages [^1].
8+
9+
[^1]: To be omitted from the notes for the final 10.7.0.0 release.
510

611
10.7.0.0a5 (relative to 10.7.0.0a4)
712
==========

include/IECore/CompoundData.inl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ T *CompoundData::member( const InternedString &name, bool throwExceptions, bool
102102
{
103103
if( throwExceptions )
104104
{
105-
throw Exception( fmt::format( "CompoundData child \"%s\" is not of type \"%s\".", name.value(), T::staticTypeName() ) );
105+
throw Exception( fmt::format( "CompoundData child \"{}\" is not of type \"{}\".", name.value(), T::staticTypeName() ) );
106106
}
107107
else
108108
{
@@ -120,7 +120,7 @@ T *CompoundData::member( const InternedString &name, bool throwExceptions, bool
120120
}
121121
else if( throwExceptions )
122122
{
123-
throw Exception( fmt::format( "CompoundData has no child named \"%s\".", name.value() ) );
123+
throw Exception( fmt::format( "CompoundData has no child named \"{}\".", name.value() ) );
124124
}
125125
else
126126
{

0 commit comments

Comments
 (0)