| OLD | NEW | 
|---|
| 1 /** | 1 /** | 
| 2  ******************************************************************************* | 2  ******************************************************************************* | 
| 3  * Copyright (C) 2001-2012, International Business Machines Corporation and    * | 3  * Copyright (C) 2001-2014, International Business Machines Corporation and    * | 
| 4  * others. All Rights Reserved.                                                * | 4  * others. All Rights Reserved.                                                * | 
| 5  ******************************************************************************* | 5  ******************************************************************************* | 
| 6  * | 6  * | 
| 7  ******************************************************************************* | 7  ******************************************************************************* | 
| 8  */ | 8  */ | 
| 9 #include "unicode/utypes.h" | 9 #include "unicode/utypes.h" | 
| 10 | 10 | 
| 11 #if !UCONFIG_NO_SERVICE | 11 #if !UCONFIG_NO_SERVICE | 
| 12 | 12 | 
| 13 #include "unicode/resbund.h" | 13 #include "unicode/resbund.h" | 
| 14 #include "uresimp.h" | 14 #include "uresimp.h" | 
| 15 #include "cmemory.h" | 15 #include "cmemory.h" | 
| 16 #include "servloc.h" | 16 #include "servloc.h" | 
| 17 #include "ustrfmt.h" | 17 #include "ustrfmt.h" | 
| 18 #include "charstr.h" | 18 #include "charstr.h" | 
| 19 #include "ucln_cmn.h" |  | 
| 20 #include "uassert.h" | 19 #include "uassert.h" | 
| 21 | 20 | 
| 22 #define UNDERSCORE_CHAR ((UChar)0x005f) | 21 #define UNDERSCORE_CHAR ((UChar)0x005f) | 
| 23 #define AT_SIGN_CHAR    ((UChar)64) | 22 #define AT_SIGN_CHAR    ((UChar)64) | 
| 24 #define PERIOD_CHAR     ((UChar)46) | 23 #define PERIOD_CHAR     ((UChar)46) | 
| 25 | 24 | 
| 26 U_NAMESPACE_BEGIN | 25 U_NAMESPACE_BEGIN | 
| 27 | 26 | 
| 28 static UMutex llock = U_MUTEX_INITIALIZER; | 27 static UMutex llock = U_MUTEX_INITIALIZER; | 
| 29 ICULocaleService::ICULocaleService() | 28 ICULocaleService::ICULocaleService() | 
| (...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 285 { | 284 { | 
| 286     return LocaleKey::createWithCanonicalFallback(id, &validateFallbackLocale(),
      kind, status); | 285     return LocaleKey::createWithCanonicalFallback(id, &validateFallbackLocale(),
      kind, status); | 
| 287 } | 286 } | 
| 288 | 287 | 
| 289 U_NAMESPACE_END | 288 U_NAMESPACE_END | 
| 290 | 289 | 
| 291 /* !UCONFIG_NO_SERVICE */ | 290 /* !UCONFIG_NO_SERVICE */ | 
| 292 #endif | 291 #endif | 
| 293 | 292 | 
| 294 | 293 | 
| OLD | NEW | 
|---|