diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | ace/WIN32_Proactor.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 50eb4de73a7..5885803bba6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ Tue May 4 18:16:33 2004 Steve Huston <shuston@riverace.com> * ace/OS_NS_stdio.cpp (checkUnicodeFormat): ACE_OS::fread() returns size_t, not int. + * ace/WIN32_Proactor.cpp (register_handle): reinterpret_cast the void* + to ULONG_PTR on Win64. + * apps/soreduce/Obj_Module.{h cpp} (add_source): * apps/soreduce/Library.{h cpp} (ctor, load_modules, set_path): Changed path arugment and usage from ACE_TCHAR* to char*. It's diff --git a/ace/WIN32_Proactor.cpp b/ace/WIN32_Proactor.cpp index f27119237e0..4348a1ce7ba 100644 --- a/ace/WIN32_Proactor.cpp +++ b/ace/WIN32_Proactor.cpp @@ -120,7 +120,7 @@ ACE_WIN32_Proactor::register_handle (ACE_HANDLE handle, const void *completion_key) { #if defined (ACE_WIN64) - ULONG_PTR comp_key (ACE_static_cast (ULONG_PTR, completion_key)); + ULONG_PTR comp_key (ACE_reinterepret_cast (ULONG_PTR, completion_key)); #else ULONG comp_key (ACE_reinterpret_cast (ULONG, completion_key)); #endif /* ACE_WIN64 */ |