diff options
author | Karen Arutyunov <karen@codesynthesis.com> | 2020-07-21 18:09:47 +0300 |
---|---|---|
committer | Karen Arutyunov <karen@codesynthesis.com> | 2020-07-21 18:09:47 +0300 |
commit | 0937885bc90bd2c2d938bd2e16e0c164e80625fe (patch) | |
tree | 004d3e91b98230cec3c69b4950d89206531f648b /libicui18n/libicui18n/rbtz.cpp.patch | |
parent | b7b91802a7d16cd9a435bcede5f31d2e3ccee653 (diff) |
Release version 65.1.0+4v65.1.0+4
Fix Clang 10 compilation errors
Canonicalize license in manifests
Add glue buildfile
Diffstat (limited to 'libicui18n/libicui18n/rbtz.cpp.patch')
-rw-r--r-- | libicui18n/libicui18n/rbtz.cpp.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/libicui18n/libicui18n/rbtz.cpp.patch b/libicui18n/libicui18n/rbtz.cpp.patch new file mode 100644 index 0000000..551cebe --- /dev/null +++ b/libicui18n/libicui18n/rbtz.cpp.patch @@ -0,0 +1,29 @@ +--- libicui18n/i18n/rbtz.cpp 2019-12-23 14:38:40.227889254 +0300 ++++ libicui18n/rbtz.cpp 2020-07-21 14:30:49.408841121 +0300 +@@ -76,7 +76,7 @@ RuleBasedTimeZone::~RuleBasedTimeZone() + + RuleBasedTimeZone& + RuleBasedTimeZone::operator=(const RuleBasedTimeZone& right) { +- if (*this != right) { ++ if (!(*this == right)) { + BasicTimeZone::operator=(right); + deleteRules(); + fInitialRule = right.fInitialRule->clone(); +@@ -98,7 +98,7 @@ RuleBasedTimeZone::operator==(const Time + return FALSE; + } + RuleBasedTimeZone *rbtz = (RuleBasedTimeZone*)&that; +- if (*fInitialRule != *(rbtz->fInitialRule)) { ++ if (!(*fInitialRule == *(rbtz->fInitialRule))) { + return FALSE; + } + if (compareRules(fHistoricRules, rbtz->fHistoricRules) +@@ -532,7 +532,7 @@ RuleBasedTimeZone::hasSameRules(const Ti + return FALSE; + } + const RuleBasedTimeZone& that = (const RuleBasedTimeZone&)other; +- if (*fInitialRule != *(that.fInitialRule)) { ++ if (!(*fInitialRule == *(that.fInitialRule))) { + return FALSE; + } + if (compareRules(fHistoricRules, that.fHistoricRules) |