ICU-57131.0.1.tar.gz

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

diff --git a/icuSources/test/intltest/msfmrgts.cpp b/icuSources/test/intltest/msfmrgts.cpp
index ebf410dd432e819f9385dccd9999986d746508a2..44bcad2aa1dc4b4efce0d122f7bca8cba938ab81 100644 (file)
--- a/icuSources/test/intltest/msfmrgts.cpp
+++ b/icuSources/test/intltest/msfmrgts.cpp
@@ -1,6 +1,6 @@
 /***********************************************************************
  * COPYRIGHT: 
 /***********************************************************************
  * COPYRIGHT: 

- * Copyright (c) 1997-2011, International Business Machines Corporation
+ * Copyright (c) 1997-2016, International Business Machines Corporation

  * and others. All Rights Reserved.
  ***********************************************************************/
  
  * and others. All Rights Reserved.
  ***********************************************************************/
  


@@ -17,6 +17,7 @@
 #include "unicode/numfmt.h"
 #include "unicode/choicfmt.h"
 #include "unicode/gregocal.h"
 #include "unicode/numfmt.h"
 #include "unicode/choicfmt.h"
 #include "unicode/gregocal.h"

+#include "cmemory.h"

 #include "putilimp.h"
 
 // *****************************************************************************
 #include "putilimp.h"
 
 // *****************************************************************************


@@ -334,7 +335,7 @@ void MessageFormatRegressionTest::Test4104976()
         UnicodeString("xyz"), 
         UnicodeString("abc")
     };
         UnicodeString("xyz"), 
         UnicodeString("abc")
     };

-    int32_t formats_length = (int32_t)(sizeof(formats)/sizeof(formats[0]));
+    int32_t formats_length = UPRV_LENGTHOF(formats);

     UErrorCode status = U_ZERO_ERROR;
     ChoiceFormat *cf = new ChoiceFormat(limits, formats, formats_length);
     failure(status, "new ChoiceFormat");
     UErrorCode status = U_ZERO_ERROR;
     ChoiceFormat *cf = new ChoiceFormat(limits, formats, formats_length);
     failure(status, "new ChoiceFormat");