Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(119)

Unified Diff: source/common/unistr.cpp

Issue 845603002: Update ICU to 54.1 step 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master
Patch Set: remove unusued directories Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/common/uniset_props.cpp ('k') | source/common/unorm.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/common/unistr.cpp
diff --git a/source/common/unistr.cpp b/source/common/unistr.cpp
index a21c1b4a26571f3e3ecc9fa69bd92b0a53d6ec88..f103e816835a8453f21fff84ead68b38f3228ba5 100644
--- a/source/common/unistr.cpp
+++ b/source/common/unistr.cpp
@@ -1,6 +1,6 @@
/*
******************************************************************************
-* Copyright (C) 1999-2013, International Business Machines Corporation and
+* Copyright (C) 1999-2014, International Business Machines Corporation and
* others. All Rights Reserved.
******************************************************************************
*
@@ -459,12 +459,12 @@ UnicodeString::fastCopyFrom(const UnicodeString &src) {
UnicodeString &
UnicodeString::copyFrom(const UnicodeString &src, UBool fastCopy) {
// if assigning to ourselves, do nothing
- if(this == 0 || this == &src) {
+ if(this == &src) {
return *this;
}
// is the right side bogus?
- if(&src == 0 || src.isBogus()) {
+ if(src.isBogus()) {
setToBogus();
return *this;
}
« no previous file with comments | « source/common/uniset_props.cpp ('k') | source/common/unorm.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698