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

ICU-1296 Fixed the constness of createAvailableIDs

Browse source 
X-SVN-Rev: 8129
This commit is contained in:
George Rhoten 2002-03-20 00:15:44 +00:00
parent 7b4512d90f
commit 79d29d4e37
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
icu4c/source/i18n/timezone.cpp
View file

@ -453,7 +453,7 @@ TimeZone::setDefault(const TimeZone& zone)
// -------------------------------------
const UnicodeString** const
const UnicodeString**
TimeZone::createAvailableIDs(int32_t rawOffset, int32_t& numIDs)
{
// We are creating a new array to existing UnicodeString pointers.
@ -496,8 +496,8 @@ TimeZone::createAvailableIDs(int32_t rawOffset, int32_t& numIDs)
}
if (index->gmtOffset == rawOffset) {
// Found our desired offset
const UnicodeString** const result =
(const UnicodeString** const) new UnicodeString*[index->count];
const UnicodeString** result =
(const UnicodeString**) new UnicodeString*[index->count];
const uint16_t* zoneNumberArray = &(index->zoneNumber);
for (uint16_t i=0; i<index->count; ++i) {
// Pointer assignment - use existing UnicodeString object!
@ -522,7 +522,7 @@ TimeZone::createAvailableIDs(int32_t rawOffset, int32_t& numIDs)
// -------------------------------------
const UnicodeString** const
const UnicodeString**
TimeZone::createAvailableIDs(const char* country, int32_t& numIDs) {
// We are creating a new array to existing UnicodeString pointers.
@ -565,8 +565,8 @@ TimeZone::createAvailableIDs(const char* country, int32_t& numIDs) {
}
if (index->intcode == intcode) {
// Found our desired country
const UnicodeString** const result =
(const UnicodeString** const) new UnicodeString*[index->count];
const UnicodeString** result =
(const UnicodeString**) new UnicodeString*[index->count];
const uint16_t* zoneNumberArray = &(index->zoneNumber);
for (uint16_t i=0; i<index->count; ++i) {
// Pointer assignment - use existing UnicodeString object!
@ -591,7 +591,7 @@ TimeZone::createAvailableIDs(const char* country, int32_t& numIDs) {
// -------------------------------------
const UnicodeString** const
const UnicodeString**
TimeZone::createAvailableIDs(int32_t& numIDs)
{
// We are creating a new array to existing UnicodeString pointers.
@ -611,8 +611,8 @@ TimeZone::createAvailableIDs(int32_t& numIDs)
return 0;
}
const UnicodeString** const result =
(const UnicodeString** const) new UnicodeString*[DATA->count];
const UnicodeString** result =
(const UnicodeString** ) new UnicodeString*[DATA->count];
// Create a list of pointers to each and every zone ID
for (uint32_t i=0; i<DATA->count; ++i) {

4
icu4c/source/i18n/ucal.cpp
View file

@ -25,7 +25,7 @@ ucal_getAvailableTZIDs( int32_t rawOffset,
int32_t count = 0;
const UChar *retVal = 0;
const UnicodeString** const tzs = TimeZone::createAvailableIDs(rawOffset,
const UnicodeString** tzs = TimeZone::createAvailableIDs(rawOffset,
count);
if(tzs == 0) {
@ -48,7 +48,7 @@ ucal_countAvailableTZIDs(int32_t rawOffset)
int32_t count = 0;
const UnicodeString** const tzs = TimeZone::createAvailableIDs(rawOffset,
const UnicodeString** tzs = TimeZone::createAvailableIDs(rawOffset,
count);
if(tzs == 0) {

6
icu4c/source/i18n/unicode/timezone.h
View file

@ -159,7 +159,7 @@ public:
* specified, NULL is returned.
* @stable
*/
static const UnicodeString** const createAvailableIDs(int32_t rawOffset, int32_t& numIDs);
static const UnicodeString** createAvailableIDs(int32_t rawOffset, int32_t& numIDs);
/**
* Returns a list of time zone IDs associated with the given
@ -179,7 +179,7 @@ public:
* country. If there is no timezone that matches the country
* specified, NULL is returned.
*/
static const UnicodeString** const createAvailableIDs(const char* country,
static const UnicodeString** createAvailableIDs(const char* country,
int32_t& numIDs);
/**
@ -193,7 +193,7 @@ public:
* supported by the TimeZone class.
* @stable
*/
static const UnicodeString** const createAvailableIDs(int32_t& numIDs);
static const UnicodeString** createAvailableIDs(int32_t& numIDs);
/**
* Returns the number of IDs in the equivalency group that