diff options
| author | john_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-02-28 17:17:21 +0000 |
|---|---|---|
| committer | john_c <john_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-02-28 17:17:21 +0000 |
| commit | 3b845e754b0246726e2aeb094f3121859cb8e13f (patch) | |
| tree | 4da54689150c978c8754ff36ae9a42ff986053c8 | |
| parent | aaa60dcb328d03c90a9eee1f27c708c912da1066 (diff) | |
| download | ATCD-3b845e754b0246726e2aeb094f3121859cb8e13f.tar.gz | |
Mon Feb 28 11:14:35 2005 Ciju John <john_c@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/IIOP_Acceptor.cpp | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 08e4e9863c9..c43235f4a9f 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Mon Feb 28 11:14:35 2005 Ciju John <john_c@ociweb.com> + + * tao/IIOP_Acceptor.cpp: + Changed deperecated ACE_x_cast macros to C++ versions. Can cause + build failure if ACE_LACKS_DEPRECATED_MACROS is defined. + Mon Feb 28 07:21:14 2005 J.T. Conklin <jtc@acorntoolworks.com> * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc: diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp index b0a946aaa36..9ecf56cc44b 100644 --- a/TAO/tao/IIOP_Acceptor.cpp +++ b/TAO/tao/IIOP_Acceptor.cpp @@ -846,7 +846,7 @@ TAO_IIOP_Acceptor::parse_options (const char *str) if (j < argc - 1) end = options.find (option_delimiter, begin); else - end = ACE_static_cast(CORBA::ULong, len); + end = static_cast<CORBA::ULong> (len); if (end == begin) { @@ -892,7 +892,7 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc, size_t len = argv[i]->length(); int slot = argv[i]->find ("="); - if (slot == ACE_static_cast (int, len - 1) + if (slot == static_cast <int> (len - 1) || slot == ACE_CString::npos) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) IIOP option <%s> is ") @@ -918,7 +918,7 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc, } else if (name == "portspan") { - int range = ACE_static_cast (int, ACE_OS::atoi (value.c_str ())); + int range = static_cast <int> (ACE_OS::atoi (value.c_str ())); // @@ What's the lower bound on the range? zero, or one? if (range < 1 || range > ACE_MAX_DEFAULT_PORT) ACE_ERROR_RETURN ((LM_ERROR, @@ -928,7 +928,7 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc, value.c_str (), ACE_MAX_DEFAULT_PORT), -1); - this->port_span_ = ACE_static_cast (u_short, range); + this->port_span_ = static_cast <u_short> (range); } else if (name == "hostname_in_ior") { |