Update ICU to 54.1 step 1

source/test/intltest/tfsmalls.cpp

 
 /***********************************************************************
  * COPYRIGHT: 
- * Copyright (c) 1997-2012, International Business Machines Corporation
+ * Copyright (c) 1997-2014, International Business Machines Corporation
  * and others. All Rights Reserved.
  ***********************************************************************/
 
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING
 
 #include "intltest.h"
 #include "tfsmalls.h"
+#include "cmemory.h"
 
 #include "unicode/msgfmt.h"
 #include "unicode/choicfmt.h"
 
 #include "unicode/parsepos.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);
     if (!ok) it_errln( msg );
     return ok;
 }*/
 
 void test_ParsePosition( void )
 {
     ParsePosition* pp1 = new ParsePosition();
@@ skipping 214 matching lines @@
     UnicodeString* ucs_ptr = new UnicodeString("pointed-to-unicode-string");
 
     const Formattable ftarray[] = 
     {
         Formattable( 1.0, Formattable::kIsDate ),
         2.0,
         (int32_t)3,
         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)
      && (ft_arr[1].getType() == Formattable::kDouble) && (ft_arr[1].getDouble() == 2.0)
      && (ft_arr[2].getType() == Formattable::kLong)   && (ft_arr[2].getLong()   == (int32_t)3)
      && (ft_arr[3].getType() == Formattable::kString) && (ft_arr[3].getString(temp) == ucs)
      && (ft_arr[4].getType() == Formattable::kString) && (ft_arr[4].getString(temp) == *ucs_ptr) ) {
         it_logln("FT constr. for date, double, long, ustring, ustring* and array tested");
     }else{
         it_errln("*** FT constr. for date, double, long, ustring, ustring* or array");
@@ skipping 109 matching lines @@
                 break;
         case 3: name = "ft"; 
                 if (exec) logln("TestSuite Format/SmallClasses/Formattable (f/chc/sma/ft): ");
                 if (exec) test_Formattable(); 
                 break;
         default: name = ""; break; //needed to end loop
     }
 }
 
 #endif /* #if !UCONFIG_NO_FORMATTING */