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

added lexicographical_compare dummy implementation for being compliant with c++14 #201

Merged
merged 1 commit into from
Oct 27, 2024
Merged

added lexicographical_compare dummy implementation for being compliant with c++14 #201

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
19 changes: 17 additions & 2 deletions src/prim-types.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,21 @@

namespace tinyusdz {

template<class InputIt1, class InputIt2>
bool lexicographical_compare(InputIt1 first1, InputIt1 last1,
InputIt2 first2, InputIt2 last2)
{
for (; (first1 != last1) && (first2 != last2); ++first1, (void) ++first2)
{
if (*first1 < *first2)
return true;
if (*first2 < *first1)
return false;
}

return (first1 == last1) && (first2 != last2);
}

nonstd::optional<Interpolation> InterpolationFromString(const std::string &v) {
if ("faceVarying" == v) {
return Interpolation::FaceVarying;
Expand Down Expand Up @@ -380,7 +395,7 @@ bool Path::LessThan(const Path &lhs, const Path &rhs) {
return lhs_prop_part.empty();
}

return std::lexicographical_compare(
return ::tinyusdz::lexicographical_compare(
lhs_prop_part.begin(), lhs_prop_part.end(), rhs_prop_part.begin(),
rhs_prop_part.end());

Expand Down Expand Up @@ -425,7 +440,7 @@ bool Path::LessThan(const Path &lhs, const Path &rhs) {
// DCOUT("child_idx = " << child_idx);

// compare child node
return std::lexicographical_compare(
return ::tinyusdz::lexicographical_compare(
lhs_prim_names[child_idx].begin(), lhs_prim_names[child_idx].end(),
rhs_prim_names[child_idx].begin(), rhs_prim_names[child_idx].end());
}
Expand Down
Loading