AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-66 #if'd out leaky protected function that never really worked in the first place.

Browse Source 
X-SVN-Rev: 4698
This commit is contained in:
George Rhoten 2001-05-17 15:30:07 +00:00
parent 2d0894edfe
commit bc0f2f0615
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
icu4c/source/common/locid.cpp
View File

@ -29,8 +29,6 @@
*/
#include "uhash.h"
#include "unicode/locid.h"
#include "unicode/uloc.h"
#include "unicode/resbund.h"
@ -40,6 +38,10 @@
#include "cmemory.h"
#include "cstring.h"
#ifdef ICU_LOCID_USE_DEPRECATES
#include "uhash.h"
#endif
/**
* static variables
*/
@ -84,6 +86,7 @@ const Locale Locale::US ("en", "US");
const Locale Locale::CANADA ("en", "CA");
const Locale Locale::CANADA_FRENCH("fr", "CA");
#ifdef ICU_LOCID_USE_DEPRECATES
/**
* Table mapping ISO country codes to the ISO language codes of the languages spoken
@ -113,6 +116,7 @@ const UnicodeString Locale::compressedCtry2LangMapping(
"TWzhTZenswUAukruUGenswUMenUSenesUYesUZuzruVAlaitVCenVEesVGenVIenVNvizhfr"
"VUenfrbiWFfrWSensmYEarYTfrmgswYUsrshmkhuZAafenZMenZRfrswZWensn",
"");
#endif
/*Used for stack allocation of temporary buffers
*can be tweaked for speed and likelihood of resorting to heap allocation*/
@ -848,7 +852,6 @@ Locale::getISOLanguages(int32_t& count)
count = isoLanguagesCount;
return isoLanguages;
}
#endif
/**
* Given an ISO country code, returns an array of Strings containing the ISO
@ -914,6 +917,7 @@ Locale::getLanguagesForCountry(const UnicodeString& country, int32_t& count)
return result;
}
#endif
// ================= privates =====================================

11
icu4c/source/common/unicode/locid.h
View File

@ -621,8 +621,11 @@ public:
#endif /* ICU_LOCID_NO_DEPRECATES */
protected: /* only protected for testing purposes. DO NOT USE. */
void setFromPOSIXID(const char *posixID); /* set it from a single string. */
/** set it from a single string. */
void setFromPOSIXID(const char *posixID);
#ifdef ICU_LOCID_USE_DEPRECATES
/* This never worked, and it's leaky */
/**
* Given an ISO country code, returns an array of Strings containing the ISO
* codes of the languages spoken in that country. Official languages are listed
@ -640,7 +643,7 @@ protected: /* only protected for testing purposes. DO NOT USE. */
*/
static const UnicodeString* getLanguagesForCountry(const UnicodeString& country,
int32_t& count);
#endif
private:
/**
@ -667,11 +670,11 @@ private:
static int32_t isoLanguagesCount;
static UnicodeString *isoCountries;
static int32_t isoCountriesCount;
/* End deprecated fields */
#endif
static UHashtable *ctry2LangMapping;
static const UnicodeString compressedCtry2LangMapping;
/* End deprecated fields */
#endif
static Locale fgDefaultLocale;