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

Unified Diff: source/i18n/ucoleitr.cpp

Issue 2440913002: Update ICU to 58.1
Patch Set: Created 4 years, 2 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/i18n/ucol_sit.cpp ('k') | source/i18n/ucsdet.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/i18n/ucoleitr.cpp
diff --git a/source/i18n/ucoleitr.cpp b/source/i18n/ucoleitr.cpp
index 66b01727e7e878533ec322ed9ff0a9e9c272b552..9c73afda19b61b765bcc3488246efbc9a390971e 100644
--- a/source/i18n/ucoleitr.cpp
+++ b/source/i18n/ucoleitr.cpp
@@ -1,6 +1,8 @@
+// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
/*
******************************************************************************
-* Copyright (C) 2001-2015, International Business Machines
+* Copyright (C) 2001-2016, International Business Machines
* Corporation and others. All Rights Reserved.
******************************************************************************
*
@@ -34,9 +36,9 @@ U_NAMESPACE_USE
#define DEFAULT_BUFFER_SIZE 16
#define BUFFER_GROW 8
-#define ARRAY_COPY(dst, src, count) uprv_memcpy((void *) (dst), (void *) (src), (count) * sizeof (src)[0])
+#define ARRAY_COPY(dst, src, count) uprv_memcpy((void *) (dst), (void *) (src), (size_t)(count) * sizeof (src)[0])
-#define NEW_ARRAY(type, count) (type *) uprv_malloc((count) * sizeof(type))
+#define NEW_ARRAY(type, count) (type *) uprv_malloc((size_t)(count) * sizeof(type))
#define DELETE_ARRAY(array) uprv_free((void *) (array))
@@ -222,11 +224,11 @@ uint64_t UCollationPCE::processCE(uint32_t ce)
switch(strength) {
default:
tertiary = ucol_tertiaryOrder(ce);
- /* note fall-through */
+ U_FALLTHROUGH;
case UCOL_SECONDARY:
secondary = ucol_secondaryOrder(ce);
- /* note fall-through */
+ U_FALLTHROUGH;
case UCOL_PRIMARY:
primary = ucol_primaryOrder(ce);
« no previous file with comments | « source/i18n/ucol_sit.cpp ('k') | source/i18n/ucsdet.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698