diff options
| author | Steve Huston <shuston@riverace.com> | 2004-07-01 17:38:57 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2004-07-01 17:38:57 +0000 |
| commit | a3d6eefd9e00fc4d78a53d8ce1edbde9239cf892 (patch) | |
| tree | 9c7162ee87704f0c5bce715ce7ccb573ea0b4839 | |
| parent | aa686983dc1c427baa2e6b372163df82e78babb2 (diff) | |
| download | ATCD-a3d6eefd9e00fc4d78a53d8ce1edbde9239cf892.tar.gz | |
ChangeLogTag:Thu Jul 1 13:34:51 2004 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ace/Basic_Types.h | 12 |
2 files changed, 19 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 11dda2de09e..a5a7409f5bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Thu Jul 1 13:34:51 2004 Steve Huston <shuston@riverace.com> + + * ace/Basic_Types.h: Change the ACE_UINT64_FORMAT_SPECIFIER and + ACE_INT64_FORMAT_SPECIFIER to depend on the value of + ACE_SIZEOF_LONG. If long is an 8-byte type, then the 'l' + format modifier is correct instead of 'll'. Fixes compile + warnings from g++ in 64-bite mode. Thanks to Andre Kostur + <akostur@incognito.com> for this fix. + Thu Jul 1 07:54:11 2004 Douglas C. Schmidt <schmidt@cs.wustl.edu> * ace/OS_NS_Thread.inl: Changed the thr_min_stack() wrapper method diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h index 169387bc503..4f3e0231d89 100644 --- a/ace/Basic_Types.h +++ b/ace/Basic_Types.h @@ -559,11 +559,19 @@ typedef ptrdiff_t ptr_arith_t; # endif /* ! ACE_WIN32 && ! ACE_LACKS_LONGLONG_T */ #if !defined (ACE_UINT64_FORMAT_SPECIFIER) -# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%llu") +# if ACE_SIZEOF_LONG == 8 +# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu") +# else +# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%llu") +# endif /* ACE_SIZEOF_LONG == 8*/ #endif /* ACE_UINT64_FORMAT_SPECIFIER */ #if !defined (ACE_INT64_FORMAT_SPECIFIER) -# define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lld") +# if ACE_SIZEOF_LONG == 8 +# define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%ld") +# else +# define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lld") +# endif /* ACE_SIZEOF_LONG == 8 */ #endif /* ACE_INT64_FORMAT_SPECIFIER */ #if !defined (ACE_SSIZE_T_FORMAT_SPECIFIER) |