organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-08 23:10:40 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-6989 merge of r26622, fix urename

Browse source 
X-SVN-Rev: 26623
This commit is contained in:
Steven R. Loomis 2009-09-12 04:06:28 +00:00
parent bec6614bdd
commit d51a3d446c
4 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
icu4c/source/common/ucnvsel.cpp
View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2008, International Business Machines
* Copyright (C) 2008-2009, International Business Machines
* Corporation, Google and others. All Rights Reserved.
*
*******************************************************************************
@ -663,7 +663,7 @@ static const UEnumeration defaultEncodings = {
// internal fn to intersect two sets of masks
// returns whether the mask has reduced to all zeros
UBool intersectMasks(uint32_t* dest, const uint32_t* source1, int32_t len) {
static UBool intersectMasks(uint32_t* dest, const uint32_t* source1, int32_t len) {
int32_t i;
uint32_t oredDest = 0;
for (i = 0 ; i < len ; ++i) {
@ -674,7 +674,7 @@ UBool intersectMasks(uint32_t* dest, const uint32_t* source1, int32_t len) {
// internal fn to count how many 1's are there in a mask
// algorithm taken from http://graphics.stanford.edu/~seander/bithacks.html
int16_t countOnes(uint32_t* mask, int32_t len) {
static int16_t countOnes(uint32_t* mask, int32_t len) {
int32_t i, totalOnes = 0;
for (i = 0 ; i < len ; ++i) {
uint32_t ent = mask[i];

3
icu4c/source/common/unicode/urename.h
View file

@ -118,6 +118,7 @@
#define bms_open U_ICU_FUNCTION_RENAME(bms_open)
#define bms_search U_ICU_FUNCTION_RENAME(bms_search)
#define bms_setTargetString U_ICU_FUNCTION_RENAME(bms_setTargetString)
#define buildWSConfusableData U_ICU_FUNCTION_RENAME(buildWSConfusableData)
#define cmemory_cleanup U_ICU_FUNCTION_RENAME(cmemory_cleanup)
#define cmemory_inUse U_ICU_FUNCTION_RENAME(cmemory_inUse)
#define decimfmtAffixPatternValueComparator U_ICU_FUNCTION_RENAME(decimfmtAffixPatternValueComparator)
@ -707,6 +708,7 @@
#define ucol_equals U_ICU_FUNCTION_RENAME(ucol_equals)
#define ucol_forceHanImplicit U_ICU_FUNCTION_RENAME(ucol_forceHanImplicit)
#define ucol_forgetUCA U_ICU_FUNCTION_RENAME(ucol_forgetUCA)
#define ucol_freeOffsetBuffer U_ICU_FUNCTION_RENAME(ucol_freeOffsetBuffer)
#define ucol_getAttribute U_ICU_FUNCTION_RENAME(ucol_getAttribute)
#define ucol_getAttributeOrDefault U_ICU_FUNCTION_RENAME(ucol_getAttributeOrDefault)
#define ucol_getAvailable U_ICU_FUNCTION_RENAME(ucol_getAvailable)
@ -1878,7 +1880,6 @@
#define SingleTableProcessor U_ICU_FUNCTION_RENAME(SingleTableProcessor)
#define SpoofData U_ICU_FUNCTION_RENAME(SpoofData)
#define SpoofImpl U_ICU_FUNCTION_RENAME(SpoofImpl)
#define SpoofImpl*, U_ICU_FUNCTION_RENAME(SpoofImpl*,)
#define StateTableProcessor U_ICU_FUNCTION_RENAME(StateTableProcessor)
#define StringCharacterIterator U_ICU_FUNCTION_RENAME(StringCharacterIterator)
#define StringEnumeration U_ICU_FUNCTION_RENAME(StringEnumeration)

4
icu4c/source/tools/genren/Makefile
View file

@ -1,6 +1,6 @@
#******************************************************************************
#
# Copyright (C) 2002-2008, International Business Machines
# Copyright (C) 2002-2009, International Business Machines
# Corporation and others. All Rights Reserved.
#
#******************************************************************************
@ -11,7 +11,7 @@ top_srcdir = $(TOP)
top_builddir = $(TOP)
-include $(TOP)/icudefs.mk
include $(TOP)/icudefs.mk
ICUDIR=ICUunrenamed
#SO=so

17
icu4c/source/tools/genren/genren.pl
View file

@ -158,8 +158,9 @@ for(;@ARGV; shift(@ARGV)) {
if(!($type =~ /[UAwW?]/)) {
if(/@@/) { # These would be imports
&verbose( "Import: $_ \"$type\"\n");
} elsif (/::/) { # C++ methods, stuff class name in associative array
&verbose( "C++ method: $_\n");
} elsif (/^[^\(]*::/) { # C++ methods, stuff class name in associative array
## DON'T match ... ( foo::bar ... want :: to be to the left of paren
## icu_2_0::CharString::~CharString(void) -> CharString
@CppName = split(/::/); ## remove scope stuff
if(@CppName>1) {
@ -173,18 +174,22 @@ for(;@ARGV; shift(@ARGV)) {
} elsif($CppName[0] =~ /^~/) {
&verbose ("Skipping C++ destructor: $_\n");
} else {
&verbose( " Class: '$CppName[0]': $_ \n");
$CppClasses{$CppName[0]}++;
}
} elsif ( my ($cfn) = m/^([A-Za-z0-9_]*)\(.*/ ) {
&verbose ( "$ARGV[0]: got global C++ function $cfn with '$_'\n" );
$CFuncs{$cfn}++;
} elsif ( /\(/) { # These are strange functions
print STDERR "$_\n";
print STDERR "$ARGV[0]: Not sure what to do with '$_'\n";
} elsif ( /icu_/) {
print STDERR "Skipped strange mangled function $_\n";
print STDERR "$ARGV[0]: Skipped strange mangled function $_\n";
} elsif ( /^vtable for /) {
print STDERR "Skipped vtable $_\n";
print STDERR "$ARGV[0]: Skipped vtable $_\n";
} elsif ( /^typeinfo for /) {
print STDERR "Skipped typeinfo $_\n";
print STDERR "$ARGV[0]: Skipped typeinfo $_\n";
} elsif ( /operator\+/ ) {
print STDERR "Skipped ignored function $_\n";
print STDERR "$ARGV[0]: Skipped ignored function $_\n";
} else { # This is regular C function
&verbose( "C func: $_\n");
@funcname = split(/[\(\s+]/);