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); |