Fixed a few g++ warnings and added code to work properly with property

service.

4 files changed, 11 insertions, 9 deletions

diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index bff3f9cf0b4..11402de63b6 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -95,12 +95,11 @@ TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos,
 // Used by StreamEndPoint and VDev to inform StreamCtrl of events.
 // E.g., loss of flow, reestablishment of flow, etc..
 void
-TAO_Basic_StreamCtrl::push_event (const char *the_event,
+TAO_Basic_StreamCtrl::push_event (const struct CosPropertyService::Property & the_event,
                                   CORBA::Environment &env)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "\n(%P|%t) Recieved event \"%s\"",
-              the_event));
+              "\n(%P|%t) Recieved event \""));
   ACE_UNUSED_ARG (env);
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
index 5882da9dc92..a45d675f83d 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -40,8 +40,10 @@ public:
   AV_Null_MediaCtrl (void);
 };
 
-class TAO_ORBSVCS_Export TAO_Basic_StreamCtrl
-  : public virtual POA_AVStreams::Basic_StreamCtrl
+
+class TAO_ORBSVCS_Export TAO_Basic_StreamCtrl 
+  : public virtual POA_AVStreams::Basic_StreamCtrl,
+    public virtual TAO_PropertySet
 // = DESCRIPTION
 //    Base class for StreamCtrl, implements basic stream start
 //    and stop functionality
@@ -72,7 +74,7 @@ class TAO_ORBSVCS_Export TAO_Basic_StreamCtrl
   // Changes the QoS associated with the stream
   // Empty the_spec means apply operation to all flows
 
-  virtual void push_event (const char *the_event,
+  virtual void push_event (const struct CosPropertyService::Property & the_event,  
                            CORBA::Environment &env);
   // Used by StreamEndPoint and VDev to inform StreamCtrl of events.
   // E.g., loss of flow, reestablishment of flow, etc..
@@ -205,7 +207,8 @@ public:
 
 class TAO_ORBSVCS_Export TAO_StreamEndPoint
   : public virtual POA_AVStreams::StreamEndPoint, // The POA class
-    public virtual TAO_Base_StreamEndPoint
+    public virtual TAO_Base_StreamEndPoint,
+    public virtual TAO_PropertySet
 {
   // = DESCRIPTION
   //    The Stream EndPoint. Used to implement one endpoint of a stream
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
index 42634f7b7bd..7de5721a968 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
@@ -348,8 +348,8 @@ TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &s
       TAO_TRY_ENV.print_exception ("TAO_AV_Endpoint_Process_Strategy_B::create_B\n");
       return -1;
     }
-  return 0;
   TAO_ENDTRY;
+  return 0;
 }
 
 // Gets the B type stream_endpoint from the Naming service
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
index 1aeee3b397e..c85dc46abec 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
@@ -550,7 +550,7 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Child_Process ()
 {
   // Remove the names from the naming service
-  if (this->naming_context_ == 0)
+  if (CORBA::is_nil (this->naming_context_.in ()) == 0)
     return;
   TAO_TRY
     {