diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2013-04-28 14:51:04 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2013-04-28 14:51:04 +0000 |
| commit | e9865eef8177389b66a41aaad1d543b506b2d990 (patch) | |
| tree | 4653124f58b5bb74d350893977610452f30661d0 | |
| parent | 338722943c3454b29e4d12fca8ec79b46daecef1 (diff) | |
| download | ATCD-e9865eef8177389b66a41aaad1d543b506b2d990.tar.gz | |
Sun Apr 28 14:37:50 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index e6e162786a4..691967f33c6 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Sun Apr 28 14:37:50 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * orbsvcs/ImplRepo_Service/LiveCheck.cpp: + + Fix for some 64-bit windows builds + Fri Apr 26 16:35:54 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: diff --git a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp index 53aa55297da..9ba4d2bd3d7 100644 --- a/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/LiveCheck.cpp @@ -526,7 +526,11 @@ int LiveCheck::handle_timeout (const ACE_Time_Value &, const void * tok) { - long token = reinterpret_cast<long>(tok); +#if (ACE_SIZEOF_VOID_P == 8) + ACE_INT64 token = reinterpret_cast<ACE_INT64>(tok); +#else + ACE_INT32 token = reinterpret_cast<ACE_INT32>(tok); +#endif if (this->debug_ > 2) { ORBSVCS_DEBUG ((LM_DEBUG, |