diff options
| author | Steve Huston <shuston@riverace.com> | 2006-10-25 15:07:17 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2006-10-25 15:07:17 +0000 |
| commit | 979ec917f307b882ce087914a0f1c81a143cb953 (patch) | |
| tree | 2018d778e53fa5b4aa9b69293982f9c84c413ec9 | |
| parent | 976c6163f71b688d93b6c01c44a197118da7a6ed (diff) | |
| download | ATCD-979ec917f307b882ce087914a0f1c81a143cb953.tar.gz | |
ChangeLogTag:Wed Oct 25 15:05:42 UTC 2006 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ACE/ChangeLog | 4 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_stdlib.inl | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index be8a35f6a02..f73f8c703ed 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,7 @@ +Wed Oct 25 15:05:42 UTC 2006 Steve Huston <shuston@riverace.com> + + * ace/OS_NS_stdlib.inl (atop): s/intptr/intptr_t/ in ACE_WIN64 case. + Wed Oct 25 09:47:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * ace/SOCK_Dgram.cpp: diff --git a/ACE/ace/OS_NS_stdlib.inl b/ACE/ace/OS_NS_stdlib.inl index 990b1895ece..4604b5d2005 100644 --- a/ACE/ace/OS_NS_stdlib.inl +++ b/ACE/ace/OS_NS_stdlib.inl @@ -91,7 +91,7 @@ ACE_INLINE void * ACE_OS::atop (const wchar_t *s) { # if defined (ACE_WIN64) - intptr ip = ::_wtoi64 (s); + intptr_t ip = ::_wtoi64 (s); # else intptr_t ip = ACE_OS::atoi (s); # endif /* ACE_WIN64 */ |