summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TAO/ChangeLog12
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h2
3 files changed, 15 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 540245addd0..9c8e01f9436 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,15 @@
+Wed Nov 16 09:05:08 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
+
+ * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h (Current):
+
+ Removed "const" qualifier for tss_slot_ member. It must
+ currently remain mutable.
+
+ * orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h:
+
+ Include "tao/Versioned_Namespace.h" to pull in versioned
+ namespace macro definitions.
+
Wed Nov 16 14:52:32 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu>
* tests/NestedUpcall/Simple/Simple.mpc:
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
index 0c20e111f05..dd949232f3a 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
@@ -149,7 +149,7 @@ namespace TAO
private:
/// TSS slot assigned to this object.
- size_t const tss_slot_;
+ size_t tss_slot_;
/// Pointer to the ORB Core corresponding to the ORB with which this
/// object is registered.
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h
index f1ddb054e8b..1697e836d81 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h
@@ -21,6 +21,8 @@
#pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+#include "tao/Versioned_Namespace.h"
+
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO