ChangeLogTag: Sat Oct 19 08:40:46 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>

7 files changed, 117 insertions, 102 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index ff6b34b3840..c5137d361c5 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,16 @@
+Sat Oct 19 08:40:46 2002  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
+
+	* 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: Renamed the class
+	  LogConsumer declared by the same name in all the translation
+	  units as TAO_Rtec_LogConsumer, TAO_Notify_LogConsumer and
+	  TAO_Event_LogConsumer. This should fix link time warnings in
+	  SUNCC builds.
+
 Fri Oct 18 23:32:11 2002  Mayur Deshpande  <mayur@ics.uci.edu>
 
 	* examples/AMH/Sink_Server/Timer_Handler.cpp (handle_timeout):
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
index 107e2449410..4ab8381e1d0 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
@@ -8,17 +8,17 @@ ACE_RCSID (Log,
            "$Id$")
 
 
-LogConsumer::LogConsumer (EventLog_i *log)
+TAO_Event_LogConsumer::TAO_Event_LogConsumer (EventLog_i *log)
   : log_ (log)
 {
 }
 
-LogConsumer::~LogConsumer (void)
+TAO_Event_LogConsumer::~TAO_Event_LogConsumer (void)
 {
 }
 
 void
-LogConsumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin)
+TAO_Event_LogConsumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin)
 {
   // Connect to the event channel.
   CosEventComm::PushConsumer_var myself = this->_this ();
@@ -27,11 +27,11 @@ LogConsumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin)
 }
 
 void
