summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TAO/ChangeLog20
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h7
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/EventLog_i.h5
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h5
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h4
9 files changed, 19 insertions, 26 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 2bbd7394914..dee1991cb44 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,8 +1,22 @@
+Sun Jun 11 00:54:57 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
+
+ * orbsvcs/orbsvcs/Log/BasicLog_i.cpp:
+ * orbsvcs/orbsvcs/Log/BasicLog_i.h:
+ * orbsvcs/orbsvcs/Log/EventLog_i.cpp:
+ * orbsvcs/orbsvcs/Log/EventLog_i.h:
+ * orbsvcs/orbsvcs/Log/NotifyLog_i.cpp:
+ * orbsvcs/orbsvcs/Log/NotifyLog_i.h:
+ * orbsvcs/orbsvcs/Log/RTEventLog_i.cpp:
+ * orbsvcs/orbsvcs/Log/RTEventLog_i.h:
+
+ Remove member variable logmgr_i_, as it's also a protected
+ member in the base class.
+
Sat Jun 10 21:54:00 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
- * NEWS:
-
- Mention that NT_Naming_Service and NT_Notify_Service must
+ * NEWS:
+
+ Mention that NT_Naming_Service and NT_Notify_Service must
be enabled by new MPC feature variable "winnt".
Sat Jun 10 18:30:42 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
index ab9dc1cdee9..fa4c1f0af22 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
@@ -14,7 +14,6 @@ TAO_BasicLog_i::TAO_BasicLog_i (CORBA::ORB_ptr orb,
DsLogAdmin::LogMgr_ptr factory,
DsLogAdmin::LogId id)
: TAO_Log_i (orb, logmgr_i, factory, id, 0),
- logmgr_i_(logmgr_i),
poa_(PortableServer::POA::_duplicate(poa))
{
// No-Op.
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
index 1ee94e0799c..e1a51484192 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
@@ -84,12 +84,9 @@ protected:
*/
~TAO_BasicLog_i (void);
-protected:
-
- /// Used to access the hash map that holds all the Logs created.
- TAO_LogMgr_i& logmgr_i_;
+private:
- /// POA.a
+ /// POA.
PortableServer::POA_var poa_;
};
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
index adaa462c6bc..8ddb8c08acf 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
@@ -17,7 +17,6 @@ TAO_EventLog_i::TAO_EventLog_i (CORBA::ORB_ptr orb,
TAO_LogNotification *log_notifier,
DsLogAdmin::LogId id)
: TAO_Log_i (orb, logmgr_i, factory, id, log_notifier),
- logmgr_i_(logmgr_i),
poa_(PortableServer::POA::_duplicate(poa)),
log_poa_(PortableServer::POA::_duplicate(log_poa))
{
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
index 484a72287f5..545591ad31a 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
@@ -111,11 +111,6 @@ protected:
*/
~TAO_EventLog_i ();
-protected:
-
- /// Used to access the hash map that holds all the Logs created.
- TAO_LogMgr_i &logmgr_i_;
-
private:
/// The Event Channel that the log uses.
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
index f89d8acf1c0..fcea7496a39 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
@@ -19,7 +19,6 @@ TAO_NotifyLog_i::TAO_NotifyLog_i (CORBA::ORB_ptr orb,
TAO_LogNotification *log_notifier,
DsLogAdmin::LogId id)
: TAO_Log_i (orb, logmgr_i, factory, id, log_notifier),
- logmgr_i_(logmgr_i),
notify_factory_ (CosNotifyChannelAdmin::EventChannelFactory::_duplicate (ecf)),
poa_ (PortableServer::POA::_duplicate (poa))
{
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
index ff1c8bb70f3..81218cf3962 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
@@ -210,11 +210,6 @@ public:
CORBA::SystemException
));
-protected:
-
- /// Used to access the hash map that holds all the Logs created.
- TAO_LogMgr_i &logmgr_i_;
-
private:
/// The PushConsumer that consumes the events and stores them
/// in the log.
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
index d159d70e800..2192700623e 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
@@ -28,7 +28,6 @@ TAO_RTEventLog_i::TAO_RTEventLog_i (CORBA::ORB_ptr orb,
DsLogAdmin::LogId id
)
: TAO_Log_i (orb, logmgr_i, factory, id, log_notifier),
- logmgr_i_ (logmgr_i),
poa_ (PortableServer::POA::_duplicate (poa)),
log_poa_ (PortableServer::POA::_duplicate (log_poa))
{
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
index 80dab300239..6dc0b4975b3 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
@@ -112,10 +112,6 @@ public:
RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER));
- protected:
- /// Used to access the hash map that holds all the Logs created.
- TAO_LogMgr_i &logmgr_i_;
-
private:
/// The EventChannel used.
TAO_EC_Event_Channel *event_channel_;