Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ Improvements
------------

- PathMatcher : Added `in()` and `containing()` methods.
- TypeId : Added `format_as` overload, so that TypeIds can be passed to `fmt::format()`.
- PrimitiveVariable : Added `format_as` overload for `Interpolation`, so that it can be passed to `fmt::format()`.

Build
-----

- LibFormat : Added compatibility with `fmt` 12.2.0.

10.7.0.0
========
Expand Down
4 changes: 0 additions & 4 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -873,10 +873,6 @@ if env["PLATFORM"] != "win32" :
if clangVersion >= [ 15, 0, 0 ] :
env.Append( CXXFLAGS = [ "-DBOOST_NO_CXX98_FUNCTION_BASE", "-D_HAS_AUTO_PTR_ETC=0" ] )
if clangVersion >= [ 16, 0, 0 ] :
# XCode 16 warns about deprecations in fmtlib. Overriding `FMT_DEPRECATED`
# allows us to remove the [[deprecated]] attributes and still build with
# `-Werror,-Wdeprecated-declarations`.
env.Append( CPPDEFINES = [ ( "FMT_DEPRECATED", "" ), ] )
# Disable new warnings about ObjectInterpolator::InterpolatorDescription's reinterpret_cast.
env.Append( CXXFLAGS = [ "-Wno-cast-function-type-mismatch" ] )
# Disable FMA on arm64 builds to limit floating point discrepancies with x86_64 builds.
Expand Down
2 changes: 1 addition & 1 deletion contrib/IECoreAlembic/src/IECoreAlembic/AlembicScene.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,7 @@ class AlembicScene::AlembicReader : public AlembicIO
IECore::msg(
IECore::Msg::Warning,
"AlembicScene::readAttributeAtSample",
"Unsupported attribute type datatype: \"{}\" extent:{} interpretation:\"{}\"", pod, extent, getInterpretation()
"Unsupported attribute type datatype: \"{}\" extent:{} interpretation:\"{}\"", fmt::underlying( pod ), extent, getInterpretation()
);

return nullptr;
Expand Down
6 changes: 6 additions & 0 deletions include/IECore/TypeIds.h
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,12 @@ enum TypeId

};

/// Enable fmtlib formatting of TypeId as its numeric value.
inline int format_as( TypeId typeId )
{
return static_cast<int>( typeId );
}

} // namespace IECore

#endif // IE_CORE_TYPEIDS_H
6 changes: 6 additions & 0 deletions include/IECoreScene/PrimitiveVariable.h
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,12 @@ struct IECORESCENE_API PrimitiveVariable

};

/// Enable fmtlib formatting of Interpolation as its numeric value.
inline int format_as( PrimitiveVariable::Interpolation interpolation )
{
return static_cast<int>( interpolation );
}

/// Utility class for iterating the `data` field from
/// a PrimitiveVariable, using the `indices` field
/// appropriately if it exists.
Expand Down
6 changes: 6 additions & 0 deletions src/IECore/StreamIndexedIO.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,12 @@ protected :

};

/// Enable fmtlib formatting of NodeType as its numeric value.
inline int format_as( NodeBase::NodeType nodeType )
{
return static_cast<int>( nodeType );
}

/// Class that represents small data nodes
class SmallDataNode : public NodeBase
{
Expand Down
Loading