Skip to content

[Vt] Update TF_FOR_ALL to C++11 iterator #3584

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

Open
Cewein wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

[Vt] Update TF_FOR_ALL to C++11 iterator #3584

Show file tree
Hide file tree
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
60 changes: 30 additions & 30 deletions pxr/base/vt/dictionary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,10 +312,10 @@ VtDictionaryOver(VtDictionary *strong, const VtDictionary &weak,
strong->insert(weak.begin(), weak.end());

if (coerceToWeakerOpinionType) {
TF_FOR_ALL(i, *strong) {
VtDictionary::const_iterator j = weak.find(i->first);
for(auto &i: *strong) {
VtDictionary::const_iterator j = weak.find(i.first);
if (j != weak.end()) {
i->second.CastToTypeOf(j->second);
i.second.CastToTypeOf(j->second);
}
}
}
Expand All @@ -330,21 +330,21 @@ VtDictionaryOver(const VtDictionary &strong, VtDictionary *weak,
return;
}
if (coerceToWeakerOpinionType) {
TF_FOR_ALL(it, strong) {
VtDictionary::iterator j = weak->find(it->first);
for(const auto &i: strong) {
VtDictionary::iterator j = weak->find(i.first);
if (j == weak->end()) {
weak->insert(*it);
weak->insert(i);
}
else {
j->second = VtValue::CastToTypeOf(it->second, j->second);
j->second = VtValue::CastToTypeOf(i.second, j->second);
}
}
}
else {
// Can't use map::insert here, because that doesn't overwrite
// values for keys in strong that are already in weak.
TF_FOR_ALL(it, strong) {
(*weak)[it->first] = it->second;
for(auto &it: strong) {
(*weak)[it.first] = it.second;
}
}
}
Expand All @@ -367,19 +367,19 @@ VtDictionaryOverRecursive(VtDictionary *strong, const VtDictionary &weak,
return;
}

TF_FOR_ALL(it, weak) {
for(const auto &it: weak) {
// If both dictionaries have values that are in turn dictionaries,
// recurse:
if (VtDictionaryIsHolding<VtDictionary>(*strong, it->first) &&
VtDictionaryIsHolding<VtDictionary>(weak, it->first)) {
if (VtDictionaryIsHolding<VtDictionary>(*strong, it.first) &&
VtDictionaryIsHolding<VtDictionary>(weak, it.first)) {

const VtDictionary &weakSubDict =
VtDictionaryGet<VtDictionary>(weak, it->first);
VtDictionaryGet<VtDictionary>(weak, it.first);

// Swap out the stored dictionary, mutate it, then swap it back in
// place. This avoids expensive copying. There may still be a copy
// if the VtValue storage is shared.
VtDictionary::iterator i = strong->find(it->first);
VtDictionary::iterator i = strong->find(it.first);
VtDictionary strongSubDict;
i->second.Swap(strongSubDict);
// Modify the extracted dict.
Expand All @@ -390,9 +390,9 @@ VtDictionaryOverRecursive(VtDictionary *strong, const VtDictionary &weak,
} else {
// Insert will set strong with value from weak only if
// strong does not already have a value for that key.
std::pair<VtDictionary::iterator, bool> result =strong->insert(*it);
std::pair<VtDictionary::iterator, bool> result =strong->insert(it);
if (!result.second && coerceToWeakerOpinionType) {
result.first->second.CastToTypeOf(it->second);
result.first->second.CastToTypeOf(it.second);
}
}
}
Expand All @@ -407,19 +407,19 @@ VtDictionaryOverRecursive(const VtDictionary &strong, VtDictionary *weak,
return;
}

TF_FOR_ALL(it, strong) {
for(const auto &it: strong) {
// If both dictionaries have values that are in turn dictionaries,
// recurse:
if (VtDictionaryIsHolding<VtDictionary>(strong, it->first) &&
VtDictionaryIsHolding<VtDictionary>(*weak, it->first)) {
if (VtDictionaryIsHolding<VtDictionary>(strong, it.first) &&
VtDictionaryIsHolding<VtDictionary>(*weak, it.first)) {

VtDictionary const &strongSubDict =
VtDictionaryGet<VtDictionary>(strong, it->first);
VtDictionaryGet<VtDictionary>(strong, it.first);

// Swap out the stored dictionary, mutate it, then swap it back in
// place. This avoids expensive copying. There may still be a copy
// if the VtValue storage is shared.
VtDictionary::iterator i = weak->find(it->first);
VtDictionary::iterator i = weak->find(it.first);
VtDictionary weakSubDict;
i->second.Swap(weakSubDict);
// Modify the extracted dict.
Expand All @@ -429,15 +429,15 @@ VtDictionaryOverRecursive(const VtDictionary &strong, VtDictionary *weak,

} else if (coerceToWeakerOpinionType) {
// Else stomp over weak with strong but with type coersion.
VtDictionary::iterator j = weak->find(it->first);
VtDictionary::iterator j = weak->find(it.first);
if (j == weak->end()) {
weak->insert(*it);
weak->insert(it);
} else {
j->second = VtValue::CastToTypeOf(it->second, j->second);
j->second = VtValue::CastToTypeOf(it.second, j->second);
}
} else {
// Else stomp over weak with strong
(*weak)[it->first] = it->second;
(*weak)[it.first] = it.second;
}
}
}
Expand All @@ -452,12 +452,12 @@ bool operator==(VtDictionary const &lhs, VtDictionary const &rhs)
// Iterate over all key-value pairs in the left-hand side dictionary
// and check if they match up with the content of the right-hand
// side dictionary.
TF_FOR_ALL(it, lhs){
VtDictionary::const_iterator it2 = rhs.find(it->first);
for(const auto &it: lhs){
VtDictionary::const_iterator it2 = rhs.find(it.first);
if (it2 == rhs.end()) {
return false;
}
if (it->second != it2->second) {
if (it.second != it2->second) {
return false;
}
}
Expand All @@ -474,12 +474,12 @@ operator<<(std::ostream &stream, VtDictionary const &dict)
{
bool first = true;
stream << '{';
TF_FOR_ALL(i, dict) {
for(const auto &i: dict) {
if (first)
first = false;
else
stream << ", ";
stream << '\'' << i->first << "': " << i->second;
stream << '\'' << i.first << "': " << i.second;
}
stream << '}';
return stream;
Expand Down
4 changes: 2 additions & 2 deletions pxr/base/vt/testenv/testVtCpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ static void testArray() {
VtDoubleArray da(60);

double val = 1;
TF_FOR_ALL(elem, da)
*elem = val++;
for(auto& elem: da)
elem = val++;

val = 1;
for (VtDoubleArray::const_iterator i = da.begin(); i != da.end(); ++i)
Expand Down
4 changes: 2 additions & 2 deletions pxr/base/vt/value.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,12 +515,12 @@ std::ostream &
VtStreamOut(vector<VtValue> const &val, std::ostream &stream) {
bool first = true;
stream << '[';
TF_FOR_ALL(i, val) {
for(const VtValue &i: val) {
if (first)
first = false;
else
stream << ", ";
stream << *i;
stream << i;
}
stream << ']';
return stream;
Expand Down
14 changes: 7 additions & 7 deletions pxr/base/vt/wrapDictionary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ struct VtValueArrayToPython
{
// TODO Use result converter. TfPySequenceToList.
list result;
TF_FOR_ALL(i, v) {
object o = TfPyObject(*i);
for(const VtValue &i: v) {
object o = TfPyObject(i);
result.append(o);
}
return incref(result.ptr());
Expand All @@ -55,8 +55,8 @@ struct VtDictionaryArrayToPython
{
// TODO Use result converter. TfPySequenceToList.
list result;
TF_FOR_ALL(i, v) {
object o = TfPyObject(*i);
for(const VtDictionary &i: v) {
object o = TfPyObject(i);
result.append(o);
}
return incref(result.ptr());
Expand All @@ -72,9 +72,9 @@ struct VtDictionaryToPython

// TODO Use result converter TfPyMapToDictionary??
dict result;
TF_FOR_ALL(i, v) {
object o = TfPyObject(i->second);
result.setdefault(i->first, o);
for(const auto &i: v) {
object o = TfPyObject(i.second);
result.setdefault(i.first, o);
}
return incref(result.ptr());
}
Expand Down