Index: source/tools/toolutil/swapimpl.cpp |
diff --git a/source/tools/toolutil/swapimpl.cpp b/source/tools/toolutil/swapimpl.cpp |
index 6b988e2e9dad330ab4f741f80745c37064cb9a1b..dbeff2d7b8ac6c0c888bf29a7d351c317ce8a7e5 100644 |
--- a/source/tools/toolutil/swapimpl.cpp |
+++ b/source/tools/toolutil/swapimpl.cpp |
@@ -1,7 +1,7 @@ |
/* |
******************************************************************************* |
* |
-* Copyright (C) 2005-2012, International Business Machines |
+* Copyright (C) 2005-2014, International Business Machines |
* Corporation and others. All Rights Reserved. |
* |
******************************************************************************* |
@@ -67,8 +67,6 @@ U_NAMESPACE_USE |
/* definitions */ |
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0])) |
- |
/* Unicode property (value) aliases data swapping --------------------------- */ |
static int32_t U_CALLCONV |
@@ -500,9 +498,11 @@ ubidi_swap(const UDataSwapper *ds, |
ds->swapArray32(ds, inBytes+offset, count, outBytes+offset, pErrorCode); |
offset+=count; |
- /* just skip the uint8_t jgArray[] */ |
+ /* just skip the uint8_t jgArray[] and jgArray2[] */ |
count=indexes[UBIDI_IX_JG_LIMIT]-indexes[UBIDI_IX_JG_START]; |
offset+=count; |
+ count=indexes[UBIDI_IX_JG_LIMIT2]-indexes[UBIDI_IX_JG_START2]; |
+ offset+=count; |
U_ASSERT(offset==size); |
} |
@@ -790,7 +790,7 @@ udata_swap(const UDataSwapper *ds, |
} |
/* dispatch to the swap function for the dataFormat */ |
- for(i=0; i<LENGTHOF(swapFns); ++i) { |
+ for(i=0; i<UPRV_LENGTHOF(swapFns); ++i) { |
if(0==memcmp(swapFns[i].dataFormat, pInfo->dataFormat, 4)) { |
swappedLength=swapFns[i].swapFn(ds, inData, length, outData, pErrorCode); |