Skip to content

Commit

Permalink
Merge pull request #5551 from ivanimanishi/instancerAmbiguity
Browse files Browse the repository at this point in the history
Instancer : Fix ambiguous reference compilation errors
  • Loading branch information
johnhaddon authored Nov 17, 2023
2 parents 9f98ec8 + bfa74e6 commit 084f28a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
5 changes: 5 additions & 0 deletions Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ API

- SceneGadget : Added `snapshotToFile()` method.

Build
-----

- Instancer : Fixed ambiguous reference compilation errors when building with Boost 1.70.

1.3.7.0 (relative to 1.3.6.1)
=======

Expand Down
4 changes: 2 additions & 2 deletions src/GafferScene/Instancer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -756,13 +756,13 @@ class Instancer::EngineData : public Data
template<typename T>
AttributeCreator operator()( const TypedData<vector<T>> *data )
{
return std::bind( &createAttribute<T>, data->readable(), ::_1 );
return std::bind( &createAttribute<T>, data->readable(), std::placeholders::_1 );
}

template<typename T>
AttributeCreator operator()( const GeometricTypedData<vector<T>> *data )
{
return std::bind( &createGeometricAttribute<T>, data->readable(), data->getInterpretation(), ::_1 );
return std::bind( &createGeometricAttribute<T>, data->readable(), data->getInterpretation(), std::placeholders::_1 );
}

AttributeCreator operator()( const Data *data )
Expand Down

0 comments on commit 084f28a

Please sign in to comment.