From 27fd8e382d11e5596cd485b6937e44627e676e63 Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Tue, 23 Aug 2005 18:44:52 +0000 Subject: [PATCH] ICU-4733 Use int32_t instead of int. X-SVN-Rev: 18458 --- icu4c/source/common/rbbirb.h | 4 ++-- icu4c/source/common/rbbiscan.h | 10 +++++----- icu4c/source/common/ustrfmt.c | 4 ++-- icu4c/source/common/ustrfmt.h | 4 ++-- icu4c/source/i18n/nfrlist.h | 4 ++-- icu4c/source/i18n/regexcmp.h | 8 ++++---- icu4c/source/i18n/regeximp.h | 4 ++-- icu4c/source/i18n/ucol_elm.h | 10 +++++----- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/icu4c/source/common/rbbirb.h b/icu4c/source/common/rbbirb.h index b39e3694524..d7a5383606c 100644 --- a/icu4c/source/common/rbbirb.h +++ b/icu4c/source/common/rbbirb.h @@ -1,7 +1,7 @@ // // rbbirb.h // -// Copyright (C) 2002-2004, International Business Machines Corporation and others. +// Copyright (C) 2002-2005, International Business Machines Corporation and others. // All Rights Reserved. // // This file contains declarations for several classes from the @@ -84,7 +84,7 @@ public: #else // A do-nothing inline function for non-debug builds. Member funcs can't be empty // or the call sites won't compile. - int fFakeField; + int32_t fFakeField; #define rbbiSymtablePrint() fFakeField=0; #endif diff --git a/icu4c/source/common/rbbiscan.h b/icu4c/source/common/rbbiscan.h index fff5d475996..89748318eee 100644 --- a/icu4c/source/common/rbbiscan.h +++ b/icu4c/source/common/rbbiscan.h @@ -1,7 +1,7 @@ // // rbbiscan.h // -// Copyright (C) 2002-2003, International Business Machines Corporation and others. +// Copyright (C) 2002-2005, International Business Machines Corporation and others. // All Rights Reserved. // // This file contains declarations for class RBBIRuleScanner @@ -102,8 +102,8 @@ private: int32_t fNextIndex; // Index of the next character, which // is the first character not yet scanned. UBool fQuoteMode; // Scan is in a 'quoted region' - int fLineNum; // Line number in input file. - int fCharNum; // Char position within the line. + int32_t fLineNum; // Line number in input file. + int32_t fCharNum; // Char position within the line. UChar32 fLastChar; // Previous char, needed to count CR-LF // as a single line, not two. @@ -116,12 +116,12 @@ private: // parsing. index by p[state][char-class] uint16_t fStack[kStackSize]; // State stack, holds state pushes - int fStackPtr; // and pops as specified in the state + int32_t fStackPtr; // and pops as specified in the state // transition rules. RBBINode *fNodeStack[kStackSize]; // Node stack, holds nodes created // during the parse of a rule - int fNodeStackPtr; + int32_t fNodeStackPtr; UBool fReverseRule; // True if the rule currently being scanned diff --git a/icu4c/source/common/ustrfmt.c b/icu4c/source/common/ustrfmt.c index 81b778c1b0f..78597692e1d 100644 --- a/icu4c/source/common/ustrfmt.c +++ b/icu4c/source/common/ustrfmt.c @@ -1,6 +1,6 @@ /* ********************************************************************** -* Copyright (C) 2001-2004, International Business Machines +* Copyright (C) 2001-2005, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** */ @@ -10,7 +10,7 @@ #include U_CAPI char* U_EXPORT2 -uprv_dtostr(double value, char *buffer, int maximumDigits,UBool fixedPoint) +uprv_dtostr(double value, char *buffer, int32_t maximumDigits,UBool fixedPoint) { char *itrPtr = buffer + 1; /* skip '-' or a number before the decimal */ char *startPtr; diff --git a/icu4c/source/common/ustrfmt.h b/icu4c/source/common/ustrfmt.h index 814b5373230..a5518516b4e 100644 --- a/icu4c/source/common/ustrfmt.h +++ b/icu4c/source/common/ustrfmt.h @@ -1,6 +1,6 @@ /* ********************************************************************** -* Copyright (C) 2001-2004, International Business Machines +* Copyright (C) 2001-2005, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** */ @@ -11,7 +11,7 @@ #include "unicode/utypes.h" U_CAPI char* U_EXPORT2 -uprv_dtostr(double value, char *buffer, int maximumDigits,UBool fixedPoint); +uprv_dtostr(double value, char *buffer, int32_t maximumDigits,UBool fixedPoint); U_CAPI int32_t U_EXPORT2 uprv_itou (UChar * buffer, int32_t capacity, uint32_t i, uint32_t radix, int32_t minwidth); diff --git a/icu4c/source/i18n/nfrlist.h b/icu4c/source/i18n/nfrlist.h index e60ee579902..1a334085802 100644 --- a/icu4c/source/i18n/nfrlist.h +++ b/icu4c/source/i18n/nfrlist.h @@ -1,6 +1,6 @@ /* ****************************************************************************** -* Copyright (C) 1997-2001, International Business Machines +* Copyright (C) 1997-2005, International Business Machines * Corporation and others. All Rights Reserved. ****************************************************************************** * file name: nfrlist.h @@ -36,7 +36,7 @@ protected: uint32_t fCount; uint32_t fCapacity; public: - NFRuleList(int capacity = 10) + NFRuleList(uint32_t capacity = 10) : fStuff(capacity ? (NFRule**)uprv_malloc(capacity * sizeof(NFRule*)) : NULL) , fCount(0) , fCapacity(capacity) {}; diff --git a/icu4c/source/i18n/regexcmp.h b/icu4c/source/i18n/regexcmp.h index 6d93f5a8d75..b496f73eda0 100644 --- a/icu4c/source/i18n/regexcmp.h +++ b/icu4c/source/i18n/regexcmp.h @@ -1,7 +1,7 @@ // // regexcmp.h // -// Copyright (C) 2002-2003, International Business Machines Corporation and others. +// Copyright (C) 2002-2005, International Business Machines Corporation and others. // All Rights Reserved. // // This file contains declarations for the class RegexCompile @@ -130,8 +130,8 @@ private: UBool fInBackslashQuote; // Scan is between a '\' and the following char. UBool fEOLComments; // When scan is just after '(?', inhibit #... to // end of line comments, in favor of (?#...) comments. - int fLineNum; // Line number in input file. - int fCharNum; // Char position within the line. + int32_t fLineNum; // Line number in input file. + int32_t fCharNum; // Char position within the line. UChar32 fLastChar; // Previous char, needed to count CR-LF // as a single line, not two. UChar32 fPeekChar; // Saved char, if we've scanned ahead. @@ -147,7 +147,7 @@ private: // parsing. index by p[state][char-class] uint16_t fStack[kStackSize]; // State stack, holds state pushes - int fStackPtr; // and pops as specified in the state + int32_t fStackPtr; // and pops as specified in the state // transition rules. // diff --git a/icu4c/source/i18n/regeximp.h b/icu4c/source/i18n/regeximp.h index f34aca60a0d..fbf700672ec 100644 --- a/icu4c/source/i18n/regeximp.h +++ b/icu4c/source/i18n/regeximp.h @@ -1,5 +1,5 @@ // -// Copyright (C) 2002-2004 International Business Machines Corporation +// Copyright (C) 2002-2005 International Business Machines Corporation // and others. All rights reserved. // // file: regeximp.h @@ -326,7 +326,7 @@ inline void Regex8BitSet::add(UChar32 c) { inline void Regex8BitSet::init(const UnicodeSet *s) { if (s != NULL) { - for (int i=0; i<=255; i++) { + for (int32_t i=0; i<=255; i++) { if (s->contains(i)) { this->add(i); } diff --git a/icu4c/source/i18n/ucol_elm.h b/icu4c/source/i18n/ucol_elm.h index 3ffd204a1c4..499060a26d2 100644 --- a/icu4c/source/i18n/ucol_elm.h +++ b/icu4c/source/i18n/ucol_elm.h @@ -1,7 +1,7 @@ /* ******************************************************************************* * -* Copyright (C) 2000-2003, International Business Machines +* Copyright (C) 2000-2005, International Business Machines * Corporation and others. All Rights Reserved. * ******************************************************************************* @@ -62,8 +62,8 @@ typedef struct { typedef struct { uint32_t *endExpansionCE; UBool *isV; - int position; - int size; + int32_t position; + int32_t size; uint8_t maxLSize; uint8_t maxVSize; uint8_t maxTSize; @@ -72,8 +72,8 @@ typedef struct { typedef struct { uint32_t *endExpansionCE; uint8_t *expansionCESize; - int position; - int size; + int32_t position; + int32_t size; } MaxExpansionTable; typedef struct {