ICU-551.41.tar.gz

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

diff --git a/icuSources/test/intltest/tfsmalls.cpp b/icuSources/test/intltest/tfsmalls.cpp
index b32492f84d6aef5affe8f44c9bff1e1623e10bde..80bc1c578cfc390868d7acacab0a5461db7f43ff 100644 (file)
--- a/icuSources/test/intltest/tfsmalls.cpp
+++ b/icuSources/test/intltest/tfsmalls.cpp
@@ -1,7 +1,7 @@
 
 /***********************************************************************
  * COPYRIGHT: 
 
 /***********************************************************************
  * COPYRIGHT: 

- * Copyright (c) 1997-2012, International Business Machines Corporation
+ * Copyright (c) 1997-2014, International Business Machines Corporation

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


@@ -11,6 +11,7 @@
 
 #include "intltest.h"
 #include "tfsmalls.h"
 
 #include "intltest.h"
 #include "tfsmalls.h"

+#include "cmemory.h"

 
 #include "unicode/msgfmt.h"
 #include "unicode/choicfmt.h"
 
 #include "unicode/msgfmt.h"
 #include "unicode/choicfmt.h"


@@ -19,8 +20,6 @@
 #include "unicode/fieldpos.h"
 #include "unicode/fmtable.h"
 
 #include "unicode/fieldpos.h"
 #include "unicode/fmtable.h"
 

-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-

 /*static UBool chkstatus( UErrorCode &status, char* msg = NULL )
 {
     UBool ok = (status == U_ZERO_ERROR);
 /*static UBool chkstatus( UErrorCode &status, char* msg = NULL )
 {
     UBool ok = (status == U_ZERO_ERROR);


@@ -255,7 +254,7 @@ void test_Formattable( void )
         ucs,
         ucs_ptr
     };
         ucs,
         ucs_ptr
     };

-    const int32_t ft_cnt = LENGTHOF(ftarray);
+    const int32_t ft_cnt = UPRV_LENGTHOF(ftarray);

     Formattable ft_arr( ftarray, ft_cnt );
     UnicodeString temp;
     if ((ft_arr[0].getType() == Formattable::kDate)   && (ft_arr[0].getDate()   == 1.0)
     Formattable ft_arr( ftarray, ft_cnt );
     UnicodeString temp;
     if ((ft_arr[0].getType() == Formattable::kDate)   && (ft_arr[0].getDate()   == 1.0)