svl/source/items/macitem.cxx | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
New commits: commit e9774088efddff4383af4f3c55d9c8287d258212 Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Sun Nov 25 17:13:19 2018 +0100 Commit: Stephan Bergmann <sberg...@redhat.com> CommitDate: Fri Dec 7 07:48:20 2018 +0100 Revert "Blind fix for pre-C++14 std::equal, for now" This reverts commit 75299cd119dcb3121540471354d2b33af7f6684d, now that we have full C++17 support. Change-Id: I6616a724394d6f9f6c386f7aa48ee386433bec50 Reviewed-on: https://gerrit.libreoffice.org/63990 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx index 7cad10f07a63..f45b7bfe9bf2 100644 --- a/svl/source/items/macitem.cxx +++ b/svl/source/items/macitem.cxx @@ -81,16 +81,15 @@ bool SvxMacroTableDtor::operator==( const SvxMacroTableDtor& rOther ) const { // Count different => odd in any case // Compare single ones; the sequence matters due to performance reasons - return aSvxMacroTable.size() == rOther.aSvxMacroTable.size() - && std::equal(aSvxMacroTable.begin(), aSvxMacroTable.end(), - rOther.aSvxMacroTable.begin(), - [](const SvxMacroTable::value_type& rOwnEntry, const SvxMacroTable::value_type& rOtherEntry) { - const SvxMacro& rOwnMac = rOwnEntry.second; - const SvxMacro& rOtherMac = rOtherEntry.second; - return rOwnEntry.first == rOtherEntry.first - && rOwnMac.GetLibName() == rOtherMac.GetLibName() - && rOwnMac.GetMacName() == rOtherMac.GetMacName(); - }); + return std::equal(aSvxMacroTable.begin(), aSvxMacroTable.end(), + rOther.aSvxMacroTable.begin(), rOther.aSvxMacroTable.end(), + [](const SvxMacroTable::value_type& rOwnEntry, const SvxMacroTable::value_type& rOtherEntry) { + const SvxMacro& rOwnMac = rOwnEntry.second; + const SvxMacro& rOtherMac = rOtherEntry.second; + return rOwnEntry.first == rOtherEntry.first + && rOwnMac.GetLibName() == rOtherMac.GetLibName() + && rOwnMac.GetMacName() == rOtherMac.GetMacName(); + }); } void SvxMacroTableDtor::Read( SvStream& rStrm ) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits