diff --git a/pxr/base/gf/wrapDualQuat.template.cpp b/pxr/base/gf/wrapDualQuat.template.cpp index af952e2d2d..fb01d6a5e7 100644 --- a/pxr/base/gf/wrapDualQuat.template.cpp +++ b/pxr/base/gf/wrapDualQuat.template.cpp @@ -30,6 +30,7 @@ #include "pxr/base/gf/dualQuat{{ SCALAR_SUFFIX(S) }}.h" {% endfor %} +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/pyUtils.h" #include "pxr/base/tf/wrapTypeHelpers.h" #include "pxr/base/tf/pyContainerConversions.h" @@ -70,7 +71,7 @@ static {{ DUALQUAT }}& __itruediv__({{ DUALQUAT }} &self, {{ SCL }} value) } static size_t __hash__({{ DUALQUAT }} const &self) { - return hash_value(self); + return TfHash{}(self); } // Zero-initialized default ctor for python. diff --git a/pxr/base/gf/wrapDualQuatd.cpp b/pxr/base/gf/wrapDualQuatd.cpp index d02c73b250..0097708159 100644 --- a/pxr/base/gf/wrapDualQuatd.cpp +++ b/pxr/base/gf/wrapDualQuatd.cpp @@ -30,6 +30,7 @@ #include "pxr/base/gf/dualQuatf.h" #include "pxr/base/gf/dualQuath.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/pyUtils.h" #include "pxr/base/tf/wrapTypeHelpers.h" #include "pxr/base/tf/pyContainerConversions.h" @@ -70,7 +71,7 @@ static GfDualQuatd& __itruediv__(GfDualQuatd &self, double value) } static size_t __hash__(GfDualQuatd const &self) { - return hash_value(self); + return TfHash{}(self); } // Zero-initialized default ctor for python. diff --git a/pxr/base/gf/wrapDualQuatf.cpp b/pxr/base/gf/wrapDualQuatf.cpp index 9f45d13421..e7da79f8df 100644 --- a/pxr/base/gf/wrapDualQuatf.cpp +++ b/pxr/base/gf/wrapDualQuatf.cpp @@ -30,6 +30,7 @@ #include "pxr/base/gf/dualQuatf.h" #include "pxr/base/gf/dualQuath.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/pyUtils.h" #include "pxr/base/tf/wrapTypeHelpers.h" #include "pxr/base/tf/pyContainerConversions.h" @@ -70,7 +71,7 @@ static GfDualQuatf& __itruediv__(GfDualQuatf &self, float value) } static size_t __hash__(GfDualQuatf const &self) { - return hash_value(self); + return TfHash{}(self); } // Zero-initialized default ctor for python. diff --git a/pxr/base/gf/wrapDualQuath.cpp b/pxr/base/gf/wrapDualQuath.cpp index b577250bb1..9274ad34bd 100644 --- a/pxr/base/gf/wrapDualQuath.cpp +++ b/pxr/base/gf/wrapDualQuath.cpp @@ -30,6 +30,7 @@ #include "pxr/base/gf/dualQuatf.h" #include "pxr/base/gf/dualQuath.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/pyUtils.h" #include "pxr/base/tf/wrapTypeHelpers.h" #include "pxr/base/tf/pyContainerConversions.h" @@ -70,7 +71,7 @@ static GfDualQuath& __itruediv__(GfDualQuath &self, GfHalf value) } static size_t __hash__(GfDualQuath const &self) { - return hash_value(self); + return TfHash{}(self); } // Zero-initialized default ctor for python. diff --git a/pxr/base/gf/wrapMatrix.template.cpp b/pxr/base/gf/wrapMatrix.template.cpp index 24afebdf42..535e07caba 100644 --- a/pxr/base/gf/wrapMatrix.template.cpp +++ b/pxr/base/gf/wrapMatrix.template.cpp @@ -33,6 +33,7 @@ {% block customIncludes %} {% endblock customIncludes %} +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/py3Compat.h" #include "pxr/base/tf/pyUtils.h" #include "pxr/base/tf/pyContainerConversions.h" @@ -267,7 +268,7 @@ struct {{ MAT }}_Pickle_Suite : boost::python::pickle_suite } }; -static size_t __hash__({{ MAT }} const &m) { return hash_value(m); } +static size_t __hash__({{ MAT }} const &m) { return TfHash{}(m); } static boost::python::tuple get_dimension() { diff --git a/pxr/base/gf/wrapMatrix2d.cpp b/pxr/base/gf/wrapMatrix2d.cpp index 66bf386c2c..6126da837a 100644 --- a/pxr/base/gf/wrapMatrix2d.cpp +++ b/pxr/base/gf/wrapMatrix2d.cpp @@ -32,6 +32,7 @@ #include "pxr/base/gf/pyBufferUtils.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/py3Compat.h" #include "pxr/base/tf/pyUtils.h" #include "pxr/base/tf/pyContainerConversions.h" @@ -264,7 +265,7 @@ struct GfMatrix2d_Pickle_Suite : boost::python::pickle_suite } }; -static size_t __hash__(GfMatrix2d const &m) { return hash_value(m); } +static size_t __hash__(GfMatrix2d const &m) { return TfHash{}(m); } static boost::python::tuple get_dimension() { diff --git a/pxr/base/gf/wrapMatrix2f.cpp b/pxr/base/gf/wrapMatrix2f.cpp index cbbe2060b6..51cf815ad1 100644 --- a/pxr/base/gf/wrapMatrix2f.cpp +++ b/pxr/base/gf/wrapMatrix2f.cpp @@ -32,6 +32,7 @@ #include "pxr/base/gf/pyBufferUtils.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/py3Compat.h" #include "pxr/base/tf/pyUtils.h" #include "pxr/base/tf/pyContainerConversions.h" @@ -264,7 +265,7 @@ struct GfMatrix2f_Pickle_Suite : boost::python::pickle_suite } }; -static size_t __hash__(GfMatrix2f const &m) { return hash_value(m); } +static size_t __hash__(GfMatrix2f const &m) { return TfHash{}(m); } static boost::python::tuple get_dimension() { diff --git a/pxr/base/gf/wrapMatrix3d.cpp b/pxr/base/gf/wrapMatrix3d.cpp index 5dd13a77aa..d2d974dd0c 100644 --- a/pxr/base/gf/wrapMatrix3d.cpp +++ b/pxr/base/gf/wrapMatrix3d.cpp @@ -35,6 +35,7 @@ #include "pxr/base/gf/quatd.h" #include "pxr/base/gf/rotation.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/py3Compat.h" #include "pxr/base/tf/pyUtils.h" #include "pxr/base/tf/pyContainerConversions.h" @@ -270,7 +271,7 @@ struct GfMatrix3d_Pickle_Suite : boost::python::pickle_suite } }; -static size_t __hash__(GfMatrix3d const &m) { return hash_value(m); } +static size_t __hash__(GfMatrix3d const &m) { return TfHash{}(m); } static boost::python::tuple get_dimension() { diff --git a/pxr/base/gf/wrapMatrix3f.cpp b/pxr/base/gf/wrapMatrix3f.cpp index 9d63e4456b..36c6859d8f 100644 --- a/pxr/base/gf/wrapMatrix3f.cpp +++ b/pxr/base/gf/wrapMatrix3f.cpp @@ -35,6 +35,7 @@ #include "pxr/base/gf/quatf.h" #include "pxr/base/gf/rotation.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/py3Compat.h" #include "pxr/base/tf/pyUtils.h" #include "pxr/base/tf/pyContainerConversions.h" @@ -270,7 +271,7 @@ struct GfMatrix3f_Pickle_Suite : boost::python::pickle_suite } }; -static size_t __hash__(GfMatrix3f const &m) { return hash_value(m); } +static size_t __hash__(GfMatrix3f const &m) { return TfHash{}(m); } static boost::python::tuple get_dimension() { diff --git a/pxr/base/gf/wrapMatrix4d.cpp b/pxr/base/gf/wrapMatrix4d.cpp index b9998ff970..a8fcaf425c 100644 --- a/pxr/base/gf/wrapMatrix4d.cpp +++ b/pxr/base/gf/wrapMatrix4d.cpp @@ -39,6 +39,7 @@ #include "pxr/base/gf/quatd.h" #include "pxr/base/gf/rotation.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/py3Compat.h" #include "pxr/base/tf/pyUtils.h" #include "pxr/base/tf/pyContainerConversions.h" @@ -294,7 +295,7 @@ struct GfMatrix4d_Pickle_Suite : boost::python::pickle_suite } }; -static size_t __hash__(GfMatrix4d const &m) { return hash_value(m); } +static size_t __hash__(GfMatrix4d const &m) { return TfHash{}(m); } static boost::python::tuple get_dimension() { diff --git a/pxr/base/gf/wrapMatrix4f.cpp b/pxr/base/gf/wrapMatrix4f.cpp index fcd50d66b4..0eeefc3e6a 100644 --- a/pxr/base/gf/wrapMatrix4f.cpp +++ b/pxr/base/gf/wrapMatrix4f.cpp @@ -39,6 +39,7 @@ #include "pxr/base/gf/quatf.h" #include "pxr/base/gf/rotation.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/py3Compat.h" #include "pxr/base/tf/pyUtils.h" #include "pxr/base/tf/pyContainerConversions.h" @@ -294,7 +295,7 @@ struct GfMatrix4f_Pickle_Suite : boost::python::pickle_suite } }; -static size_t __hash__(GfMatrix4f const &m) { return hash_value(m); } +static size_t __hash__(GfMatrix4f const &m) { return TfHash{}(m); } static boost::python::tuple get_dimension() { diff --git a/pxr/base/gf/wrapQuaternion.cpp b/pxr/base/gf/wrapQuaternion.cpp index fd1580f463..1345f23bf1 100644 --- a/pxr/base/gf/wrapQuaternion.cpp +++ b/pxr/base/gf/wrapQuaternion.cpp @@ -24,6 +24,7 @@ #include "pxr/pxr.h" #include "pxr/base/gf/quaternion.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/pyUtils.h" #include "pxr/base/tf/wrapTypeHelpers.h" #include "pxr/base/tf/pyContainerConversions.h" @@ -65,7 +66,7 @@ static string _Repr(GfQuaternion const &self) { TfPyRepr(self.GetImaginary()) + ")"; } -static size_t __hash__(GfQuaternion const &self) { return hash_value(self); } +static size_t __hash__(GfQuaternion const &self) { return TfHash{}(self); } } // anonymous namespace diff --git a/pxr/base/gf/wrapRange.template.cpp b/pxr/base/gf/wrapRange.template.cpp index aa9c00b693..39a5704ea5 100644 --- a/pxr/base/gf/wrapRange.template.cpp +++ b/pxr/base/gf/wrapRange.template.cpp @@ -31,6 +31,7 @@ #include "pxr/base/gf/range{{ DIM }}{{ S[0] }}.h" {% endfor %} +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/pyUtils.h" #include "pxr/base/tf/wrapTypeHelpers.h" #include "pxr/base/tf/pyContainerConversions.h" @@ -67,7 +68,7 @@ static {{ RNG }}& __itruediv__({{ RNG }} &self, double value) return self /= value; } -static size_t __hash__({{ RNG }} const &r) { return hash_value(r); } +static size_t __hash__({{ RNG }} const &r) { return TfHash{}(r); } } // anonymous namespace diff --git a/pxr/base/gf/wrapRange1d.cpp b/pxr/base/gf/wrapRange1d.cpp index 240c596ba5..c0b2c62144 100644 --- a/pxr/base/gf/wrapRange1d.cpp +++ b/pxr/base/gf/wrapRange1d.cpp @@ -29,6 +29,7 @@ #include "pxr/base/gf/range1d.h" #include "pxr/base/gf/range1f.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/pyUtils.h" #include "pxr/base/tf/wrapTypeHelpers.h" #include "pxr/base/tf/pyContainerConversions.h" @@ -65,7 +66,7 @@ static GfRange1d& __itruediv__(GfRange1d &self, double value) return self /= value; } -static size_t __hash__(GfRange1d const &r) { return hash_value(r); } +static size_t __hash__(GfRange1d const &r) { return TfHash{}(r); } } // anonymous namespace diff --git a/pxr/base/gf/wrapRange1f.cpp b/pxr/base/gf/wrapRange1f.cpp index 2dab4a34c0..886e31cfbb 100644 --- a/pxr/base/gf/wrapRange1f.cpp +++ b/pxr/base/gf/wrapRange1f.cpp @@ -29,6 +29,7 @@ #include "pxr/base/gf/range1f.h" #include "pxr/base/gf/range1d.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/pyUtils.h" #include "pxr/base/tf/wrapTypeHelpers.h" #include "pxr/base/tf/pyContainerConversions.h" @@ -65,7 +66,7 @@ static GfRange1f& __itruediv__(GfRange1f &self, double value) return self /= value; } -static size_t __hash__(GfRange1f const &r) { return hash_value(r); } +static size_t __hash__(GfRange1f const &r) { return TfHash{}(r); } } // anonymous namespace diff --git a/pxr/base/gf/wrapRange2d.cpp b/pxr/base/gf/wrapRange2d.cpp index 9a85f1619d..508b960a00 100644 --- a/pxr/base/gf/wrapRange2d.cpp +++ b/pxr/base/gf/wrapRange2d.cpp @@ -29,6 +29,7 @@ #include "pxr/base/gf/range2d.h" #include "pxr/base/gf/range2f.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/pyUtils.h" #include "pxr/base/tf/wrapTypeHelpers.h" #include "pxr/base/tf/pyContainerConversions.h" @@ -65,7 +66,7 @@ static GfRange2d& __itruediv__(GfRange2d &self, double value) return self /= value; } -static size_t __hash__(GfRange2d const &r) { return hash_value(r); } +static size_t __hash__(GfRange2d const &r) { return TfHash{}(r); } } // anonymous namespace diff --git a/pxr/base/gf/wrapRange2f.cpp b/pxr/base/gf/wrapRange2f.cpp index 09aeed4028..9598218bdf 100644 --- a/pxr/base/gf/wrapRange2f.cpp +++ b/pxr/base/gf/wrapRange2f.cpp @@ -29,6 +29,7 @@ #include "pxr/base/gf/range2f.h" #include "pxr/base/gf/range2d.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/pyUtils.h" #include "pxr/base/tf/wrapTypeHelpers.h" #include "pxr/base/tf/pyContainerConversions.h" @@ -65,7 +66,7 @@ static GfRange2f& __itruediv__(GfRange2f &self, double value) return self /= value; } -static size_t __hash__(GfRange2f const &r) { return hash_value(r); } +static size_t __hash__(GfRange2f const &r) { return TfHash{}(r); } } // anonymous namespace diff --git a/pxr/base/gf/wrapRange3d.cpp b/pxr/base/gf/wrapRange3d.cpp index 177337aa76..4e2430cee4 100644 --- a/pxr/base/gf/wrapRange3d.cpp +++ b/pxr/base/gf/wrapRange3d.cpp @@ -29,6 +29,7 @@ #include "pxr/base/gf/range3d.h" #include "pxr/base/gf/range3f.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/pyUtils.h" #include "pxr/base/tf/wrapTypeHelpers.h" #include "pxr/base/tf/pyContainerConversions.h" @@ -65,7 +66,7 @@ static GfRange3d& __itruediv__(GfRange3d &self, double value) return self /= value; } -static size_t __hash__(GfRange3d const &r) { return hash_value(r); } +static size_t __hash__(GfRange3d const &r) { return TfHash{}(r); } } // anonymous namespace diff --git a/pxr/base/gf/wrapRange3f.cpp b/pxr/base/gf/wrapRange3f.cpp index 4d9dc46647..7b1cfbeae4 100644 --- a/pxr/base/gf/wrapRange3f.cpp +++ b/pxr/base/gf/wrapRange3f.cpp @@ -29,6 +29,7 @@ #include "pxr/base/gf/range3f.h" #include "pxr/base/gf/range3d.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/pyUtils.h" #include "pxr/base/tf/wrapTypeHelpers.h" #include "pxr/base/tf/pyContainerConversions.h" @@ -65,7 +66,7 @@ static GfRange3f& __itruediv__(GfRange3f &self, double value) return self /= value; } -static size_t __hash__(GfRange3f const &r) { return hash_value(r); } +static size_t __hash__(GfRange3f const &r) { return TfHash{}(r); } } // anonymous namespace diff --git a/pxr/base/gf/wrapVec.template.cpp b/pxr/base/gf/wrapVec.template.cpp index 6eb236db9a..1afd25ffc7 100644 --- a/pxr/base/gf/wrapVec.template.cpp +++ b/pxr/base/gf/wrapVec.template.cpp @@ -30,6 +30,7 @@ #include "pxr/base/gf/pyBufferUtils.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/py3Compat.h" #include "pxr/base/tf/pyContainerConversions.h" #include "pxr/base/tf/pyUtils.h" @@ -53,8 +54,6 @@ #include #include -#include - #include using namespace boost::python; @@ -180,7 +179,7 @@ static string __repr__({{ VEC }} const &self) { } static size_t __hash__({{ VEC }} const &self) { - return boost::hash<{{ VEC }}>()(self); + return TfHash{}(self); } {% if IS_FLOATING_POINT(SCL) %} diff --git a/pxr/base/gf/wrapVec2d.cpp b/pxr/base/gf/wrapVec2d.cpp index 64ab600151..cd5e987e9a 100644 --- a/pxr/base/gf/wrapVec2d.cpp +++ b/pxr/base/gf/wrapVec2d.cpp @@ -30,6 +30,7 @@ #include "pxr/base/gf/pyBufferUtils.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/py3Compat.h" #include "pxr/base/tf/pyContainerConversions.h" #include "pxr/base/tf/pyUtils.h" @@ -51,8 +52,6 @@ #include #include -#include - #include using namespace boost::python; @@ -178,7 +177,7 @@ static string __repr__(GfVec2d const &self) { } static size_t __hash__(GfVec2d const &self) { - return boost::hash()(self); + return TfHash{}(self); } diff --git a/pxr/base/gf/wrapVec2f.cpp b/pxr/base/gf/wrapVec2f.cpp index 0b14c3fffd..1c2f239eda 100644 --- a/pxr/base/gf/wrapVec2f.cpp +++ b/pxr/base/gf/wrapVec2f.cpp @@ -30,6 +30,7 @@ #include "pxr/base/gf/pyBufferUtils.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/py3Compat.h" #include "pxr/base/tf/pyContainerConversions.h" #include "pxr/base/tf/pyUtils.h" @@ -51,8 +52,6 @@ #include #include -#include - #include using namespace boost::python; @@ -178,7 +177,7 @@ static string __repr__(GfVec2f const &self) { } static size_t __hash__(GfVec2f const &self) { - return boost::hash()(self); + return TfHash{}(self); } diff --git a/pxr/base/gf/wrapVec2h.cpp b/pxr/base/gf/wrapVec2h.cpp index 473ef4eb27..4abf042432 100644 --- a/pxr/base/gf/wrapVec2h.cpp +++ b/pxr/base/gf/wrapVec2h.cpp @@ -30,6 +30,7 @@ #include "pxr/base/gf/pyBufferUtils.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/py3Compat.h" #include "pxr/base/tf/pyContainerConversions.h" #include "pxr/base/tf/pyUtils.h" @@ -51,8 +52,6 @@ #include #include -#include - #include using namespace boost::python; @@ -178,7 +177,7 @@ static string __repr__(GfVec2h const &self) { } static size_t __hash__(GfVec2h const &self) { - return boost::hash()(self); + return TfHash{}(self); } diff --git a/pxr/base/gf/wrapVec2i.cpp b/pxr/base/gf/wrapVec2i.cpp index d9955db45c..89671d9f7b 100644 --- a/pxr/base/gf/wrapVec2i.cpp +++ b/pxr/base/gf/wrapVec2i.cpp @@ -30,6 +30,7 @@ #include "pxr/base/gf/pyBufferUtils.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/py3Compat.h" #include "pxr/base/tf/pyContainerConversions.h" #include "pxr/base/tf/pyUtils.h" @@ -46,8 +47,6 @@ #include #include -#include - #include using namespace boost::python; @@ -173,7 +172,7 @@ static string __repr__(GfVec2i const &self) { } static size_t __hash__(GfVec2i const &self) { - return boost::hash()(self); + return TfHash{}(self); } diff --git a/pxr/base/gf/wrapVec3d.cpp b/pxr/base/gf/wrapVec3d.cpp index 59492e582f..1234e29abe 100644 --- a/pxr/base/gf/wrapVec3d.cpp +++ b/pxr/base/gf/wrapVec3d.cpp @@ -30,6 +30,7 @@ #include "pxr/base/gf/pyBufferUtils.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/py3Compat.h" #include "pxr/base/tf/pyContainerConversions.h" #include "pxr/base/tf/pyUtils.h" @@ -51,8 +52,6 @@ #include #include -#include - #include using namespace boost::python; @@ -178,7 +177,7 @@ static string __repr__(GfVec3d const &self) { } static size_t __hash__(GfVec3d const &self) { - return boost::hash()(self); + return TfHash{}(self); } diff --git a/pxr/base/gf/wrapVec3f.cpp b/pxr/base/gf/wrapVec3f.cpp index 882c401ca6..1bec74d8ac 100644 --- a/pxr/base/gf/wrapVec3f.cpp +++ b/pxr/base/gf/wrapVec3f.cpp @@ -30,6 +30,7 @@ #include "pxr/base/gf/pyBufferUtils.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/py3Compat.h" #include "pxr/base/tf/pyContainerConversions.h" #include "pxr/base/tf/pyUtils.h" @@ -51,8 +52,6 @@ #include #include -#include - #include using namespace boost::python; @@ -178,7 +177,7 @@ static string __repr__(GfVec3f const &self) { } static size_t __hash__(GfVec3f const &self) { - return boost::hash()(self); + return TfHash{}(self); } diff --git a/pxr/base/gf/wrapVec3h.cpp b/pxr/base/gf/wrapVec3h.cpp index 75249ca2af..be6dedb405 100644 --- a/pxr/base/gf/wrapVec3h.cpp +++ b/pxr/base/gf/wrapVec3h.cpp @@ -30,6 +30,7 @@ #include "pxr/base/gf/pyBufferUtils.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/py3Compat.h" #include "pxr/base/tf/pyContainerConversions.h" #include "pxr/base/tf/pyUtils.h" @@ -51,8 +52,6 @@ #include #include -#include - #include using namespace boost::python; @@ -178,7 +177,7 @@ static string __repr__(GfVec3h const &self) { } static size_t __hash__(GfVec3h const &self) { - return boost::hash()(self); + return TfHash{}(self); } diff --git a/pxr/base/gf/wrapVec3i.cpp b/pxr/base/gf/wrapVec3i.cpp index 710cae355f..9ae8f72b9e 100644 --- a/pxr/base/gf/wrapVec3i.cpp +++ b/pxr/base/gf/wrapVec3i.cpp @@ -30,6 +30,7 @@ #include "pxr/base/gf/pyBufferUtils.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/py3Compat.h" #include "pxr/base/tf/pyContainerConversions.h" #include "pxr/base/tf/pyUtils.h" @@ -46,8 +47,6 @@ #include #include -#include - #include using namespace boost::python; @@ -173,7 +172,7 @@ static string __repr__(GfVec3i const &self) { } static size_t __hash__(GfVec3i const &self) { - return boost::hash()(self); + return TfHash{}(self); } diff --git a/pxr/base/gf/wrapVec4d.cpp b/pxr/base/gf/wrapVec4d.cpp index 2674ae27c1..85f79eb6ce 100644 --- a/pxr/base/gf/wrapVec4d.cpp +++ b/pxr/base/gf/wrapVec4d.cpp @@ -30,6 +30,7 @@ #include "pxr/base/gf/pyBufferUtils.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/py3Compat.h" #include "pxr/base/tf/pyContainerConversions.h" #include "pxr/base/tf/pyUtils.h" @@ -51,8 +52,6 @@ #include #include -#include - #include using namespace boost::python; @@ -178,7 +177,7 @@ static string __repr__(GfVec4d const &self) { } static size_t __hash__(GfVec4d const &self) { - return boost::hash()(self); + return TfHash{}(self); } diff --git a/pxr/base/gf/wrapVec4f.cpp b/pxr/base/gf/wrapVec4f.cpp index 24bfb7491f..493177f9d2 100644 --- a/pxr/base/gf/wrapVec4f.cpp +++ b/pxr/base/gf/wrapVec4f.cpp @@ -30,6 +30,7 @@ #include "pxr/base/gf/pyBufferUtils.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/py3Compat.h" #include "pxr/base/tf/pyContainerConversions.h" #include "pxr/base/tf/pyUtils.h" @@ -51,8 +52,6 @@ #include #include -#include - #include using namespace boost::python; @@ -178,7 +177,7 @@ static string __repr__(GfVec4f const &self) { } static size_t __hash__(GfVec4f const &self) { - return boost::hash()(self); + return TfHash{}(self); } diff --git a/pxr/base/gf/wrapVec4h.cpp b/pxr/base/gf/wrapVec4h.cpp index 3969e19287..3a5ccd974e 100644 --- a/pxr/base/gf/wrapVec4h.cpp +++ b/pxr/base/gf/wrapVec4h.cpp @@ -30,6 +30,7 @@ #include "pxr/base/gf/pyBufferUtils.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/py3Compat.h" #include "pxr/base/tf/pyContainerConversions.h" #include "pxr/base/tf/pyUtils.h" @@ -51,8 +52,6 @@ #include #include -#include - #include using namespace boost::python; @@ -178,7 +177,7 @@ static string __repr__(GfVec4h const &self) { } static size_t __hash__(GfVec4h const &self) { - return boost::hash()(self); + return TfHash{}(self); } diff --git a/pxr/base/gf/wrapVec4i.cpp b/pxr/base/gf/wrapVec4i.cpp index c87c840405..d72f03db0b 100644 --- a/pxr/base/gf/wrapVec4i.cpp +++ b/pxr/base/gf/wrapVec4i.cpp @@ -30,6 +30,7 @@ #include "pxr/base/gf/pyBufferUtils.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/py3Compat.h" #include "pxr/base/tf/pyContainerConversions.h" #include "pxr/base/tf/pyUtils.h" @@ -46,8 +47,6 @@ #include #include -#include - #include using namespace boost::python; @@ -173,7 +172,7 @@ static string __repr__(GfVec4i const &self) { } static size_t __hash__(GfVec4i const &self) { - return boost::hash()(self); + return TfHash{}(self); }