diff options
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 19 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h | 22 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h | 2 |
5 files changed, 23 insertions, 24 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 2aea40b5fe4..72635218517 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,22 @@ +Sat Aug 14 20:21:34 2004 Ossama Othman <ossama@dre.vanderbilt.edu> + + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h (OpenSSL_traits): + + Replaced primary template definition with a forward declaration. + OpenSSL data structure-specific traits should always + define/specialize their own traits template. + + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h (OpenSSL_traits): + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h (OpenSSL_traits): + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h (OpenSSL_traits): + + More MSVC++ 6 brain damage. MSVC++ 6 cannot handle + initialization of a static constant variable in the structure + declaration. It considers non-zero initialization to be an + improper pure function specifier despite the fact no function is + declared in this case. Define the constant inside an + enumeration instead to work around the problem. + Sat Aug 14 18:17:59 2004 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/be/be_interface.cpp: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h index cfd1384aebf..fdc1fd922c1 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h @@ -37,7 +37,7 @@ namespace TAO { /// OpenSSL lock ID for use in OpenSSL CRYPTO_add() reference /// count manipulation function. - static const long LOCK_ID = CRYPTO_LOCK_EVP_PKEY; + enum { LOCK_ID = CRYPTO_LOCK_EVP_PKEY }; /// Perform deep copy of the given OpenSSL structure. static ::EVP_PKEY * copy (::EVP_PKEY const & key); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h index d3d1b431937..d08140d244e 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h @@ -35,27 +35,7 @@ namespace TAO * specific to a given OpenSSL data structure. */ template <typename T> - struct OpenSSL_traits - { - /// OpenSSL lock ID for use in OpenSSL CRYPTO_add() reference - /// count manipulation function. - static const long LOCK_ID = -1; - - /// Perform deep copy of the given OpenSSL structure. - static T * copy (T const & st) - { - // Unimplemented. - - return 0; - } - - /// Decrease the reference count on the given OpenSSL - /// structure. - static void release (T * st) - { - // Unimplemented. - } - }; + struct OpenSSL_traits; /** * @name CORBA-style Reference Count Manipulation Methods diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h index 2506e8642ce..eb8875bdbd5 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h @@ -39,7 +39,7 @@ namespace TAO { /// OpenSSL lock ID for use in OpenSSL CRYPTO_add() reference /// count manipulation function. - static const long LOCK_ID = CRYPTO_LOCK_SSL; + enum { LOCK_ID = CRYPTO_LOCK_SSL }; /// Perform deep copy of the given OpenSSL structure. static ::SSL * copy (::SSL const & st) diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h index 06d44dd9204..def49e64af5 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h @@ -37,7 +37,7 @@ namespace TAO { /// OpenSSL lock ID for use in OpenSSL CRYPTO_add() reference /// count manipulation function. - static const long LOCK_ID = CRYPTO_LOCK_X509; + enum { LOCK_ID = CRYPTO_LOCK_X509 }; /// Perform deep copy of the given OpenSSL structure. static ::X509 * copy (::X509 const & st) |