summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2003-03-14 16:47:12 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2003-03-14 16:47:12 +0000
commite8b4474d8927fde8352697ef202983b58688f388 (patch)
tree9ec9f8ea527a7e7bceb01a6c55f35b840d7497b0
parent134614cb6dbb15a26b76aa9f3fbfb59b847e149c (diff)
downloadATCD-e8b4474d8927fde8352697ef202983b58688f388.tar.gz
ChangeLogTag:Fri Mar 14 08:46:46 2003 Ossama Othman <ossama@uci.edu>
-rw-r--r--TAO/ChangeLog10
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h6
3 files changed, 16 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 67be8332b50..ec3c5521eb6 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Fri Mar 14 08:46:46 2003 Ossama Othman <ossama@uci.edu>
+
+ * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h:
+ * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp (create_profile)
+ (create_new_profile, create_shared_profile):
+
+ Corrected ObjectKey parameter in these methods. The
+ "TAO_ObjectKey" type has been replaced by the "TAO::ObjectKey"
+ type.
+
Thu Mar 13 19:20:30 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
* orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
index 4eb1b39f0ef..6d91e7a8e49 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
@@ -92,7 +92,7 @@ TAO_SSLIOP_Acceptor::~TAO_SSLIOP_Acceptor (void)
}
int
-TAO_SSLIOP_Acceptor::create_profile (const TAO_ObjectKey &object_key,
+TAO_SSLIOP_Acceptor::create_profile (const TAO::ObjectKey &object_key,
TAO_MProfile &mprofile,
CORBA::Short priority)
{
@@ -113,7 +113,7 @@ TAO_SSLIOP_Acceptor::create_profile (const TAO_ObjectKey &object_key,
}
int
-TAO_SSLIOP_Acceptor::create_new_profile (const TAO_ObjectKey &object_key,
+TAO_SSLIOP_Acceptor::create_new_profile (const TAO::ObjectKey &object_key,
TAO_MProfile &mprofile,
CORBA::Short priority)
{
@@ -198,7 +198,7 @@ TAO_SSLIOP_Acceptor::create_new_profile (const TAO_ObjectKey &object_key,
int
-TAO_SSLIOP_Acceptor::create_shared_profile (const TAO_ObjectKey &object_key,
+TAO_SSLIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key,
TAO_MProfile &mprofile,
CORBA::Short priority)
{
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
index 44da7d8d7ab..72c820fd88d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
@@ -76,7 +76,7 @@ public:
int version_minor,
const char *options = 0);
virtual int close (void);
- virtual int create_profile (const TAO_ObjectKey &object_key,
+ virtual int create_profile (const TAO::ObjectKey &object_key,
TAO_MProfile &mprofile,
CORBA::Short priority);
virtual int is_collocated (const TAO_Endpoint* endpoint);
@@ -105,13 +105,13 @@ private:
/// Helper method to add a new profile to the mprofile for
/// each endpoint.
- int create_new_profile (const TAO_ObjectKey &object_key,
+ int create_new_profile (const TAO::ObjectKey &object_key,
TAO_MProfile &mprofile,
CORBA::Short priority);
/// Helper method to create a profile that contains all of
/// our endpoints.
- int create_shared_profile (const TAO_ObjectKey &object_key,
+ int create_shared_profile (const TAO::ObjectKey &object_key,
TAO_MProfile &mprofile,
CORBA::Short priority);