1 files changed, 3 insertions, 46 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h
index ba4c6b30f2d..68bb71db2ba 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h
@@ -9,7 +9,7 @@
 //   Notify_QoSAdmin_i.h
 //
 // = DESCRIPTION
-//   Implements get/set methods for QoS properties.
+//
 //
 // = AUTHOR
 //    Pradeep Gore <pradeep@cs.wustl.edu>
@@ -19,20 +19,17 @@
 #define TAO_NOTIFY_QOSADMIN_I_H
 #include "ace/pre.h"
 
-#include "orbsvcs/CosNotificationC.h"
-#include "orbsvcs/TimeBaseC.h"
-
+#include "orbsvcs/CosNotificationS.h"
 #include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class TAO_Notify_Export TAO_Notify_QoSAdmin_i
+class TAO_Notify_Export TAO_Notify_QoSAdmin_i/* : public virtual POA_CosNotification::QoSAdmin */
 {
   // = TITLE
   //   TAO_Notify_QoSAdmin_i
-  //
   // = DESCRIPTION
   //
   //
@@ -68,46 +65,6 @@ public:
     CORBA::SystemException,
     CosNotification::UnsupportedQoS
   ));
-
-protected:
-  // = QoS Properties
-  CORBA::Short event_reliability_;
-  CORBA::Short connection_reliability_;
-  // Reliability properties (to be implemented "later").
-
-  CORBA::Short priority_;
-  // Priority for the event
-
-  /*
-  TimeBase::UtcT start_time_;
-  // Earliest delivery time
-
-  TimeBase::UtcT stop_time_;
-
-  */
-
-  TimeBase::TimeT timeout_;
-  // Expiry time
-
-  CORBA::Boolean start_time_supported_;
-  CORBA::Boolean stop_time_supported_;
-  // Are start/stop times supported
-
-  CORBA::Long max_events_per_consumer_;
-  // Max events allowed to be queued on behalf of a consumer
-
-  CORBA::Short order_policy_;
-  // Order of events in internal buffers.
-
-  CORBA::Short discard_policy_;
-  // Policy to discard when buffers are full.
-
-  CORBA::Long maximum_batch_size_;
-  // Batch size for sequences of structured events.
-
-  TimeBase::TimeT pacing_interval_;
-  // Max. period of time that events are collected before delivering
-  // them as a sequence of structured events.
 };
 
 #include "ace/post.h"