Sat Mar 3 19:07:31 2001 Pradeep Gore <pradeep@cs.wustl.edu>

11 files changed, 368 insertions, 86 deletions

diff --git a/ChangeLog b/ChangeLog
index 59015632e26..5b7ef92ed5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Sat Mar  3 19:07:31 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+	* ace/QoS/QoS_Session_Impl.cpp:
+	* ace/QoS/QoS_Session_Impl.i:
+	* examples/QOS/Fill_ACE_QoS.cpp:
+	* examples/QOS/Fill_ACE_QoS.h:
+	* examples/QOS/Makefile:
+	* examples/QOS/QoS_Util.cpp:
+	* examples/QOS/Receiver_QoS_Event_Handler.cpp:
+	* examples/QOS/Sender_QoS_Event_Handler.cpp:
+	  Fixed various compile warnings when compiling with rapi=1 on
+	  Redhat Linux 6.2
+
 Sat Mar  3 16:47:53 2001  Darrell Brunsch <brunsch@uci.edu>
 
         * bin/fuzz.pl:
@@ -79,7 +92,7 @@ Sat Mar  3 16:47:53 2001  Darrell Brunsch <brunsch@uci.edu>
         * docs/ACE-subsets.html:
         * docs/tutorials/new-tutorials.html:
 
-          Changed references to 
+          Changed references to
           http://www.cs.wustl.edu/~schmidt/ACE_wrappers/* to
           relative paths instead (Fixes the last of the fuzz errors).
 
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 59015632e26..5b7ef92ed5e 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,16 @@
+Sat Mar  3 19:07:31 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+	* ace/QoS/QoS_Session_Impl.cpp:
+	* ace/QoS/QoS_Session_Impl.i:
+	* examples/QOS/Fill_ACE_QoS.cpp:
+	* examples/QOS/Fill_ACE_QoS.h:
+	* examples/QOS/Makefile:
+	* examples/QOS/QoS_Util.cpp:
+	* examples/QOS/Receiver_QoS_Event_Handler.cpp:
+	* examples/QOS/Sender_QoS_Event_Handler.cpp:
+	  Fixed various compile warnings when compiling with rapi=1 on
+	  Redhat Linux 6.2
+
 Sat Mar  3 16:47:53 2001  Darrell Brunsch <brunsch@uci.edu>
 
         * bin/fuzz.pl:
@@ -79,7 +92,7 @@ Sat Mar  3 16:47:53 2001  Darrell Brunsch <brunsch@uci.edu>
         * docs/ACE-subsets.html:
         * docs/tutorials/new-tutorials.html:
 
-          Changed references to 
+          Changed references to
           http://www.cs.wustl.edu/~schmidt/ACE_wrappers/* to
           relative paths instead (Fixes the last of the fuzz errors).
 
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 59015632e26..5b7ef92ed5e 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,16 @@
+Sat Mar  3 19:07:31 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
+
+	* ace/QoS/QoS_Session_Impl.cpp:
+	* ace/QoS/QoS_Session_Impl.i:
+	* examples/QOS/Fill_ACE_QoS.cpp:
+	* examples/QOS/Fill_ACE_QoS.h:
+	* examples/QOS/Makefile:
+	* examples/QOS/QoS_Util.cpp:
+	* examples/QOS/Receiver_QoS_Event_Handler.cpp:
+	* examples/QOS/Sender_QoS_Event_Handler.cpp:
+	  Fixed various compile warnings when compiling with rapi=1 on
+	  Redhat Linux 6.2
+
 Sat Mar  3 16:47:53 2001  Darrell Brunsch <brunsch@uci.edu>
 
         * bin/fuzz.pl:
@@ -79,7 +92,7 @@ Sat Mar  3 16:47:53 2001  Darrell Brunsch <brunsch@uci.edu>
         * docs/ACE-subsets.html:
         * docs/tutorials/new-tutorials.html:
 
-          Changed references to 
+          Changed references to
           http://www.cs.wustl.edu/~schmidt/ACE_wrappers/* to
           relative paths instead (Fixes the last of the fuzz errors).
 
