diff --git a/icu4c/source/common/ucnv_cnv.h b/icu4c/source/common/ucnv_cnv.h index 45100718768..2a97d0348c2 100644 --- a/icu4c/source/common/ucnv_cnv.h +++ b/icu4c/source/common/ucnv_cnv.h @@ -42,73 +42,6 @@ U_CDECL_BEGIN * U+ffff "illegal" */ -#define FromU_CALLBACK_MACRO(context, args, codeUnits, length, codePoint, reason, err) \ - { \ - /*copies current values for the ErrorFunctor to update */ \ - /*Calls the ErrorFunctor */ \ - args->converter->fromUCharErrorBehaviour ( context, \ - args, \ - codeUnits, \ - length, \ - codePoint, \ - reason, \ - err); \ - myTargetIndex = args->target - (char*)myTarget; \ - mySourceIndex = args->source - mySource; \ - } -/* -*/ -#define ToU_CALLBACK_MACRO(context, args, codePoints, length, reason, err) \ - { \ - /*Calls the ErrorFunctor */ \ - args->converter->fromCharErrorBehaviour ( \ - context, \ - args, \ - codePoints, \ - length, \ - reason, \ - err); \ - myTargetIndex = args->target - myTarget; \ - mySourceIndex = args->source - (const char*)mySource; \ - } -/* -*/ -#define FromU_CALLBACK_OFFSETS_LOGIC_MACRO(context, args, codeUnits, length, codePoint, reason, err) \ - { \ - int32_t My_i = myTargetIndex; \ - /*copies current values for the ErrorFunctor to update */ \ - /*Calls the ErrorFunctor */ \ - args->converter->fromUCharErrorBehaviour ( \ - context, \ - args, \ - codeUnits, \ - length, \ - codePoint, \ - reason, \ - err); \ - /*Update the local Indexes so that the conversion can restart at the right points */ \ - myTargetIndex = args->target - (char*)myTarget; \ - mySourceIndex = args->source - mySource; \ - args->offsets = saveOffsets; \ - for (;My_i < myTargetIndex;My_i++) args->offsets[My_i] += currentOffset; \ - } -/* -*/ -#define ToU_CALLBACK_OFFSETS_LOGIC_MACRO(context, args, codePoints, length, reason, err) \ - { \ - args->converter->fromCharErrorBehaviour ( \ - context, \ - args, \ - codePoints, \ - length, \ - reason, \ - err); \ - /*Update the local Indexes so that the conversion can restart at the right points */ \ - myTargetIndex = args->target - myTarget; \ - mySourceIndex = args->source - (const char*)mySource; \ - args->offsets = saveOffsets; \ - for (;My_i < myTargetIndex;My_i++) {args->offsets[My_i] += currentOffset;} \ - } typedef void (*UConverterLoad) (UConverterSharedData *sharedData, const uint8_t *raw, UErrorCode *pErrorCode);