diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2004-08-13 01:06:24 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2004-08-13 01:06:24 +0000 |
| commit | 2e3efe34e0c602fe50e49bd0b0b7affb62b8860e (patch) | |
| tree | 0ba8e9d46dda94ee17e41c198e1148803ca52651 | |
| parent | bca714628d8622e2876b24f2009728a603aadb50 (diff) | |
| download | ATCD-2e3efe34e0c602fe50e49bd0b0b7affb62b8860e.tar.gz | |
ChangeLogTag:Thu Aug 12 17:52:36 2004 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp | 9 |
2 files changed, 13 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a2d3c32ebc8..c1ccde02a85 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Thu Aug 12 17:52:36 2004 Ossama Othman <ossama@dre.vanderbilt.edu> + + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp (operator==): + + Cast away the const-ness of the right hand side argument before + invoking its non-const cred_type() method. The method in + question doesn't modify the object so doing so is not violating + any "immutability contract". Fixes a compile-time error. + Thu Aug 12 17:51:52 2004 Simon McQueen <sm@prismtechnologies.com> * TAO_IDL/fe/fe_lookup.cpp (lookup): diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp index 94fbd8021b9..02888d4cb46 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp @@ -2,8 +2,6 @@ #include "tao/ORB_Constants.h" -//#include <openssl/bn.h> - ACE_RCSID (SSLIOP, SSLIOP_Credentials, @@ -169,8 +167,8 @@ TAO::SSLIOP_Credentials::remove_relinquished_listener (const char * /* id */ bool TAO::SSLIOP_Credentials::operator== (const TAO::SSLIOP_Credentials &rhs) { - X509 * xa = this->x509_.in (); - X509 * xb = rhs.x509_.in (); + ::X509 * xa = this->x509_.in (); + ::X509 * xb = rhs.x509_.in (); // EVP_PKEY *ea = this->evp_.in (); // EVP_PKEY *eb = rhs.evp_.in (); @@ -182,7 +180,8 @@ TAO::SSLIOP_Credentials::operator== (const TAO::SSLIOP_Credentials &rhs) ACE_CHECK_RETURN (false); const SecurityLevel3::CredentialsType rct = - rhs.creds_type (ACE_ENV_SINGLE_ARG_PARAMETER); + const_cast<TAO::SSLIOP_Credentials &> (rhs).creds_type ( + ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (false); // Don't bother check the creds_id and expiry_time attributes. They |