-LogConsumer::push (const CORBA::Any& data ACE_ENV_ARG_DECL)
+TAO_Event_LogConsumer::push (const CORBA::Any& data ACE_ENV_ARG_DECL)
 ACE_THROW_SPEC ((
-		CORBA::SystemException,
-		CosEventComm::Disconnected
-	))
+                CORBA::SystemException,
+                CosEventComm::Disconnected
+        ))
 {
   // create a record list...
   DsLogAdmin::RecordList recList (1);
@@ -46,10 +46,10 @@ ACE_THROW_SPEC ((
 }
 
 void
-LogConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
-	ACE_THROW_SPEC ((
-		CORBA::SystemException
-	))
+TAO_Event_LogConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+        ACE_THROW_SPEC ((
+                CORBA::SystemException
+        ))
 {
   this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
@@ -167,7 +167,7 @@ EventLog_i::activate (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   // Create the PushConsumer that will log the events.
-  this->my_log_consumer_ = new LogConsumer (this);
+  this->my_log_consumer_ = new TAO_Event_LogConsumer (this);
   ACE_CHECK;
   this->my_log_consumer_->connect (consumer_admin.in ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
index 585ec292427..33113a71e1b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
@@ -8,7 +8,7 @@
  *
  *  Implementation of the DsLogAdmin::EventLog interface.
  *
- * 
+ *
  *
  *  @author Rob Ruff <rruff@scires.com>
  *  @D A Hanvey <d.hanvey@qub.ac.uk>
@@ -17,11 +17,8 @@
 
 #ifndef TLS_EVENTLOG_I_H
 #define TLS_EVENTLOG_I_H
+#include "ace/pre.h"
 
-#include "orbsvcs/DsLogAdminS.h"
-#include "orbsvcs/DsEventLogAdminS.h"
-#include "orbsvcs/Log/Log_i.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
 
 #include "eventlog_export.h"
 
@@ -29,6 +26,11 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/DsEventLogAdminS.h"
+#include "orbsvcs/Log/Log_i.h"
+#include "orbsvcs/CosEvent/CEC_EventChannel.h"
+
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
 #pragma warning(push)
@@ -46,25 +48,25 @@ using DsLogAdmin::wrap;
 #endif /* (_MSC_VER) && (_MSC_VER == 1100) */
 
 
-class LogConsumer : public virtual POA_CosEventComm::PushConsumer
+class TAO_Event_LogConsumer : public virtual POA_CosEventComm::PushConsumer
 {
   public:
-    LogConsumer (EventLog_i *log);
-    ~LogConsumer (void);
+    TAO_Event_LogConsumer (EventLog_i *log);
+    ~TAO_Event_LogConsumer (void);
 
     void
       connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
 
   private:
     void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
-	ACE_THROW_SPEC ((
-		CORBA::SystemException
-	));
+        ACE_THROW_SPEC ((
+                CORBA::SystemException
+        ));
     void push (const CORBA::Any& data ACE_ENV_ARG_DECL)
-	ACE_THROW_SPEC ((
-		CORBA::SystemException,
-		CosEventComm::Disconnected
-	));
+        ACE_THROW_SPEC ((
+                CORBA::SystemException,
+                CosEventComm::Disconnected
+        ));
 
     CosEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_;
 
@@ -77,7 +79,7 @@ class LogConsumer : public virtual POA_CosEventComm::PushConsumer
  * @brief EventLog_i
  *
  * The class supports the @c destroy> method to destroy the Log.
- */ 
+ */
 class EventLog_i : public Log_i,
                    public POA_DsEventLogAdmin::EventLog,
                    public virtual PortableServer::RefCountServantBase
@@ -114,16 +116,16 @@ public:
 
   CosEventChannelAdmin::ConsumerAdmin_ptr
   for_consumers (ACE_ENV_SINGLE_ARG_DECL)
-	ACE_THROW_SPEC ((
-		CORBA::SystemException
-	));
+        ACE_THROW_SPEC ((
+                CORBA::SystemException
+        ));
   // The CosEventChannelAdmin::EventChannel interface.
 
   CosEventChannelAdmin::SupplierAdmin_ptr
   for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
-	ACE_THROW_SPEC ((
-		CORBA::SystemException
-	));
+        ACE_THROW_SPEC ((
+                CORBA::SystemException
+        ));
   // The CosEventChannelAdmin::EventChannel interface.
 
   void write_recordlist (const DsLogAdmin::RecordList & list
@@ -137,14 +139,14 @@ public:
   // Used to write records to the log.
 
  protected:
-   
+
    /// Destructor
    /**
     * Protected destructor to enforce proper memory management through
     * reference counting.
     */
   ~EventLog_i ();
- 
+
  protected:
   LogMgr_i &logmgr_i_;
   // Used to access the hash map that holds all the Logs created.
@@ -153,7 +155,7 @@ public:
   TAO_CEC_EventChannel *event_channel_;
   // The Event Channel that the log uses.
 
-  LogConsumer *my_log_consumer_;
+  TAO_Event_LogConsumer *my_log_consumer_;
   // The PushConsumer that consumes the events and stores them
   // in the log.
 };
@@ -162,4 +164,5 @@ public:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include "ace/post.h"
 #endif /* TLS_EVENTLOG_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
index 4a3ec86fd6b..f72482221b9 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
@@ -10,19 +10,19 @@ ACE_RCSID (Log,
 #define CA_FILTER "threshold > 10"
 #define TCL_GRAMMAR "TCL"
 
-LogConsumer::LogConsumer (NotifyLog_i *log)
+TAO_Notify_LogConsumer::TAO_Notify_LogConsumer (NotifyLog_i *log)
 : log_ (log)
 {
   // No-Op.
 }
 
-LogConsumer::~LogConsumer (void)
+TAO_Notify_LogConsumer::~TAO_Notify_LogConsumer (void)
 {
   // No-Op.
 }
 
 void
-LogConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL)
+TAO_Notify_LogConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL)
 {
   // Activate the consumer with the default_POA_
   CosNotifyComm::StructuredPushConsumer_var objref =
@@ -50,7 +50,7 @@ LogConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin AC
 }
 
 void
-LogConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_LogConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->proxy_supplier_->
     disconnect_structured_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -58,7 +58,7 @@ LogConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-LogConsumer::offer_change
+TAO_Notify_LogConsumer::offer_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed*/
     ACE_ENV_ARG_DECL_NOT_USED)
@@ -71,7 +71,7 @@ LogConsumer::offer_change
 }
 
 void
-LogConsumer::push_structured_event
+TAO_Notify_LogConsumer::push_structured_event
    (const CosNotification::StructuredEvent & notification
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
@@ -98,7 +98,7 @@ LogConsumer::push_structured_event
 }
 
 void
-LogConsumer::disconnect_structured_push_consumer
+TAO_Notify_LogConsumer::disconnect_structured_push_consumer
    (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
@@ -143,7 +143,7 @@ NotifyLog_i::~NotifyLog_i ()
   // No-Op.
 }
 
-DsLogAdmin::Log_ptr 
+DsLogAdmin::Log_ptr
 NotifyLog_i::copy (DsLogAdmin::LogId &id ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -156,9 +156,9 @@ NotifyLog_i::copy (DsLogAdmin::LogId &id ACE_ENV_ARG_DECL)
   CosNotification::QoSProperties* qos = get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
   CosNotification::AdminProperties* admin = get_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
 
-  DsNotifyLogAdmin::NotifyLog_var log = 
+  DsNotifyLogAdmin::NotifyLog_var log =
     notifyLogFactory->create (DsLogAdmin::halt, 0, thresholds_, ACE_static_cast(const CosNotification::QoSProperties, *qos),
-			       ACE_static_cast(const CosNotification::AdminProperties, *admin), id);
+                               ACE_static_cast(const CosNotification::AdminProperties, *admin), id);
 
   this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
@@ -166,7 +166,7 @@ NotifyLog_i::copy (DsLogAdmin::LogId &id ACE_ENV_ARG_DECL)
   return log._retn ();
 }
 
-DsLogAdmin::Log_ptr 
+DsLogAdmin::Log_ptr
 NotifyLog_i::copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -179,9 +179,9 @@ NotifyLog_i::copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
   CosNotification::QoSProperties* qos = get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
   CosNotification::AdminProperties* admin = get_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
 
-  DsNotifyLogAdmin::NotifyLog_var log = 
+  DsNotifyLogAdmin::NotifyLog_var log =
     notifyLogFactory->create_with_id (id, DsLogAdmin::halt, 0, thresholds_, ACE_static_cast(const CosNotification::QoSProperties, *qos),
-			       ACE_static_cast(const CosNotification::AdminProperties, *admin));
+                               ACE_static_cast(const CosNotification::AdminProperties, *admin));
 
   this->copy_attributes (log.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
@@ -218,7 +218,7 @@ NotifyLog_i::activate (ACE_ENV_SINGLE_ARG_DECL)
 {
 
   CosNotifyChannelAdmin::AdminID adminid = 0;
-  CosNotifyChannelAdmin::InterFilterGroupOperator ifgop = 
+  CosNotifyChannelAdmin::InterFilterGroupOperator ifgop =
     CosNotifyChannelAdmin::OR_OP;
 
   this->consumer_admin_ =
@@ -261,10 +261,10 @@ NotifyLog_i::activate (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   ACE_NEW_THROW_EX (this->my_log_consumer_,
-                    LogConsumer (this),
-                    CORBA::NO_MEMORY ()); 
+                    TAO_Notify_LogConsumer (this),
+                    CORBA::NO_MEMORY ());
 
-  this->my_log_consumer_->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER);         
+  this->my_log_consumer_->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
 }
 
 //IDL to C++
@@ -273,7 +273,7 @@ NotifyLog_i::get_filter (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
-{  
+{
   //TODO: need to add impl
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
@@ -344,14 +344,14 @@ NotifyLog_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
-{  
+{
   return this->event_channel_->new_for_suppliers (op,id ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
 NotifyLog_i::get_consumeradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
-      CosNotifyChannelAdmin::AdminNotFound, 
+      CosNotifyChannelAdmin::AdminNotFound,
       CORBA::SystemException
     ))
 {
@@ -361,7 +361,7 @@ NotifyLog_i::get_consumeradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_ARG_DE
 CosNotifyChannelAdmin::SupplierAdmin_ptr
 NotifyLog_i::get_supplieradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
-      CosNotifyChannelAdmin::AdminNotFound, 
+      CosNotifyChannelAdmin::AdminNotFound,
       CORBA::SystemException
     ))
 {
@@ -373,7 +373,7 @@ NotifyLog_i::get_all_consumeradmins (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
-{ 
+{
   return this->event_channel_->get_all_consumeradmins (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
@@ -398,7 +398,7 @@ NotifyLog_i::get_admin (ACE_ENV_SINGLE_ARG_DECL)
 void
 NotifyLog_i::set_admin (const CosNotification::AdminProperties& admin ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
-      CosNotification::UnsupportedAdmin, 
+      CosNotification::UnsupportedAdmin,
       CORBA::SystemException
     ))
 {
@@ -418,7 +418,7 @@ NotifyLog_i::get_qos (ACE_ENV_SINGLE_ARG_DECL)
 void
 NotifyLog_i::set_qos (const CosNotification::QoSProperties& qos ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
-      CosNotification::UnsupportedQoS, 
+      CosNotification::UnsupportedQoS,
       CORBA::SystemException
     ))
 {
@@ -432,12 +432,12 @@ void
 NotifyLog_i::validate_qos (const CosNotification::QoSProperties& required_qos,
     CosNotification::NamedPropertyRangeSeq_out available_qos ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
-      CosNotification::UnsupportedQoS, 
+      CosNotification::UnsupportedQoS,
       CORBA::SystemException
     ))
 {
   ACE_UNUSED_ARG (required_qos);
- 
+
   ACE_UNUSED_ARG (available_qos);
 
   ACE_THROW (CORBA::NO_IMPLEMENT ());
@@ -445,7 +445,7 @@ NotifyLog_i::validate_qos (const CosNotification::QoSProperties& required_qos,
   //TODO: need to add later
 }
 
-CosEventChannelAdmin::ConsumerAdmin_ptr 
+CosEventChannelAdmin::ConsumerAdmin_ptr
 NotifyLog_i::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -454,7 +454,7 @@ NotifyLog_i::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
   return this->event_channel_->for_consumers(ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CosEventChannelAdmin::SupplierAdmin_ptr 
+CosEventChannelAdmin::SupplierAdmin_ptr
 NotifyLog_i::for_suppliers (
       ACE_ENV_SINGLE_ARG_DECL
     )
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
index 98b32b57eb2..80318c9d507 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
@@ -7,7 +7,7 @@
  *  $Id$
  *
  *  Implementation of the DsNotifyLogAdmin::NotifyLog interface.
- *  
+ *
  *
  *  @author David A. Hanvey <d.hanvey@qub.ac.uk>
  */
@@ -43,18 +43,18 @@ class NotifyLogFactory_i;
 using DsLogAdmin::wrap;
 #endif /* (_MSC_VER) && (_MSC_VER == 1100) */
 
-class LogConsumer : public virtual POA_CosNotifyComm::StructuredPushConsumer, 
+class TAO_Notify_LogConsumer : public virtual POA_CosNotifyComm::StructuredPushConsumer,
                     public PortableServer::RefCountServantBase
 {
 public:
-  LogConsumer (NotifyLog_i *log);
+  TAO_Notify_LogConsumer (NotifyLog_i *log);
 
   void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL);
 
   virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL);
 
 protected:
-  virtual ~LogConsumer (void);
+  virtual ~TAO_Notify_LogConsumer (void);
 
   // = NotifyPublish method
   virtual void offer_change (
@@ -187,14 +187,14 @@ public:
   CosNotifyChannelAdmin::ConsumerAdmin_ptr
   get_consumeradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
-      CosNotifyChannelAdmin::AdminNotFound, 
+      CosNotifyChannelAdmin::AdminNotFound,
       CORBA::SystemException
     ));
 
   CosNotifyChannelAdmin::SupplierAdmin_ptr
   get_supplieradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
-      CosNotifyChannelAdmin::AdminNotFound, 
+      CosNotifyChannelAdmin::AdminNotFound,
       CORBA::SystemException
     ));
 
@@ -218,7 +218,7 @@ public:
 
   void set_admin (const CosNotification::AdminProperties& admin ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
-      CosNotification::UnsupportedAdmin, 
+      CosNotification::UnsupportedAdmin,
       CORBA::SystemException
     ));
 
@@ -230,24 +230,24 @@ public:
 
   void set_qos (const CosNotification::QoSProperties& ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
-      CosNotification::UnsupportedQoS, 
+      CosNotification::UnsupportedQoS,
       CORBA::SystemException
     ));
 
   void validate_qos (const CosNotification::QoSProperties&,
     CosNotification::NamedPropertyRangeSeq_out ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
-      CosNotification::UnsupportedQoS, 
+      CosNotification::UnsupportedQoS,
       CORBA::SystemException
     ));
 
-  CosEventChannelAdmin::ConsumerAdmin_ptr 
+  CosEventChannelAdmin::ConsumerAdmin_ptr
   for_consumers (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  CosEventChannelAdmin::SupplierAdmin_ptr 
+  CosEventChannelAdmin::SupplierAdmin_ptr
   for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -266,7 +266,7 @@ protected:
   // Used to access the hash map that holds all the Logs created.
 
 private:
-  LogConsumer *my_log_consumer_;
+  TAO_Notify_LogConsumer *my_log_consumer_;
 
   CosNotifyChannelAdmin::EventChannel_var event_channel_;
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
index 27e550e7dd0..964d3d9a936 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
@@ -18,32 +18,32 @@ ACE_RCSID (Log,
            "$Id$")
 
 
-LogConsumer::LogConsumer (RTEventLog_i *log)
+TAO_Rtec_LogConsumer::TAO_Rtec_LogConsumer (RTEventLog_i *log)
 : log_ (log)
 {
   // No-Op.
 }
 
-LogConsumer::~LogConsumer (void)
+TAO_Rtec_LogConsumer::~TAO_Rtec_LogConsumer (void)
 {
   // No-Op.
 }
 
 void
-LogConsumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin)
+TAO_Rtec_LogConsumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin)
 {
   RtecEventComm::PushConsumer_var myself = this->_this ();
   this->supplier_proxy_ = consumer_admin->obtain_push_supplier ();
 
   ACE_ConsumerQOS_Factory qos;
   qos.start_disjunction_group (1);
-  qos.insert_type (ACE_ES_EVENT_ANY, 
+  qos.insert_type (ACE_ES_EVENT_ANY,
                    0);
   this->supplier_proxy_->connect_push_consumer (myself.in(), qos.get_ConsumerQOS ());
 }
 
 void
-LogConsumer::push (const RtecEventComm::EventSet& events ACE_ENV_ARG_DECL)
+TAO_Rtec_LogConsumer::push (const RtecEventComm::EventSet& events ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // create a record list...
@@ -55,11 +55,11 @@ LogConsumer::push (const RtecEventComm::EventSet& events ACE_ENV_ARG_DECL)
   this->log_->write_recordlist (recList ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK;
-  
+
 }
 
 void
-LogConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Rtec_LogConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -79,12 +79,12 @@ RTEventLog_i::RTEventLog_i (LogMgr_i &logmgr_i,
   ACE_UNUSED_ARG (event_log_factory);
 
   ACE_DECLARE_NEW_CORBA_ENV;
-  
+
   PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 
   TAO_EC_Event_Channel_Attributes attr (poa.in(), poa.in());
 
-  ACE_NEW_THROW_EX (this->event_channel_, 
+  ACE_NEW_THROW_EX (this->event_channel_,
                     TAO_EC_Event_Channel(attr),
                     CORBA::NO_MEMORY ());
 }
@@ -95,7 +95,7 @@ RTEventLog_i::~RTEventLog_i ()
 }
 
 
-DsLogAdmin::Log_ptr 
+DsLogAdmin::Log_ptr
 RTEventLog_i::copy (DsLogAdmin::LogId &id ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -103,7 +103,7 @@ RTEventLog_i::copy (DsLogAdmin::LogId &id ACE_ENV_ARG_DECL)
     RTEventLogAdmin::EventLogFactory::_narrow (factory_.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
 
-  RTEventLogAdmin::EventLog_var log = 
+  RTEventLogAdmin::EventLog_var log =
     eventLogFactory->create (DsLogAdmin::halt, 0, thresholds_,
                              id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
@@ -115,7 +115,7 @@ RTEventLog_i::copy (DsLogAdmin::LogId &id ACE_ENV_ARG_DECL)
 
 }
 
-DsLogAdmin::Log_ptr 
+DsLogAdmin::Log_ptr
 RTEventLog_i::copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((DsLogAdmin::LogIdAlreadyExists, CORBA::SystemException))
 {
@@ -123,7 +123,7 @@ RTEventLog_i::copy_with_id (DsLogAdmin::LogId id ACE_ENV_ARG_DECL)
     RTEventLogAdmin::EventLogFactory::_narrow (factory_.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
 
-  RTEventLogAdmin::EventLog_var log = 
+  RTEventLogAdmin::EventLog_var log =
     eventLogFactory->create_with_id (id, DsLogAdmin::halt, 0,
                                      thresholds_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DsLogAdmin::Log::_nil ());
@@ -165,18 +165,18 @@ RTEventLog_i::activate (ACE_ENV_SINGLE_ARG_DECL)
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
     this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
 
-  this->my_log_consumer_ = new LogConsumer (this);
+  this->my_log_consumer_ = new TAO_Rtec_LogConsumer (this);
   this->my_log_consumer_->connect (consumer_admin.in ());
 }
 
-RtecEventChannelAdmin::ConsumerAdmin_ptr 
+RtecEventChannelAdmin::ConsumerAdmin_ptr
 RTEventLog_i::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->event_channel_->for_consumers(ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-RtecEventChannelAdmin::SupplierAdmin_ptr 
+RtecEventChannelAdmin::SupplierAdmin_ptr
 RTEventLog_i::for_suppliers (
       ACE_ENV_SINGLE_ARG_DECL
     )
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
index 7167eda7743..99f50bb4549 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
@@ -7,7 +7,7 @@
  *  $Id$
  *
  *  Implementation of the RTEventLogAdmin::NotifyLog interface.
- *  
+ *
  *
  *  @author David A. Hanvey <d.hanvey@qub.ac.uk>
  */
@@ -45,14 +45,13 @@ class RTEventLogFactory_i;
 using DsLogAdmin::wrap;
 #endif /* (_MSC_VER) && (_MSC_VER == 1100) */
 
-class LogConsumer : public virtual POA_RtecEventComm::PushConsumer
+class TAO_RTEventLog_Export TAO_Rtec_LogConsumer :public virtual POA_RtecEventComm::PushConsumer
 {
 public:
-  LogConsumer (RTEventLog_i *log);
-  ~LogConsumer (void);
+  TAO_Rtec_LogConsumer (RTEventLog_i *log);
+  ~TAO_Rtec_LogConsumer (void);
 
-  void
-  connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
+  void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin);
 
 private:
   void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
@@ -103,11 +102,11 @@ public:
   void
   activate (ACE_ENV_SINGLE_ARG_DECL);
 
-  RtecEventChannelAdmin::ConsumerAdmin_ptr 
+  RtecEventChannelAdmin::ConsumerAdmin_ptr
   for_consumers (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  RtecEventChannelAdmin::SupplierAdmin_ptr 
+  RtecEventChannelAdmin::SupplierAdmin_ptr
   for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -141,7 +140,7 @@ public:
  private:
   TAO_EC_Event_Channel *event_channel_;
 
-  LogConsumer *my_log_consumer_;
+  TAO_Rtec_LogConsumer *my_log_consumer_;
 
   /// The observer strategy
   TAO_EC_ObserverStrategy *observer_strategy_;