diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-11-16 17:16:16 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-11-16 17:16:16 +0000 |
| commit | c853dd6b2f7c225815ef2cabeaa91f2a9fa95f9e (patch) | |
| tree | afdbed52b5836596c3c447a1fb98075d839ba297 | |
| parent | c6d68c89dc6c63912f71c7d23f4aa69a88a5ab7f (diff) | |
| download | ATCD-c853dd6b2f7c225815ef2cabeaa91f2a9fa95f9e.tar.gz | |
ChangeLogTag:Wed Nov 16 09:14:21 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 12 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h | 2 |
5 files changed, 18 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 9c8e01f9436..6ae970f59ad 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,15 @@ +Wed Nov 16 09:14:21 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp: + + Include "tao/ORB_Constants.h" to pull TAO::VMCID constant. + + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h: + + Corrected typos in versioned namespace macros. + Wed Nov 16 09:05:08 2005 Ossama Othman <ossama@dre.vanderbilt.edu> * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h (Current): diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h index ced974209ef..734ca4d1884 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h @@ -44,7 +44,7 @@ extern "C" typedef struct evp_pkey_st EVP_PKEY; } -TAO_SSLIOP_PASSWORD_CALLBACK_NAME +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { @@ -143,7 +143,7 @@ namespace TAO } // End SSLIOP namespace } // End TAO namespace -TAO_END_PASSWORD_CALLBACK_NAME +TAO_END_VERSIONED_NAMESPACE_DECL #if defined(_MSC_VER) #pragma warning(pop) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp index 5104357895c..a756b452cd0 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp @@ -15,6 +15,8 @@ ACE_RCSID (SSLIOP, #include "SSLIOP_X509.h" #include "SSLIOP_ClientCredentials.h" +#include "tao/ORB_Constants.h" + #include <openssl/x509.h> TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp index ec54af02bf8..3403406acd0 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp @@ -1,5 +1,4 @@ #include "SSLIOP_TargetCredentials.h" -#include "tao/ORB_Constants.h" ACE_RCSID (SSLIOP, @@ -132,4 +131,4 @@ TAO::SSLIOP::TargetCredentials::release (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW (CORBA::NO_IMPLEMENT ()); } -TAO_ENDBEGIN_VERSIONED_NAMESPACE_DECL +TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h index 826ff3da7ba..951d2139ad9 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h @@ -122,7 +122,7 @@ namespace TAO } } -TAO_ENDBEGIN_VERSIONED_NAMESPACE_DECL +TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" |