diff options
| author | gmaxey <gmaxey@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-04-08 19:22:04 +0000 |
|---|---|---|
| committer | gmaxey <gmaxey@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-04-08 19:22:04 +0000 |
| commit | 037f1c5c83e47a29c12a71a226589aac9a73a6b5 (patch) | |
| tree | f51546f1942691e5a3652f50e24ce222022f4f72 | |
| parent | c29e7dc89bccdc884516a3b8164d8980332e4ffc (diff) | |
| download | ATCD-037f1c5c83e47a29c12a71a226589aac9a73a6b5.tar.gz | |
ChangeLogTag: Fri Apr 8 12:15:00 2005 Gary Maxey <gary.maxey@hp.com>
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ace/Basic_Types.h | 4 |
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 56b20715a7d..f48b2127d82 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Fri Apr 8 12:15:00 2005 Gary Maxey <gary.maxey@hp.com> + + * ace/Basic_Types.h + + If ACE_LACKS_UNSIGNEDLONGLONG_T do not typedef ACE_UINT64 as + unsigned long long. + + Add define for ACE_UINT64_DBLCAST_ADAPTER when + ACE_LACKS_UNSIGNEDLONGLONG_T. + Fri Apr 8 14:31:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * apps/JAWS3/jaws3/Concurrency.h: diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h index 7369a706989..c6ca613e492 100644 --- a/ace/Basic_Types.h +++ b/ace/Basic_Types.h @@ -255,7 +255,7 @@ typedef uint64_t ACE_UINT64; #elif ACE_SIZEOF_LONG == 8 typedef unsigned long ACE_UINT64; -#elif !defined (ACE_LACKS_LONGLONG_T) && ACE_SIZEOF_LONG_LONG == 8 +#elif !(defined (ACE_LACKS_LONGLONG_T) || defined (ACE_LACKS_UNSIGNEDLONGLONG_T)) && ACE_SIZEOF_LONG_LONG == 8 typedef unsigned long long ACE_UINT64; #endif /* defined (ACE_UINT64_TYPE) */ @@ -703,6 +703,8 @@ typedef ptrdiff_t ptr_arith_t; # if defined (ACE_LACKS_LONGLONG_T) // Only use the low 32 bits. # define ACE_UINT64_DBLCAST_ADAPTER(n) ACE_U64_TO_U32 (n) +# elif defined (ACE_LACKS_UNSIGNEDLONGLONG_T) +# define ACE_UINT64_DBLCAST_ADAPTER(n) ((n).to_int64 ()) # elif defined (ACE_WIN32) # define ACE_UINT64_DBLCAST_ADAPTER(n) static_cast<__int64> (n) # else /* ! ACE_WIN32 && ! ACE_LACKS_LONGLONG_T */ |