ICU-13015 AIX: final->U_FINAL, config opts, and ustring.h

X-SVN-Rev: 39757
This commit is contained in:
Steven R. Loomis 2017-03-10 02:30:04 +00:00
commit 5eb836b30e
4 changed files with 13 additions and 5 deletions

View File

@ -27,7 +27,7 @@ class Edits;
* *
* @draft ICU 59 * @draft ICU 59
*/ */
class U_COMMON_API CaseMap final : public UMemory { class U_COMMON_API CaseMap U_FINAL : public UMemory {
public: public:
/** /**
* Lowercases a UTF-16 string and optionally records edits. * Lowercases a UTF-16 string and optionally records edits.

View File

@ -29,7 +29,7 @@ U_NAMESPACE_BEGIN
* *
* @draft ICU 59 * @draft ICU 59
*/ */
class U_COMMON_API Edits final : public UMemory { class U_COMMON_API Edits U_FINAL : public UMemory {
public: public:
/** /**
* Constructs an empty object. * Constructs an empty object.
@ -89,7 +89,7 @@ public:
* @see getFineIterator * @see getFineIterator
* @draft ICU 59 * @draft ICU 59
*/ */
struct U_COMMON_API Iterator final : public UMemory { struct U_COMMON_API Iterator U_FINAL : public UMemory {
/** /**
* Copy constructor. * Copy constructor.
* @draft ICU 59 * @draft ICU 59

View File

@ -290,6 +290,14 @@ typedef int8_t UBool;
/** Number of bytes in a UChar. @stable ICU 2.0 */ /** Number of bytes in a UChar. @stable ICU 2.0 */
#define U_SIZEOF_UCHAR 2 #define U_SIZEOF_UCHAR 2
/**
* for AIX, uchar.h needs to be included
*/
#if (U_PLATFORM == U_PF_AIX) && defined(__cplusplus) &&(U_CPLUSPLUS_VERSION < 11)
# include <uchar.h>
#endif
/** /**
* \var UChar * \var UChar
* *

View File

@ -13,8 +13,8 @@ GEN_DEPS.cc= $(CXX) -E -M $(DEFS) $(CPPFLAGS)
# This helps in the data library, # This helps in the data library,
# -qproto assumes all functions are prototyped (for optimization) # -qproto assumes all functions are prototyped (for optimization)
# -qrtti turns on compiler RTTI, required beginning with ICU 4.6 # -qrtti turns on compiler RTTI, required beginning with ICU 4.6
CFLAGS += -qproto -qroconst CFLAGS += -qproto -qroconst -qlanglvl=extended
CXXFLAGS += -qproto -qroconst -qrtti CXXFLAGS += -qproto -qroconst -qrtti -qlanglvl=extended0x
# If you readd this line, you must change the SO value # If you readd this line, you must change the SO value
#LDFLAGS += -brtl #LDFLAGS += -brtl