diff --git a/pxr/usd/ndr/registry.cpp b/pxr/usd/ndr/registry.cpp index 369ec553a5..53f3591771 100644 --- a/pxr/usd/ndr/registry.cpp +++ b/pxr/usd/ndr/registry.cpp @@ -23,6 +23,7 @@ // #include "pxr/pxr.h" +#include "pxr/base/tf/hash.h" #include "pxr/base/tf/pathUtils.h" #include "pxr/base/tf/stringUtils.h" #include "pxr/base/tf/type.h" @@ -41,8 +42,6 @@ #include "pxr/base/plug/registry.h" #include "pxr/base/tf/envSetting.h" -#include - PXR_NAMESPACE_OPEN_SCOPE TF_DEFINE_ENV_SETTING( @@ -165,11 +164,9 @@ _GetIdentifierForAsset(const SdfAssetPath &asset, const TfToken &subIdentifier, const TfToken &sourceType) { - size_t h = 0; - boost::hash_combine(h, asset); - for (const auto &i : metadata) { - boost::hash_combine(h, i.first.GetString()); - boost::hash_combine(h, i.second); + size_t h = TfHash()(asset); + for (const auto &i : metadata) { + h = TfHash::Combine(h, i.first.GetString(), i.second); } return NdrIdentifier(TfStringPrintf( @@ -183,11 +180,9 @@ static NdrIdentifier _GetIdentifierForSourceCode(const std::string &sourceCode, const NdrTokenMap &metadata) { - size_t h = 0; - boost::hash_combine(h, sourceCode); - for (const auto &i : metadata) { - boost::hash_combine(h, i.first.GetString()); - boost::hash_combine(h, i.second); + size_t h = TfHash()(sourceCode); + for (const auto &i : metadata) { + h = TfHash::Combine(h, i.first.GetString(), i.second); } return NdrIdentifier(std::to_string(h)); }