ICU-59117.0.1.tar.gz

[apple/icu.git] / icuSources / test / intltest / selfmts.cpp

diff --git a/icuSources/test/intltest/selfmts.cpp b/icuSources/test/intltest/selfmts.cpp
index 3c7796d8bdbc86ca5d42a5ea8dc4eeade3c8f128..81b73aec796079937db685d9c6f5b8a6b10b9f52 100644 (file)
--- a/icuSources/test/intltest/selfmts.cpp
+++ b/icuSources/test/intltest/selfmts.cpp
@@ -1,6 +1,8 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /********************************************************************
  * COPYRIGHT: 
- * Copyright (c) 1997-2011, International Business Machines Corporation and
+ * Copyright (c) 1997-2014, International Business Machines Corporation and
  * others. All Rights Reserved.
  * Copyright (C) 2010 , Yahoo! Inc. 
  ********************************************************************/
@@ -13,8 +15,6 @@
 #include "cmemory.h"
 #include "unicode/selfmt.h"
 
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
 #define SIMPLE_PATTERN_STRING                                                    "feminine {feminineVerbValue} other{otherVerbValue}"
 
 
@@ -183,7 +183,7 @@ void SelectFormatTest::selectFormatUnitTest(/*char *par*/)
     selFmt = NULL;
 
     selFmt = new SelectFormat( SIMPLE_PATTERN , status); 
-    for (int32_t i = 0; i < LENGTHOF(keywords); i++ ){
+    for (int32_t i = 0; i < UPRV_LENGTHOF(keywords); i++ ){
         status = U_ZERO_ERROR;
         selFmt->format( keywords[i], result , ignore , status);
         if (!U_FAILURE(status)) {