diff --git a/ace/QoS/QoS_Session_Impl.cpp b/ace/QoS/QoS_Session_Impl.cpp
index 430ec8a6c1e..d012fc2cb2d 100644
--- a/ace/QoS/QoS_Session_Impl.cpp
+++ b/ace/QoS/QoS_Session_Impl.cpp
@@ -39,6 +39,12 @@ rsvp_callback (rapi_sid_t sid,
                void *args
                )
 {
+  ACE_UNUSED_ARG (sid);
+  ACE_UNUSED_ARG (style_id);
+  ACE_UNUSED_ARG (filter_spec_no);
+  ACE_UNUSED_ARG (filter_spec_list);
+  ACE_UNUSED_ARG (ad_spec_no);
+  ACE_UNUSED_ARG (ad_spec_list);
 
   if (args == 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -156,6 +162,8 @@ rsvp_callback (rapi_sid_t sid,
   // Set the updated ACE_QoS for the RSVP callback argument(QoS session).
   qos_session->qos (ace_qos);
 
+  // @@ what is the meaning of the return value. RAPI docs don't say anything!
+  return 0;
 }
 
 // Constructor.
@@ -199,7 +207,9 @@ ACE_RAPI_Session::open (ACE_INET_Addr dest_addr,
 int
 ACE_RAPI_Session::close (void)
 {
-  if (rsvp_error = rapi_release(this->session_id_))
+  this->rsvp_error = rapi_release(this->session_id_);
+
+  if (rsvp_error == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Can't release RSVP session:\n\t%s\n",
                        rapi_errlist[rsvp_error]),
@@ -207,7 +217,7 @@ ACE_RAPI_Session::close (void)
   else
     ACE_DEBUG ((LM_DEBUG,
                 "rapi session with id %d released successfully.\n",
-               this->session_id_));
+                this->session_id_));
   return 0;
 }
 
@@ -217,6 +227,7 @@ ACE_RAPI_Session::qos (ACE_SOCK *socket,
                        const ACE_QoS &ace_qos)
 {
   ACE_UNUSED_ARG (socket);
+  ACE_UNUSED_ARG (qos_manager);
 
   // If sender : call sending_qos ()
   // If receiver : call receiving_qos ()
diff --git a/ace/QoS/QoS_Session_Impl.i b/ace/QoS/QoS_Session_Impl.i
index d3bf61c663a..c3093814ac9 100644
--- a/ace/QoS/QoS_Session_Impl.i
+++ b/ace/QoS/QoS_Session_Impl.i
@@ -57,7 +57,7 @@ ACE_RAPI_Session::rsvp_events_handle (void)
 }
 
 // Get the End Point Type (Sender/Receiver/Both).
-ACE_INLINE ACE_End_Point_Type
+ACE_INLINE ACE_QoS_Session::ACE_End_Point_Type
 ACE_RAPI_Session::flags (void) const
 {
   return this->flags_;
diff --git a/examples/QOS/Fill_ACE_QoS.cpp b/examples/QOS/Fill_ACE_QoS.cpp
index 87d893b92bd..655e48cc742 100644
--- a/examples/QOS/Fill_ACE_QoS.cpp
+++ b/examples/QOS/Fill_ACE_QoS.cpp
@@ -30,16 +30,16 @@ int
 Fill_ACE_QoS::fill_simplex_receiver_qos (ACE_QoS &ace_qos,
                                          const ACE_CString &recv_flow_name)
 {
-  ACE_Flow_Spec *recv_flow_spec = new ACE_Flow_Spec ();
+  ACE_Flow_Spec *recv_flow_spec = 0;
 
-   if (this->map ().find (recv_flow_name, recv_flow_spec) != 0)
-     ACE_ERROR_RETURN ((LM_DEBUG,
-                        "Unable to find a FlowSpec with name %s",
-                        recv_flow_name.c_str ()),
-                       -1);
-   ace_qos.receiving_flowspec (*recv_flow_spec);
-   ace_qos.sending_flowspec (*(this->default_traffic_));
-   ace_qos.provider_specific (Fill_ACE_QoS::iov_);
+  if (this->map ().find (recv_flow_name, recv_flow_spec) != 0)
+    ACE_ERROR_RETURN ((LM_DEBUG,
+                       "Unable to find a FlowSpec with name %s",
+                       recv_flow_name.c_str ()),
+                      -1);
+  ace_qos.receiving_flowspec (*recv_flow_spec);
+  ace_qos.sending_flowspec (*(this->default_traffic_));
+  ace_qos.provider_specific (Fill_ACE_QoS::iov_);
 
   return 0;
 }
@@ -64,7 +64,7 @@ Fill_ACE_QoS::fill_simplex_sender_qos (ACE_QoS &ace_qos,
   return 0;
 }
 
-int 
+int
 Fill_ACE_QoS::fill_duplex_qos (ACE_QoS &ace_qos,
                                const ACE_CString &recv_flow_name,
                                const ACE_CString &send_flow_name)
@@ -77,13 +77,13 @@ Fill_ACE_QoS::fill_duplex_qos (ACE_QoS &ace_qos,
                        "Unable to find a FlowSpec with name %s",
                        recv_flow_name.c_str ()),
                       -1);
-  
+
   if (this->map ().find (send_flow_name, send_flow_spec) != 0)
     ACE_ERROR_RETURN ((LM_DEBUG,
                        "Unable to find a FlowSpec with name %s",
                        send_flow_name.c_str ()),
                       -1);
-  
+
   ace_qos.receiving_flowspec (*recv_flow_spec);
   ace_qos.sending_flowspec (*send_flow_spec);
   ace_qos.provider_specific (Fill_ACE_QoS::iov_);
@@ -91,7 +91,7 @@ Fill_ACE_QoS::fill_duplex_qos (ACE_QoS &ace_qos,
   return 0;
 }
 
-Fill_ACE_QoS::FLOW_SPEC_HASH_MAP
+Fill_ACE_QoS::FLOW_SPEC_HASH_MAP&
 Fill_ACE_QoS::map (void)
 {
   return this->flow_spec_map_;
@@ -112,5 +112,3 @@ template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_Flow_Spec *, ACE_H
 #pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Thread_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Thread_Mutex>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
diff --git a/examples/QOS/Fill_ACE_QoS.h b/examples/QOS/Fill_ACE_QoS.h
index 3dd92f548e4..9c48633d47f 100644
--- a/examples/QOS/Fill_ACE_QoS.h
+++ b/examples/QOS/Fill_ACE_QoS.h
@@ -26,10 +26,10 @@
 class Fill_ACE_QoS
 {
   //  TITLE
-  //    This class helps users to add new flow specs and provides 
+  //    This class helps users to add new flow specs and provides
   //    utility functions for filling up the flow specs for simplex/duplex
   //    sessions.
-   
+
 public:
   typedef ACE_Hash_Map_Manager <ACE_CString, ACE_Flow_Spec *, ACE_Null_Mutex> FLOW_SPEC_HASH_MAP;
 
@@ -44,34 +44,32 @@ public:
                                  const ACE_CString &recv_flow_name);
   // To be used by receivers. Fills the receiver qos and sets the
   // sender qos to NO_TRAFFIC.
-  
+
   int fill_simplex_sender_qos (ACE_QoS &ace_qos,
                                const ACE_CString &send_flow_name);
   // To be used by senders. Fills the sender qos and sets the receiver
   // qos to NO_TRAFFIC.
-  
+
   int fill_duplex_qos (ACE_QoS &ace_qos,
                        const ACE_CString &recv_flow_name,
                        const ACE_CString &send_flow_name);
   // To be used by applications that wish to be both receivers and
   // senders.
 
-  FLOW_SPEC_HASH_MAP map (void);
+  FLOW_SPEC_HASH_MAP& map (void);
   // Returns the hash map of flowspecs indexed by flowspec name.
-  
+
 private:
-  
-  // The Service Provider is currently set to NULL for all ACE_QoS. 
+
+  // The Service Provider is currently set to NULL for all ACE_QoS.
   static const iovec iov_;
-  
+
   // A NO_TRAFFIC flow spec. Senders set the receiving qos to this
   // while the receivers set the sending qos to this.
   ACE_Flow_Spec *default_traffic_;
 
   // A list of flowspecs indexed by the flowspec name.
   FLOW_SPEC_HASH_MAP flow_spec_map_;
-
-
 };
 
 #endif /* FILL_ACE_QOS_H */
diff --git a/examples/QOS/Makefile b/examples/QOS/Makefile
index c197ad6b6cf..b688dd6b38d 100644
--- a/examples/QOS/Makefile
+++ b/examples/QOS/Makefile
@@ -2,92 +2,304 @@
 #
 # $Id$
 #
-#	Makefile for the Reactor multicast tests
-#----------------------------------------------------------------------------
+LDLIBS += -lACE_QoS
 
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
-SIMPLE_CLT_OBJS = \
-		QoS_Signal_Handler.o \
-		QoS_Util.o \
-		Fill_ACE_QoS.o \
-                client.o \
+PSRC    = $(addsuffix .cpp,$(BIN))
+
+CLT_OBJS =					\
+		QoS_Signal_Handler.o		\
+		QoS_Util.o			\
+		Fill_ACE_QoS.o			\
+                client.o			\
                 Sender_QoS_Event_Handler.o
 
-SIMPLE_SVR_OBJS = \
-		QoS_Signal_Handler.o \
-		QoS_Util.o \
-		Fill_ACE_QoS.o \
-                server.o \
+SVR_OBJS =					\
+		QoS_Signal_Handler.o		\
+		QoS_Util.o			\
+		Fill_ACE_QoS.o			\
+                server.o			\
                 Receiver_QoS_Event_Handler.o
 
-BUILD 	= $(VBIN)
-
-BIN = server \
-       client
+BIN2 = server					\
+	client
 
-LDLIBS = -lACE_QoS
+BIN = $(BIN2)
 
 #----------------------------------------------------------------------------
-# 	ACE stuff
+#       Include macros and targets
 #----------------------------------------------------------------------------
 
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 #----------------------------------------------------------------------------
-#	Local targets
+#       Local targets
 #----------------------------------------------------------------------------
 
-server: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
-#	$(LINK.cc) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-client: $(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
-#	$(LINK.cc)  -o $@ $^ $(VLDLIBS) $(POSTLINK)
+server: $(addprefix $(VDIR),$(SVR_OBJS))
+	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
+client: $(addprefix $(VDIR),$(CLT_OBJS))
+	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 #----------------------------------------------------------------------------
-#	Dependencies
+#       Dependencies
 #----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/Log_Wrapper.o .obj/Log_Wrapper.so .shobj/Log_Wrapper.o .shobj/Log_Wrapper.so: Log_Wrapper.cpp Log_Wrapper.h \
- $(ACE_ROOT)/ace/Profile_Timer.h \
- $(ACE_ROOT)/ace/ACE.h \
+
+.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \
  $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/QoS/QoS_Session_Factory.h \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/QoS/ACE_QoS_Export.h \
+ $(ACE_ROOT)/ace/QoS/QoS_Decorator.h \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/QoS/SOCK_Dgram_Mcast_QoS.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(ACE_ROOT)/ace/QoS/QoS_Manager.h \
+ $(ACE_ROOT)/ace/QoS/SOCK_Dgram_Mcast_QoS.i \
+ QoS_Util.h Fill_ACE_QoS.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Profile_Timer.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ QoS_Signal_Handler.h Receiver_QoS_Event_Handler.h
+
+.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
  $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/QoS/QoS_Session_Factory.h \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/QoS/ACE_QoS_Export.h \
+ $(ACE_ROOT)/ace/QoS/QoS_Session_Impl.h \
+ $(ACE_ROOT)/ace/QoS/QoS_Session_Impl.i \
+ $(ACE_ROOT)/ace/QoS/QoS_Decorator.h \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/QoS/SOCK_Dgram_Mcast_QoS.h \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK.h \
@@ -95,6 +307,28 @@ client: $(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SOCK.i \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(ACE_ROOT)/ace/QoS/QoS_Manager.h \
+ $(ACE_ROOT)/ace/QoS/SOCK_Dgram_Mcast_QoS.i \
+ QoS_Util.h Fill_ACE_QoS.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ QoS_Signal_Handler.h Sender_QoS_Event_Handler.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/examples/QOS/QoS_Util.cpp b/examples/QOS/QoS_Util.cpp
index bd789d911b4..ffcd9e59e7f 100644
--- a/examples/QOS/QoS_Util.cpp
+++ b/examples/QOS/QoS_Util.cpp
@@ -14,9 +14,9 @@ QoS_Util::QoS_Util (int argc,
                     char *argv[])
   : argc_ (argc),
     argv_ (argv),
+    source_port_ (SENDER_PORT),
     protocol_ (IPPROTO_UDP),
-    multicast_flag_ (0),
-    source_port_ (SENDER_PORT)
+    multicast_flag_ (0)
 {
   ACE_NEW (this->mult_session_addr_,
            ACE_INET_Addr (ACE_DEFAULT_MULTICAST_PORT));
diff --git a/examples/QOS/Receiver_QoS_Event_Handler.cpp b/examples/QOS/Receiver_QoS_Event_Handler.cpp
index 09ac1a87f28..5646e7670df 100644
--- a/examples/QOS/Receiver_QoS_Event_Handler.cpp
+++ b/examples/QOS/Receiver_QoS_Event_Handler.cpp
@@ -81,6 +81,7 @@ Receiver_QoS_Event_Handler::handle_input (ACE_HANDLE)
 int
 Receiver_QoS_Event_Handler::handle_qos (ACE_HANDLE fd)
 {
+  ACE_UNUSED_ARG (fd);
 
   ACE_DEBUG ((LM_DEBUG,
               "\nReceived a QOS event. Inside handle_qos ()\n"));
diff --git a/examples/QOS/Sender_QoS_Event_Handler.cpp b/examples/QOS/Sender_QoS_Event_Handler.cpp
index 5f52a42f554..75eb6930942 100644
--- a/examples/QOS/Sender_QoS_Event_Handler.cpp
+++ b/examples/QOS/Sender_QoS_Event_Handler.cpp
@@ -116,9 +116,10 @@ Sender_QoS_Event_Handler::handle_qos (ACE_HANDLE)
 //      ACE_DEBUG ((LM_DEBUG,
 //                  "Getting QOS using ACE_OS::ioctl () succeeds.\n"));
 
+  char* msg = "Hello sent on a QoS enabled session !!\n";
   iovec iov[1];
-  iov[0].iov_base = (char *) "Hello sent on a QoS enabled session !!\n";
-  iov[0].iov_len = ACE_OS::strlen (iov[0].iov_base);
+  iov[0].iov_base = msg;
+  iov[0].iov_len = ACE_OS_String::strlen(msg);
 
   size_t bytes_sent = 0;