diff options
| author | mcorino <mcorino@users.noreply.github.com> | 2013-03-30 18:13:42 +0000 |
|---|---|---|
| committer | mcorino <mcorino@users.noreply.github.com> | 2013-03-30 18:13:42 +0000 |
| commit | af7d8bad09c565646b9b63b7204e7c39c38f162a (patch) | |
| tree | bd9cce5ccd9de021d1affec60a51bdb2f6d291ad | |
| parent | 23e0e8e4cbdd0cbc8e25e49ffb6584ba8aa11f33 (diff) | |
| download | ATCD-af7d8bad09c565646b9b63b7204e7c39c38f162a.tar.gz | |
ChangeLogTag: Sat Mar 30 18:12:28 UTC 2013 Martin Corino <mcorino@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tests/File_IO/File_i.cpp | 2 | ||||
| -rw-r--r-- | TAO/tests/POA/Default_Servant2/File_i.cpp | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index dcbbf7ce548..66dff3646c6 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Sat Mar 30 18:12:28 UTC 2013 Martin Corino <mcorino@remedy.nl> + + * tests/File_IO/File_i.cpp: + * tests/POA/Default_Servant2/File_i.cpp: + Fixed int-to-pointer cast warnings. + Sat Mar 30 09:39:40 UTC 2013 Martin Corino <mcorino@remedy.nl> * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h: diff --git a/TAO/tests/File_IO/File_i.cpp b/TAO/tests/File_IO/File_i.cpp index 2e4690a6774..62ee922a07c 100644 --- a/TAO/tests/File_IO/File_i.cpp +++ b/TAO/tests/File_IO/File_i.cpp @@ -144,7 +144,7 @@ FileImpl::Descriptor::fd (void) PortableServer::ObjectId_to_string (oid1.in ()); // Get the ACE_HANDLE from the string - return (ACE_HANDLE) ACE_OS::atol (s.in ()); + return (ACE_HANDLE)(intptr_t)ACE_OS::atol (s.in ()); } CORBA::Long diff --git a/TAO/tests/POA/Default_Servant2/File_i.cpp b/TAO/tests/POA/Default_Servant2/File_i.cpp index ce33dc83da1..3542cdfc3cf 100644 --- a/TAO/tests/POA/Default_Servant2/File_i.cpp +++ b/TAO/tests/POA/Default_Servant2/File_i.cpp @@ -152,7 +152,7 @@ FileImpl::Descriptor::fd (void) PortableServer::ObjectId_to_string (oid1.in ()); // Get the ACE_HANDLE from the string - return (ACE_HANDLE) ACE_OS::atol (s.in ()); + return (ACE_HANDLE)(intptr_t)ACE_OS::atol (s.in ()); } CORBA::Long |