ICU-511.25.tar.gz

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

diff --git a/icuSources/test/intltest/citrtest.cpp b/icuSources/test/intltest/citrtest.cpp
index 8f2059fb7c972ed5fc044c02d4ebed6f11ca7f63..bc9d7439238dc3e4c818d339e186a5ecf5956d2a 100644 (file)
--- a/icuSources/test/intltest/citrtest.cpp
+++ b/icuSources/test/intltest/citrtest.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************************
  * COPYRIGHT: 
 /****************************************************************************************
  * COPYRIGHT: 

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

  * others. All Rights Reserved.
  * Modification History:
  *
  * others. All Rights Reserved.
  * Modification History:
  *


@@ -9,7 +9,7 @@
  ****************************************************************************************/
 
 #include <string.h>
  ****************************************************************************************/
 
 #include <string.h>

-#include <typeinfo>  // for 'typeid' to work
+#include "utypeinfo.h"  // for 'typeid' to work

 
 #include "unicode/chariter.h"
 #include "unicode/ustring.h"
 
 #include "unicode/chariter.h"
 #include "unicode/ustring.h"


@@ -18,6 +18,7 @@
 #include "unicode/uchriter.h"
 #include "unicode/uiter.h"
 #include "unicode/putil.h"
 #include "unicode/uchriter.h"
 #include "unicode/uiter.h"
 #include "unicode/putil.h"

+#include "unicode/utf16.h"

 #include "citrtest.h"
 
 
 #include "citrtest.h"
 
 


@@ -102,20 +103,20 @@ public:
         case kStart:
             pos = begin;
             if(delta > 0) {
         case kStart:
             pos = begin;
             if(delta > 0) {

-                UTF_FWD_N(text, pos, end, delta);
+                U16_FWD_N(text, pos, end, delta);

             }
             break;
         case kCurrent:
             if(delta > 0) {
             }
             break;
         case kCurrent:
             if(delta > 0) {

-                UTF_FWD_N(text, pos, end, delta);
+                U16_FWD_N(text, pos, end, delta);

             } else {
             } else {

-                UTF_BACK_N(text, begin, pos, -delta);
+                U16_BACK_N(text, begin, pos, -delta);

             }
             break;
         case kEnd:
             pos = end;
             if(delta < 0) {
             }
             break;
         case kEnd:
             pos = end;
             if(delta < 0) {

-                UTF_BACK_N(text, begin, pos, -delta);
+                U16_BACK_N(text, begin, pos, -delta);

             }
             break;
         default:
             }
             break;
         default:


@@ -666,7 +667,7 @@ void CharIterTest::TestIterationUChar32() {
         c=iter.first32PostInc();
         if(c != text.char32At(i))
             errln("first32PostInc failed.  Expected->%X Got->%X", text.char32At(i), c);
         c=iter.first32PostInc();
         if(c != text.char32At(i))
             errln("first32PostInc failed.  Expected->%X Got->%X", text.char32At(i), c);

-        if(iter.getIndex() != UTF16_CHAR_LENGTH(c) + i)
+        if(iter.getIndex() != U16_LENGTH(c) + i)

             errln((UnicodeString)"getIndex() after first32PostInc() failed");
 
         iter.setToStart();
             errln((UnicodeString)"getIndex() after first32PostInc() failed");
 
         iter.setToStart();