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

Unified Diff: source/common/unistr_case.cpp

Issue 1621843002: ICU 56 update step 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@561
Patch Set: Created 4 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/unistr.cpp ('k') | source/common/unistr_cnv.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/common/unistr_case.cpp
diff --git a/source/common/unistr_case.cpp b/source/common/unistr_case.cpp
index 8b1023a5e108dadca145b08f1b254f5a8e97f345..1b52eb60decb8e983b8a13708d1d39a2ecb41ba7 100644
--- a/source/common/unistr_case.cpp
+++ b/source/common/unistr_case.cpp
@@ -1,7 +1,7 @@
/*
*******************************************************************************
*
-* Copyright (C) 1999-2011, International Business Machines
+* Copyright (C) 1999-2014, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@@ -100,11 +100,11 @@ UnicodeString::caseMap(const UCaseMap *csm,
UChar *oldArray;
int32_t oldLength;
- if(fFlags&kUsingStackBuffer) {
+ if(fUnion.fFields.fLengthAndFlags&kUsingStackBuffer) {
// copy the stack buffer contents because it will be overwritten
- u_memcpy(oldStackBuffer, fUnion.fStackBuffer, fShortLength);
oldArray = oldStackBuffer;
- oldLength = fShortLength;
+ oldLength = getShortLength();
+ u_memcpy(oldStackBuffer, fUnion.fStackFields.fBuffer, oldLength);
} else {
oldArray = getArrayStart();
oldLength = length();
« no previous file with comments | « source/common/unistr.cpp ('k') | source/common/unistr_cnv.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698