diff options
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/PortableServer_WFunctions.cpp | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ddb7ea21738..e9c8c57fcf0 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Fri Aug 26 13:17:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/Acceptor_Registry.cpp: + * tao/default_server.h: + Fixed 64bit conversion warnings + Fri Aug 26 12:30:47 2005 Simon McQueen <sm@prismtech.com> * tao/AnyTypeCode.mpc: diff --git a/TAO/tao/PortableServer/PortableServer_WFunctions.cpp b/TAO/tao/PortableServer/PortableServer_WFunctions.cpp index 53a7cdbd4a0..fcd1dbc3fa4 100644 --- a/TAO/tao/PortableServer/PortableServer_WFunctions.cpp +++ b/TAO/tao/PortableServer/PortableServer_WFunctions.cpp @@ -16,7 +16,7 @@ namespace PortableServer // We DO NOT include the zero terminator, as this is simply an // artifact of the way strings are stored in C. // - CORBA::ULong string_length = ACE_OS::wslen (string); + u_int string_length = ACE_OS::wslen (string); CORBA::ULong buffer_size = string_length * sizeof (CORBA::WChar); |