diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-07 18:41:22 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-07 18:41:22 +0000 |
| commit | 889d12393fd7ac5bb414d43f0e3e04bedefc22b3 (patch) | |
| tree | 89559a6254f09482d4b6663fe1207747fca1db7e | |
| parent | dbda333a191e938172325650cd8e4f876a7a00c0 (diff) | |
| download | ATCD-889d12393fd7ac5bb414d43f0e3e04bedefc22b3.tar.gz | |
*** empty log message ***
| -rw-r--r-- | ChangeLog-99b | 8 | ||||
| -rw-r--r-- | ace/Basic_Types.h | 9 |
2 files changed, 17 insertions, 0 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index 210d818002e..db2ec9b8b23 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,11 @@ +Wed Apr 7 13:36:44 1999 Jeff Parsons <parsons@cs.wustl.edu> + + * ace/Basic_Types.h: + Added a signed companion to David's + ACE_UINT64_LITERAL, to avoid MSVC warnings. If + the platform has no 8-byte integer, this is + useless, but we must keep all compilers happy. + Wed Apr 7 11:30:09 1999 Carlos O'Ryan <coryan@cs.wustl.edu> * bin/auto_compile: diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h index d413ba0a5ee..88b0b353804 100644 --- a/ace/Basic_Types.h +++ b/ace/Basic_Types.h @@ -353,17 +353,26 @@ typedef ACE_UINT16 ACE_USHORT16; // 64-bit literals require special marking on some platforms. # if defined (ACE_WIN32) # define ACE_UINT64_LITERAL(n) n ## ui64 +# define ACE_INT64_LITERAL(n) n ## i64 # elif defined (ACE_LACKS_LONGLONG_T) // Can only specify 32-bit arguments. # define ACE_UINT64_LITERAL(n) (ACE_U_LongLong (n)) + // This one won't really work, but it'll keep + // some compilers happy until we have better support +# define ACE_INT64_LITERAL(n) (ACE_U_LongLong (n)) # else /* ! ACE_WIN32 && ! ACE_LACKS_LONGLONG_T */ # define ACE_UINT64_LITERAL(n) n ## ull +# define ACE_INT64_LITERAL(n) n ## ll # endif /* ! ACE_WIN32 && ! ACE_LACKS_LONGLONG_T */ #if !defined (ACE_UINT64_FORMAT_SPECIFIER) # define ACE_UINT64_FORMAT_SPECIFIER "%llu" #endif /* ACE_UINT64_FORMAT_SPECIFIER */ +#if !defined (ACE_INT64_FORMAT_SPECIFIER) +# define ACE_INT64_FORMAT_SPECIFIER "%ll" +#endif /* ACE_INT64_FORMAT_SPECIFIER */ + // Cast from UINT64 to a double requires an intermediate cast to INT64 // on some platforms. # if defined (ACE_WIN32) |