diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-09-28 19:07:48 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-09-28 19:22:18 +0300 |
| commit | adcd08fbf4d96f8f52cef81895bda202c9e45896 (patch) | |
| tree | 3e8643d7d2b19c86d723c79042e8b528a9508dd1 /indra/llinventory | |
| parent | e3b869e6f12a9d285ca3db4a2e7f4f0fa1ff8b26 (diff) | |
Revert "Merge branch 'c++17' into DRTVWR-522-maint"
This reverts commit 203ea3a70a775a09cbbffb1740ab7c58f1780baa, reversing
changes made to 8e3f0778863a5aa337d1148a243ea91d238a8ac5.
# Conflicts:
# indra/newview/llmachineid.cpp
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llparcel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp index 2f577bfb07..e2469f3c7e 100644 --- a/indra/llinventory/llparcel.cpp +++ b/indra/llinventory/llparcel.cpp @@ -1268,5 +1268,5 @@ U32 LLParcel::countExperienceKeyType( U32 type ) return std::count_if( boost::begin(mExperienceKeys | boost::adaptors::map_values), boost::end(mExperienceKeys | boost::adaptors::map_values), - [type](U32 key){ return key == type; }); + std::bind2nd(std::equal_to<U32>(), type)); } |