Couldn't find wdiff. Falling back to builtin diff colouring...
| LESwaps.h | | LESwaps.h | |
| | | | |
| skipping to change at line 59 | | skipping to change at line 59 | |
| * No-op on a big-endian platform, byte-swaps on a little-endian platfo
rm. | | * No-op on a big-endian platform, byte-swaps on a little-endian platfo
rm. | |
| * | | * | |
| * @param value - the word to be byte swapped | | * @param value - the word to be byte swapped | |
| * | | * | |
| * @return the byte swapped word | | * @return the byte swapped word | |
| * | | * | |
| * @stable ICU 2.8 | | * @stable ICU 2.8 | |
| */ | | */ | |
| static le_uint16 swapWord(le_uint16 value) | | static le_uint16 swapWord(le_uint16 value) | |
| { | | { | |
|
| #if (defined(U_IS_BIG_ENDIAN) && U_IS_BIG_ENDIAN) || (defined(BYTE_ORDER) &
& defined(BIG_ENDIAN)) || defined(__BIG_ENDIAN__) | | #if (defined(U_IS_BIG_ENDIAN) && U_IS_BIG_ENDIAN) || \ | |
| | | (defined(BYTE_ORDER) && defined(BIG_ENDIAN) && (BYTE_ORDER == BIG_ENDIA
N)) || \ | |
| | | defined(__BIG_ENDIAN__) | |
| // Fastpath when we know that the platform is big-endian. | | // Fastpath when we know that the platform is big-endian. | |
| return value; | | return value; | |
| #else | | #else | |
| // Reads a big-endian value on any platform. | | // Reads a big-endian value on any platform. | |
| const le_uint8 *p = reinterpret_cast<const le_uint8 *>(&value); | | const le_uint8 *p = reinterpret_cast<const le_uint8 *>(&value); | |
| return (le_uint16)((p[0] << 8) | p[1]); | | return (le_uint16)((p[0] << 8) | p[1]); | |
| #endif | | #endif | |
| }; | | }; | |
| | | | |
| /** | | /** | |
| | | | |
| skipping to change at line 81 | | skipping to change at line 83 | |
| * No-op on a big-endian platform, byte-swaps on a little-endian platfo
rm. | | * No-op on a big-endian platform, byte-swaps on a little-endian platfo
rm. | |
| * | | * | |
| * @param value - the long to be byte swapped | | * @param value - the long to be byte swapped | |
| * | | * | |
| * @return the byte swapped long | | * @return the byte swapped long | |
| * | | * | |
| * @stable ICU 2.8 | | * @stable ICU 2.8 | |
| */ | | */ | |
| static le_uint32 swapLong(le_uint32 value) | | static le_uint32 swapLong(le_uint32 value) | |
| { | | { | |
|
| #if (defined(U_IS_BIG_ENDIAN) && U_IS_BIG_ENDIAN) || (defined(BYTE_ORDER) &
& defined(BIG_ENDIAN)) || defined(__BIG_ENDIAN__) | | #if (defined(U_IS_BIG_ENDIAN) && U_IS_BIG_ENDIAN) || \ | |
| | | (defined(BYTE_ORDER) && defined(BIG_ENDIAN) && (BYTE_ORDER == BIG_ENDIA
N)) || \ | |
| | | defined(__BIG_ENDIAN__) | |
| // Fastpath when we know that the platform is big-endian. | | // Fastpath when we know that the platform is big-endian. | |
| return value; | | return value; | |
| #else | | #else | |
| // Reads a big-endian value on any platform. | | // Reads a big-endian value on any platform. | |
| const le_uint8 *p = reinterpret_cast<const le_uint8 *>(&value); | | const le_uint8 *p = reinterpret_cast<const le_uint8 *>(&value); | |
| return (le_uint32)((p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]
); | | return (le_uint32)((p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]
); | |
| #endif | | #endif | |
| }; | | }; | |
| | | | |
| private: | | private: | |
| | | | |
End of changes. 2 change blocks. |
| 2 lines changed or deleted | | 6 lines changed or added | |
|
| decimfmt.h | | decimfmt.h | |
| | | | |
| skipping to change at line 1998 | | skipping to change at line 1998 | |
| int8_t type, | | int8_t type, | |
| UChar* currency) const; | | UChar* currency) const; | |
| | | | |
| static int32_t match(const UnicodeString& text, int32_t pos, UChar32 ch
); | | static int32_t match(const UnicodeString& text, int32_t pos, UChar32 ch
); | |
| | | | |
| static int32_t match(const UnicodeString& text, int32_t pos, const Unic
odeString& str); | | static int32_t match(const UnicodeString& text, int32_t pos, const Unic
odeString& str); | |
| | | | |
| static UBool matchSymbol(const UnicodeString &text, int32_t position, i
nt32_t length, const UnicodeString &symbol, | | static UBool matchSymbol(const UnicodeString &text, int32_t position, i
nt32_t length, const UnicodeString &symbol, | |
| UnicodeSet *sset, UChar32 schar); | | UnicodeSet *sset, UChar32 schar); | |
| | | | |
|
| | | static UBool matchDecimal(UChar32 symbolChar, | |
| | | UBool sawDecimal, UChar32 sawDecimalChar, | |
| | | const UnicodeSet *sset, UChar32 schar); | |
| | | | |
| | | static UBool matchGrouping(UChar32 groupingChar, | |
| | | UBool sawGrouping, UChar32 sawGroupingChar, | |
| | | const UnicodeSet *sset, | |
| | | UChar32 decimalChar, const UnicodeSet *decimal
Set, | |
| | | UChar32 schar); | |
| | | | |
| /** | | /** | |
| * Get a decimal format symbol. | | * Get a decimal format symbol. | |
| * Returns a const reference to the symbol string. | | * Returns a const reference to the symbol string. | |
| * @internal | | * @internal | |
| */ | | */ | |
| inline const UnicodeString &getConstSymbol(DecimalFormatSymbols::ENumbe
rFormatSymbol symbol) const; | | inline const UnicodeString &getConstSymbol(DecimalFormatSymbols::ENumbe
rFormatSymbol symbol) const; | |
| | | | |
| int32_t appendAffix(UnicodeString& buf, | | int32_t appendAffix(UnicodeString& buf, | |
| double number, | | double number, | |
| FieldPositionHandler& handler, | | FieldPositionHandler& handler, | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 10 lines changed or added | |
|
| timezone.h | | timezone.h | |
| | | | |
| skipping to change at line 142 | | skipping to change at line 142 | |
| * savings time. This is a commonly used time zone. | | * savings time. This is a commonly used time zone. | |
| * @return the GMT time zone. | | * @return the GMT time zone. | |
| * @stable ICU 2.0 | | * @stable ICU 2.0 | |
| */ | | */ | |
| static const TimeZone* U_EXPORT2 getGMT(void); | | static const TimeZone* U_EXPORT2 getGMT(void); | |
| | | | |
| /** | | /** | |
| * Creates a <code>TimeZone</code> for the given ID. | | * Creates a <code>TimeZone</code> for the given ID. | |
| * @param ID the ID for a <code>TimeZone</code>, such as "America/Los_A
ngeles", | | * @param ID the ID for a <code>TimeZone</code>, such as "America/Los_A
ngeles", | |
| * or a custom ID such as "GMT-8:00". | | * or a custom ID such as "GMT-8:00". | |
|
| * @return the specified <code>TimeZone</code>, or the GMT zone if the
given ID | | * @return the specified <code>TimeZone</code>, or the GMT zone with ID | |
| * cannot be understood. Return result guaranteed to be non-null. If
you | | * <code>UCAL_UNKNOWN_ZONE_ID</code> ("Etc/Unknown") if the given ID ca
nnot be understood. | |
| * require that the specific zone asked for be returned, check the ID o
f the | | * Return result guaranteed to be non-null. If you require that the spe
cific zone asked | |
| * return result. | | * for be returned, check the ID of the return result. | |
| * @stable ICU 2.0 | | * @stable ICU 2.0 | |
| */ | | */ | |
| static TimeZone* U_EXPORT2 createTimeZone(const UnicodeString& ID); | | static TimeZone* U_EXPORT2 createTimeZone(const UnicodeString& ID); | |
| | | | |
| /** | | /** | |
| * Returns an enumeration over system time zone IDs with the given | | * Returns an enumeration over system time zone IDs with the given | |
| * filter conditions. | | * filter conditions. | |
| * @param zoneType The system time zone type. | | * @param zoneType The system time zone type. | |
| * @param region The ISO 3166 two-letter country code or UN M.49 | | * @param region The ISO 3166 two-letter country code or UN M.49 | |
| * three-digit area code. When NULL, no filtering | | * three-digit area code. When NULL, no filtering | |
| | | | |
End of changes. 1 change blocks. |
| 4 lines changed or deleted | | 4 lines changed or added | |
|
| ubrk.h | | ubrk.h | |
| /* | | /* | |
| ***************************************************************************
*** | | ***************************************************************************
*** | |
|
| * Copyright (C) 1996-2010, International Business Machines Corporation and
others. | | * Copyright (C) 1996-2011, International Business Machines Corporation and
others. | |
| * All Rights Reserved. | | * All Rights Reserved. | |
| ***************************************************************************
*** | | ***************************************************************************
*** | |
| */ | | */ | |
| | | | |
| #ifndef UBRK_H | | #ifndef UBRK_H | |
| #define UBRK_H | | #define UBRK_H | |
| | | | |
| #include "unicode/utypes.h" | | #include "unicode/utypes.h" | |
| #include "unicode/uloc.h" | | #include "unicode/uloc.h" | |
| #include "unicode/utext.h" | | #include "unicode/utext.h" | |
| | | | |
| skipping to change at line 266 | | skipping to change at line 266 | |
| ubrk_safeClone( | | ubrk_safeClone( | |
| const UBreakIterator *bi, | | const UBreakIterator *bi, | |
| void *stackBuffer, | | void *stackBuffer, | |
| int32_t *pBufferSize, | | int32_t *pBufferSize, | |
| UErrorCode *status); | | UErrorCode *status); | |
| | | | |
| /** | | /** | |
| * A recommended size (in bytes) for the memory buffer to be passed to ubr
k_saveClone(). | | * A recommended size (in bytes) for the memory buffer to be passed to ubr
k_saveClone(). | |
| * @stable ICU 2.0 | | * @stable ICU 2.0 | |
| */ | | */ | |
|
| #define U_BRK_SAFECLONE_BUFFERSIZE 512 | | #define U_BRK_SAFECLONE_BUFFERSIZE 528 | |
| | | | |
| /** | | /** | |
| * Close a UBreakIterator. | | * Close a UBreakIterator. | |
| * Once closed, a UBreakIterator may no longer be used. | | * Once closed, a UBreakIterator may no longer be used. | |
| * @param bi The break iterator to close. | | * @param bi The break iterator to close. | |
| * @stable ICU 2.0 | | * @stable ICU 2.0 | |
| */ | | */ | |
| U_STABLE void U_EXPORT2 | | U_STABLE void U_EXPORT2 | |
| ubrk_close(UBreakIterator *bi); | | ubrk_close(UBreakIterator *bi); | |
| | | | |
| | | | |
End of changes. 2 change blocks. |
| 2 lines changed or deleted | | 2 lines changed or added | |
|
| ucal.h | | ucal.h | |
| | | | |
| skipping to change at line 669 | | skipping to change at line 669 | |
| */ | | */ | |
| U_STABLE UDate U_EXPORT2 | | U_STABLE UDate U_EXPORT2 | |
| ucal_getNow(void); | | ucal_getNow(void); | |
| | | | |
| /** | | /** | |
| * Open a UCalendar. | | * Open a UCalendar. | |
| * A UCalendar may be used to convert a millisecond value to a year, | | * A UCalendar may be used to convert a millisecond value to a year, | |
| * month, and day. | | * month, and day. | |
| * <p> | | * <p> | |
| * Note: When unknown TimeZone ID is specified, the UCalendar returned | | * Note: When unknown TimeZone ID is specified, the UCalendar returned | |
|
| * by the function is initialized with GMT ("Etc/GMT") without any | | * by the function is initialized with GMT zone with TimeZone ID <code>UCAL
_UNKNOWN_ZONE_ID</code> | |
| * errors/warnings. If you want to check if a TimeZone ID is valid, | | * ("Etc/Unknown") without any errors/warnings. If you want to check if a
TimeZone ID is valid | |
| * use ucal_getCanonicalTimeZoneID prior to this function. | | * prior to this function, use <code>ucal_getCanonicalTimeZoneID</code>. | |
| * | | * | |
| * @param zoneID The desired TimeZone ID. If 0, use the default time zone. | | * @param zoneID The desired TimeZone ID. If 0, use the default time zone. | |
| * @param len The length of zoneID, or -1 if null-terminated. | | * @param len The length of zoneID, or -1 if null-terminated. | |
| * @param locale The desired locale | | * @param locale The desired locale | |
| * @param type The type of UCalendar to open. This can be UCAL_GREGORIAN to
open the Gregorian | | * @param type The type of UCalendar to open. This can be UCAL_GREGORIAN to
open the Gregorian | |
| * calendar for the locale, or UCAL_DEFAULT to open the default calendar fo
r the locale (the | | * calendar for the locale, or UCAL_DEFAULT to open the default calendar fo
r the locale (the | |
| * default calendar may also be Gregorian). To open a specific non-Gregoria
n calendar for the | | * default calendar may also be Gregorian). To open a specific non-Gregoria
n calendar for the | |
| * locale, use uloc_setKeywordValue to set the value of the calendar keywor
d for the locale | | * locale, use uloc_setKeywordValue to set the value of the calendar keywor
d for the locale | |
| * and then pass the locale to ucal_open with UCAL_DEFAULT as the type. | | * and then pass the locale to ucal_open with UCAL_DEFAULT as the type. | |
| * @param status A pointer to an UErrorCode to receive any errors | | * @param status A pointer to an UErrorCode to receive any errors | |
| * @return A pointer to a UCalendar, or 0 if an error occurred. | | * @return A pointer to a UCalendar, or 0 if an error occurred. | |
|
| | | * @see #UCAL_UNKNOWN_ZONE_ID | |
| * @stable ICU 2.0 | | * @stable ICU 2.0 | |
| */ | | */ | |
| U_STABLE UCalendar* U_EXPORT2 | | U_STABLE UCalendar* U_EXPORT2 | |
| ucal_open(const UChar* zoneID, | | ucal_open(const UChar* zoneID, | |
| int32_t len, | | int32_t len, | |
| const char* locale, | | const char* locale, | |
| UCalendarType type, | | UCalendarType type, | |
| UErrorCode* status); | | UErrorCode* status); | |
| | | | |
| /** | | /** | |
| | | | |
End of changes. 2 change blocks. |
| 3 lines changed or deleted | | 4 lines changed or added | |
|
| uvernum.h | | uvernum.h | |
| | | | |
| skipping to change at line 45 | | skipping to change at line 45 | |
| */ | | */ | |
| | | | |
| #ifndef UVERNUM_H | | #ifndef UVERNUM_H | |
| #define UVERNUM_H | | #define UVERNUM_H | |
| | | | |
| /** The standard copyright notice that gets compiled into each library. | | /** The standard copyright notice that gets compiled into each library. | |
| * This value will change in the subsequent releases of ICU | | * This value will change in the subsequent releases of ICU | |
| * @stable ICU 2.4 | | * @stable ICU 2.4 | |
| */ | | */ | |
| #define U_COPYRIGHT_STRING \ | | #define U_COPYRIGHT_STRING \ | |
|
| " Copyright (C) 2010, International Business Machines Corporation and oth
ers. All Rights Reserved. " | | " Copyright (C) 2011, International Business Machines Corporation and oth
ers. All Rights Reserved. " | |
| | | | |
| /** The current ICU major version as an integer. | | /** The current ICU major version as an integer. | |
| * This value will change in the subsequent releases of ICU | | * This value will change in the subsequent releases of ICU | |
| * @stable ICU 2.4 | | * @stable ICU 2.4 | |
| */ | | */ | |
| #define U_ICU_VERSION_MAJOR_NUM 4 | | #define U_ICU_VERSION_MAJOR_NUM 4 | |
| | | | |
| /** The current ICU minor version as an integer. | | /** The current ICU minor version as an integer. | |
| * This value will change in the subsequent releases of ICU | | * This value will change in the subsequent releases of ICU | |
| * @stable ICU 2.6 | | * @stable ICU 2.6 | |
| | | | |
| skipping to change at line 70 | | skipping to change at line 70 | |
| * This value will change in the subsequent releases of ICU | | * This value will change in the subsequent releases of ICU | |
| * @stable ICU 2.4 | | * @stable ICU 2.4 | |
| */ | | */ | |
| #define U_ICU_VERSION_PATCHLEVEL_NUM 1 | | #define U_ICU_VERSION_PATCHLEVEL_NUM 1 | |
| | | | |
| /** The current ICU build level version as an integer. | | /** The current ICU build level version as an integer. | |
| * This value is for use by ICU clients. It defaults to 0. | | * This value is for use by ICU clients. It defaults to 0. | |
| * @stable ICU 4.0 | | * @stable ICU 4.0 | |
| */ | | */ | |
| #ifndef U_ICU_VERSION_BUILDLEVEL_NUM | | #ifndef U_ICU_VERSION_BUILDLEVEL_NUM | |
|
| #define U_ICU_VERSION_BUILDLEVEL_NUM 0 | | #define U_ICU_VERSION_BUILDLEVEL_NUM 1 | |
| #endif | | #endif | |
| | | | |
| /** Glued version suffix for renamers | | /** Glued version suffix for renamers | |
| * This value will change in the subsequent releases of ICU | | * This value will change in the subsequent releases of ICU | |
| * @stable ICU 2.6 | | * @stable ICU 2.6 | |
| */ | | */ | |
| #define U_ICU_VERSION_SUFFIX _48 | | #define U_ICU_VERSION_SUFFIX _48 | |
| | | | |
| /** Glued version suffix function for renamers | | /** Glued version suffix function for renamers | |
| * This value will change in the subsequent releases of ICU. | | * This value will change in the subsequent releases of ICU. | |
| | | | |
| skipping to change at line 94 | | skipping to change at line 94 | |
| */ | | */ | |
| #ifndef U_ICU_ENTRY_POINT_RENAME | | #ifndef U_ICU_ENTRY_POINT_RENAME | |
| #define U_ICU_ENTRY_POINT_RENAME(x) x ## _48 | | #define U_ICU_ENTRY_POINT_RENAME(x) x ## _48 | |
| #endif | | #endif | |
| | | | |
| /** The current ICU library version as a dotted-decimal string. The patchle
vel | | /** The current ICU library version as a dotted-decimal string. The patchle
vel | |
| * only appears in this string if it non-zero. | | * only appears in this string if it non-zero. | |
| * This value will change in the subsequent releases of ICU | | * This value will change in the subsequent releases of ICU | |
| * @stable ICU 2.4 | | * @stable ICU 2.4 | |
| */ | | */ | |
|
| #define U_ICU_VERSION "4.8.1" | | #define U_ICU_VERSION "4.8.1.1" | |
| | | | |
| /** The current ICU library major/minor version as a string without dots, f
or library name suffixes. | | /** The current ICU library major/minor version as a string without dots, f
or library name suffixes. | |
| * This value will change in the subsequent releases of ICU | | * This value will change in the subsequent releases of ICU | |
| * @stable ICU 2.6 | | * @stable ICU 2.6 | |
| */ | | */ | |
| #define U_ICU_VERSION_SHORT "48" | | #define U_ICU_VERSION_SHORT "48" | |
| | | | |
| /** Data version in ICU4C. | | /** Data version in ICU4C. | |
| * @internal ICU 4.4 Internal Use Only | | * @internal ICU 4.4 Internal Use Only | |
| **/ | | **/ | |
| | | | |
End of changes. 3 change blocks. |
| 3 lines changed or deleted | | 3 lines changed or added | |
|