Kaydet (Commit) e9774088 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Revert "Blind fix for pre-C++14 std::equal, for now"

This reverts commit 75299cd1, now that we have
full C++17 support.

Change-Id: I6616a724394d6f9f6c386f7aa48ee386433bec50
Reviewed-on: https://gerrit.libreoffice.org/63990
Tested-by: Jenkins
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 665ac8f3
...@@ -81,16 +81,15 @@ bool SvxMacroTableDtor::operator==( const SvxMacroTableDtor& rOther ) const ...@@ -81,16 +81,15 @@ bool SvxMacroTableDtor::operator==( const SvxMacroTableDtor& rOther ) const
{ {
// Count different => odd in any case // Count different => odd in any case
// Compare single ones; the sequence matters due to performance reasons // Compare single ones; the sequence matters due to performance reasons
return aSvxMacroTable.size() == rOther.aSvxMacroTable.size() return std::equal(aSvxMacroTable.begin(), aSvxMacroTable.end(),
&& std::equal(aSvxMacroTable.begin(), aSvxMacroTable.end(), rOther.aSvxMacroTable.begin(), rOther.aSvxMacroTable.end(),
rOther.aSvxMacroTable.begin(), [](const SvxMacroTable::value_type& rOwnEntry, const SvxMacroTable::value_type& rOtherEntry) {
[](const SvxMacroTable::value_type& rOwnEntry, const SvxMacroTable::value_type& rOtherEntry) { const SvxMacro& rOwnMac = rOwnEntry.second;
const SvxMacro& rOwnMac = rOwnEntry.second; const SvxMacro& rOtherMac = rOtherEntry.second;
const SvxMacro& rOtherMac = rOtherEntry.second; return rOwnEntry.first == rOtherEntry.first
return rOwnEntry.first == rOtherEntry.first && rOwnMac.GetLibName() == rOtherMac.GetLibName()
&& rOwnMac.GetLibName() == rOtherMac.GetLibName() && rOwnMac.GetMacName() == rOtherMac.GetMacName();
&& rOwnMac.GetMacName() == rOtherMac.GetMacName(); });
});
} }
void SvxMacroTableDtor::Read( SvStream& rStrm ) void SvxMacroTableDtor::Read( SvStream& rStrm )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment