diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2004-04-16 23:42:15 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2004-04-16 23:42:15 +0000 |
| commit | 39e64261259e09a44f0f6dc71e4d718ede2c43a4 (patch) | |
| tree | 491c6166c4f716c1e00921244495311f5b2d7de2 | |
| parent | ceacfa9e8fea65dcd7f248e84c645534013d6324 (diff) | |
| download | ATCD-39e64261259e09a44f0f6dc71e4d718ede2c43a4.tar.gz | |
ChangeLogTag:Fri Apr 16 16:32:32 2004 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp | 6 |
2 files changed, 13 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index dfe9dc5cae5..4d588ccc570 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Fri Apr 16 16:32:32 2004 Ossama Othman <ossama@dre.vanderbilt.edu> + + * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp (parse_args): + + ptrdiff_t is a signed type, so use the + ACE_INT64_FORMAT_SPECIFIER instead of its unsigned counterpart + when reading a value into a ptrdiff_t variable via sscanf(). + Fixes a g++ warning regarding mismatched format specifiers and + corresponding arguments in 64 bit platform builds. + Fri Apr 16 10:28:42 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> * tao/RTPortableServer/RTPortableServer.h: diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp index ef52f76ecb9..7d27e63d847 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp @@ -204,9 +204,9 @@ TAO_Naming_Server::parse_args (int argc, this->context_size_ = size; break; case 'b': - result = ::sscanf (ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ()), + result = ::sscanf (ACE_TEXT_ALWAYS_CHAR (get_opts.opt_arg ()), #if ACE_SIZEOF_VOID_P == ACE_SIZEOF_LONG_LONG - ACE_UINT64_FORMAT_SPECIFIER, + ACE_INT64_FORMAT_SPECIFIER, #else "%ld", #endif /* ACE_SIZEOF_VOID_P */ @@ -639,7 +639,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb, // set a timeout on the orb // - CORBA::Object_var orbPolicyManagerObj = + CORBA::Object_var orbPolicyManagerObj = orb->resolve_initial_references ("ORBPolicyManager" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; |