diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-11-24 08:46:56 +0100 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-11-24 08:46:56 +0100 |
commit | 8c5689125b7726db21d5ae10c9026a4e9aab4d5d (patch) | |
tree | e8dbb190feb874e27db05297de98fb11f77f695e /ACE/ace/Basic_Types.h | |
parent | 858a63528d213eeec10de11660a770f7b7dc1bfd (diff) | |
download | ATCD-8c5689125b7726db21d5ae10c9026a4e9aab4d5d.tar.gz |
Cleanup basic types now that we are using all C++11 standard defined (u)int{8/16/32/64)_t types
* ACE/ace/Basic_Types.h:
* ACE/ace/README:
* ACE/ace/config-kfreebsd.h:
* ACE/ace/config-netbsd.h:
* ACE/ace/config-win32-common.h:
Diffstat (limited to 'ACE/ace/Basic_Types.h')
-rw-r--r-- | ACE/ace/Basic_Types.h | 120 |
1 files changed, 9 insertions, 111 deletions
diff --git a/ACE/ace/Basic_Types.h b/ACE/ace/Basic_Types.h index 5922845dce4..7fec1b2f188 100644 --- a/ACE/ace/Basic_Types.h +++ b/ACE/ace/Basic_Types.h @@ -70,15 +70,6 @@ # include <inttypes.h> # endif -# define ACE_HAS_INT8_T -# define ACE_HAS_UINT8_T -# define ACE_HAS_INT16_T -# define ACE_HAS_UINT16_T -# define ACE_HAS_INT32_T -# define ACE_HAS_UINT32_T -# define ACE_HAS_INT64_T -# define ACE_HAS_UINT64_T - #ifdef ACE_LACKS_INTPTR_T # include "ace/If_Then_Else.h" @@ -93,7 +84,6 @@ // i.e. determining the type at compile-time rather than at // preprocessing-time, will work for all platforms, and does not // depend on ACE developer-defined configuration parameters. - typedef ACE::If_Then_Else< (sizeof (void*) == sizeof (signed int)), signed int, @@ -210,115 +200,23 @@ typedef ACE::If_Then_Else< # endif # endif /* !defined (ACE_SIZEOF_LONG_LONG) */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL -// The sizes of the commonly implemented types are now known. Set up -// typedefs for whatever we can. Some of these are needed for certain -// cases of ACE_UINT64, so do them before the 64-bit stuff. - -#if defined (ACE_HAS_INT8_T) - typedef int8_t ACE_INT8; -#elif defined (ACE_INT8_TYPE) - typedef ACE_INT8_TYPE ACE_INT8; -#elif !defined (ACE_LACKS_SIGNED_CHAR) - typedef signed char ACE_INT8; -#else - typedef char ACE_INT8; -#endif /* defined (ACE_INT8_TYPE) */ - -#if defined (ACE_HAS_UINT8_T) - typedef uint8_t ACE_UINT8; -#elif defined (ACE_UINT8_TYPE) - typedef ACE_UINT8_TYPE ACE_UINT8; -#else - typedef unsigned char ACE_UINT8; -#endif /* defined (ACE_UINT8_TYPE) */ - -#if defined (ACE_HAS_INT16_T) - typedef int16_t ACE_INT16; -#elif defined (ACE_INT16_TYPE) - typedef ACE_INT16_TYPE ACE_INT16; -#elif ACE_SIZEOF_SHORT == 2 - typedef short ACE_INT16; -#elif ACE_SIZEOF_INT == 2 - typedef int ACE_INT16; -#else -# error Have to add to the ACE_INT16 type setting -#endif /* defined (ACE_INT16_TYPE) */ - -#if defined (ACE_HAS_UINT16_T) - typedef uint16_t ACE_UINT16; -#elif defined (ACE_UINT16_TYPE) - typedef ACE_UINT16_TYPE ACE_UINT16; -#elif ACE_SIZEOF_SHORT == 2 - typedef unsigned short ACE_UINT16; -#elif ACE_SIZEOF_INT == 2 - typedef unsigned int ACE_UINT16; -#else -# error Have to add to the ACE_UINT16 type setting -#endif /* defined (ACE_UINT16_TYPE) */ - -#if defined (ACE_HAS_INT32_T) - typedef int32_t ACE_INT32; -#elif defined (ACE_INT32_TYPE) - typedef ACE_INT32_TYPE ACE_INT32; -#elif ACE_SIZEOF_INT == 4 - typedef int ACE_INT32; -#elif ACE_SIZEOF_LONG == 4 - typedef long ACE_INT32; -#else -# error Have to add to the ACE_INT32 type setting -#endif /* defined (ACE_INT32_TYPE) */ - -#if defined (ACE_HAS_UINT32_T) - typedef uint32_t ACE_UINT32; -#elif defined (ACE_UINT32_TYPE) - typedef ACE_UINT32_TYPE ACE_UINT32; -#elif ACE_SIZEOF_INT == 4 - typedef unsigned int ACE_UINT32; -#elif ACE_SIZEOF_LONG == 4 - typedef unsigned long ACE_UINT32; -#else -# error Have to add to the ACE_UINT32 type setting -#endif /* defined (ACE_UINT32_TYPE) */ - -#if defined (ACE_HAS_INT64_T) - typedef int64_t ACE_INT64; -#elif defined (ACE_INT64_TYPE) - typedef ACE_INT64_TYPE ACE_INT64; -#elif ACE_SIZEOF_LONG == 8 - typedef long ACE_INT64; -#elif ACE_SIZEOF_LONG_LONG == 8 -# ifdef __GNUC__ - // Silence g++ "-pedantic" warnings regarding use of "long long" - // type. - __extension__ -# endif /* __GNUC__ */ - typedef long long ACE_INT64; -#endif /* defined (ACE_INT64_TYPE) */ - -#if defined (ACE_HAS_UINT64_T) - typedef uint64_t ACE_UINT64; -#elif defined (ACE_UINT64_TYPE) - typedef ACE_UINT64_TYPE ACE_UINT64; -#elif ACE_SIZEOF_LONG == 8 - typedef unsigned long ACE_UINT64; -#elif ACE_SIZEOF_LONG_LONG == 8 -# ifdef __GNUC__ - // Silence g++ "-pedantic" warnings regarding use of "long long" - // type. - __extension__ -# endif /* __GNUC__ */ - typedef unsigned long long ACE_UINT64; -#endif /* defined (ACE_UINT64_TYPE) */ +// The sizes of the commonly implemented types are known. +typedef int8_t ACE_INT8; +typedef uint8_t ACE_UINT8; +typedef int16_t ACE_INT16; +typedef uint16_t ACE_UINT16; +typedef int32_t ACE_INT32; +typedef uint32_t ACE_UINT32; +typedef int64_t ACE_INT64; +typedef uint64_t ACE_UINT64; /// Define a generic byte for use in codecs typedef unsigned char ACE_Byte; // Define a pseudo wide character type when wchar is not supported so we // can support basic wide character string operations. - #if defined (ACE_HAS_WCHAR) || defined (ACE_HAS_XPG4_MULTIBYTE_CHAR) # define ACE_WINT_T wint_t # define ACE_WCHAR_T wchar_t |