*** empty log message ***

2 files changed, 12 insertions, 25 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 904468dabfd..f355726e5d6 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -5,15 +5,15 @@ Thu Oct 15 20:08:36 1998  Nagarajan Surendran  <naga@cs.wustl.edu>
 	* performance-tests/Cubit/TAO/MT_Cubit/Globals.{h,cpp}:
 	* performance-tests/Cubit/TAO/MT_Cubit/client.cpp:
 	* performance-tests/Cubit/TAO/MT_Cubit/server.h:
-		Removed Naming service code from all the files. MT_Cubit
-	uses only files to share iors of servants to clients. So -s option
-	is also removed. 
+	  Removed Naming service code from all the files. MT_Cubit
+	  uses only files to share iors of servants to clients. So -s option
+	  is also removed. 
 
 	* performance-tests/Cubit/TAO/MT_Cubit/Makefile:
-		Removed liborbsvcs from the LD_LIBS.
+	  Removed liborbsvcs from the LD_LIBS.
 
 	* performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit_Test:
-		Removed -s option for server and client.
+	  Removed -s option for server and client.
 	
 Thu Oct 15 17:29:42 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
 
diff --git a/TAO/orbsvcs/orbsvcs/AVStreams.idl b/TAO/orbsvcs/orbsvcs/AVStreams.idl
index 9199eaebe1e..6bb5a075cd8 100644
--- a/TAO/orbsvcs/orbsvcs/AVStreams.idl
+++ b/TAO/orbsvcs/orbsvcs/AVStreams.idl
@@ -32,11 +32,8 @@ module AVStreams
     //                    <"video_depth", 9>}
     string QoSType;
     // Name of the Qos type, e.g. "video_qos"
-    string QoSParams;
 
-    // @@ Naga, can you please check to see if this can be uncommented
-    // now?
-    //    CosPropertyService::Properties QoSParams;
+    CosPropertyService::Properties QoSParams;
     // Sequence of name value pairs, see e.g. above.
   };
   
@@ -97,10 +94,7 @@ module AVStreams
     QoS theQoS;
   };
 
-  // @@ Naga, can you please check to see if this is working now?
-  // typedef CosPropertyService::Property streamEvent;
-
-  typedef string streamEvent;
+  typedef CosPropertyService::Property streamEvent;
   // Used to convey events, in Basic_StreamCtrl::push_event.
   
   exception notSupported 
@@ -144,10 +138,8 @@ module AVStreams
       string reason;
     };
 
-  // @@ Naga, can you please see if this is working now?
-  //  interface Basic_StreamCtrl : CosPropertyService::PropertySet {
-  interface Basic_StreamCtrl 
-    {
+
+  interface Basic_StreamCtrl : CosPropertyService::PropertySet {
       // = DESCRIPTION
       //    Base class for StreamCtrl, implements basic stream start
       //    and stop functionality.
@@ -257,10 +249,8 @@ module AVStreams
       // ()
     };
   
-  // @@ Naga, can you please see if this works now?
-  //  interface MCastConfigIf : CosPropertyService::PropertySet{
-  interface MCastConfigIf 
-    {
+  interface MCastConfigIf : CosPropertyService::PropertySet{
+
       // = DESCRIPTION
       //   Multicasting operations are not supported yet.
 
@@ -291,10 +281,7 @@ module AVStreams
       // Multicasting operations are not supported yet.
     };
 
-  // @@ Naga, can you please check if this works?
-  //  interface StreamEndPoint : CosPropertyService::PropertySet{
-  interface StreamEndPoint 
-    {
+  interface StreamEndPoint : CosPropertyService::PropertySet{
       // = DESCRIPTION
       //    The Stream EndPoint. Used to implement one endpoint of a
       //    stream that implements the transport layer.