Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove unused BoostHasher from base/tf test case #2786

Merged
merged 1 commit into from
Nov 17, 2023
Merged

Remove unused BoostHasher from base/tf test case #2786

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 0 additions & 24 deletions pxr/base/tf/testenv/hash.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@
#include "pxr/base/tf/token.h"
#include "pxr/base/tf/weakPtr.h"

// We're getting rid of our dependency on boost::hash -- this code is left
// commented for testing purposes, for now (6/2020).
//#include <boost/functional/hash.hpp>

#include <set>
#include <string>
#include <vector>
Expand Down Expand Up @@ -156,23 +152,6 @@ _TestStatsTwo(Hasher const &h, char const *label)
printf("took %f seconds\n", sw.GetSeconds());
}

/* See comment at top of file.

struct BoostHasher
{
size_t operator()(uint64_t x) const {
return boost::hash<uint64_t>()(x);
}

size_t operator()(Two t) const {
size_t seed = 0;
boost::hash_combine(seed, t.x);
boost::hash_combine(seed, t.y);
return seed;
}
};
*/

struct TfHasher
{
size_t operator()(uint64_t x) const {
Expand Down Expand Up @@ -325,12 +304,9 @@ Test_TfHash()
printf("hash(unique_ptr): %zu\n", h(std::make_unique<int>(7)));

TfHasher tfh;
//BoostHasher bh;

_TestStatsOne(tfh, "TfHash");
_TestStatsTwo(tfh, "TfHash");
//_TestStatsOne(bh, "Boost hash");
//_TestStatsTwo(bh, "Boost hash");

bool status = true;
return status;
Expand Down