ChangeLogTag:Thu Dec 8 07:20:25 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

14 files changed, 96 insertions, 31 deletions

diff --git a/ChangeLog b/ChangeLog
index c4b64e12f0f..124246da5ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,19 @@ Thu Dec  8 07:20:25 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 	* ace/OS_main.cpp:
 	* ace/OS_main.h:
 	* ace/TSS_Adapter.h:
+	* ace/QoS/QoS_Decorator.cpp:
+	* ace/QoS/QoS_Decorator.h:
+	* ace/QoS/QoS_Manager.cpp:
+	* ace/QoS/QoS_Manager.h:
+	* ace/QoS/QoS_Session.h:
+	* ace/QoS/QoS_Session_Factory.cpp:
+	* ace/QoS/QoS_Session_Factory.h:
+	* ace/QoS/QoS_Session_Impl.cpp:
+	* ace/QoS/QoS_Session_Impl.h:
+	* ace/QoS/QoS_Session_Impl.i:
+	* ace/QoS/SOCK_Dgram_Mcast_QoS.cpp:
+	* ace/QoS/SOCK_Dgram_Mcast_QoS.h:
+	* ace/QoS/SOCK_Dgram_Mcast_QoS.i:
 
 	  Fixed versioned namespace support.  The versioning macros calls
 	  were missing.
diff --git a/ace/QoS/QoS_Decorator.cpp b/ace/QoS/QoS_Decorator.cpp
index 5db08066010..90cc748e856 100644
--- a/ace/QoS/QoS_Decorator.cpp
+++ b/ace/QoS/QoS_Decorator.cpp
@@ -3,7 +3,9 @@
 
 #include "QoS_Decorator.h"
 
-ACE_RCSID(ace, QoS_Decorator, "$Id $")
+ACE_RCSID(ace, QoS_Decorator, "$Id$")
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_QOS_DECORATOR)
 
@@ -159,3 +161,5 @@ ACE_QoS_Event_Handler::handle_input (ACE_HANDLE fd)
 {
   return this->decorator_base_->handle_qos (fd);
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/QoS/QoS_Decorator.h b/ace/QoS/QoS_Decorator.h
index cf062216ec4..512912e7c3b 100644
--- a/ace/QoS/QoS_Decorator.h
+++ b/ace/QoS/QoS_Decorator.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -26,7 +26,7 @@
 #include "SOCK_Dgram_Mcast_QoS.h"
 #include "ACE_QoS_Export.h"
 
-ACE_RCSID(QOS_Decorator, QOS_Decorator, "$Id$")
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class ACE_QoS_Decorator_Base
@@ -173,5 +173,7 @@ private:
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif  /* QOS_DECORATOR_H */
diff --git a/ace/QoS/QoS_Manager.cpp b/ace/QoS/QoS_Manager.cpp
index 7e698b0cad2..5d3b33e0260 100644
--- a/ace/QoS/QoS_Manager.cpp
+++ b/ace/QoS/QoS_Manager.cpp
@@ -4,7 +4,9 @@
 #include "QoS_Manager.h"
 #include "ace/Log_Msg.h"
 
-ACE_RCSID(ace, QoS_Manager, "$Id $")
+ACE_RCSID(ace, QoS_Manager, "$Id$")
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_QOS_MANAGER)
 
@@ -45,3 +47,5 @@ template class ACE_Unbounded_Set_Iterator<ACE_QoS_Session *>;
 #pragma instantiate ACE_Unbounded_Set<ACE_QoS_Session *>
 #pragma instantiate ACE_Unbounded_Set_Iterator<ACE_QoS_Session *>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/QoS/QoS_Manager.h b/ace/QoS/QoS_Manager.h
index 1c1bce7df53..8a0b52c9943 100644
--- a/ace/QoS/QoS_Manager.h
+++ b/ace/QoS/QoS_Manager.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -26,6 +26,9 @@
 #include "ACE_QoS_Export.h"
 #include "QoS_Session.h"
 
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_QoS_Manager
  *
@@ -65,5 +68,7 @@ private:
   ACE_QOS_SESSION_SET qos_session_set_;
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_QOS_MANAGER_H */
diff --git a/ace/QoS/QoS_Session.h b/ace/QoS/QoS_Session.h
index 780a80b5a80..3e08bbc69ce 100644
--- a/ace/QoS/QoS_Session.h
+++ b/ace/QoS/QoS_Session.h
@@ -23,6 +23,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class ACE_SOCK;
 class ACE_QoS_Manager;
 
@@ -175,5 +177,7 @@ protected:
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_QOS_SESSION_H */
diff --git a/ace/QoS/QoS_Session_Factory.cpp b/ace/QoS/QoS_Session_Factory.cpp
index bb72c0f492f..89a8fbcc913 100644
--- a/ace/QoS/QoS_Session_Factory.cpp
+++ b/ace/QoS/QoS_Session_Factory.cpp
@@ -7,6 +7,8 @@
 
 ACE_RCSID(ace, QoS_Session_Factory, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_QoS_Session_Factory)
 
 #if defined(ACE_HAS_RAPI)
@@ -99,3 +101,5 @@ ACE_QoS_Session_Factory::remove_session (ACE_QoS_Session *qos_session)
 
   return 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/QoS/QoS_Session_Factory.h b/ace/QoS/QoS_Session_Factory.h
index 2e80e338d3e..0559dce4220 100644
--- a/ace/QoS/QoS_Session_Factory.h
+++ b/ace/QoS/QoS_Session_Factory.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,6 +24,8 @@
 #include "ace/Containers_T.h"
 #include "ACE_QoS_Export.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Forward declare this, so the factory uses only references to this.
 class ACE_QoS_Session;
 
@@ -88,5 +90,7 @@ private:
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* ACE_QOS_SESSION_FACTORY_H */
diff --git a/ace/QoS/QoS_Session_Impl.cpp b/ace/QoS/QoS_Session_Impl.cpp
index 6ed1ae63587..09014ae50c2 100644
--- a/ace/QoS/QoS_Session_Impl.cpp
+++ b/ace/QoS/QoS_Session_Impl.cpp
@@ -13,41 +13,39 @@
 
 ACE_RCSID(ace, QoS_Session_Impl, "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_ALLOC_HOOK_DEFINE(ACE_QoS_Session_Impl)
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (ACE_HAS_RAPI)
 #include "rapi_err.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 int ACE_RAPI_Session::rsvp_error = 0;
 
 // Call back function used by RAPI to report RSVP events. This
 // function translates the RAPI QoS parameters into the more generic
 // ACE_QoS parameters for the underlying RAPI session.
 int
-rsvp_callback (rapi_sid_t sid,
+rsvp_callback (rapi_sid_t /* sid */,
                rapi_eventinfo_t eventype,
-               int style_id,
+               int /* style_id */,
                int errcode,
                int errvalue,
                sockaddr * errnode,
-               u_char errflags,
-               int filter_spec_no,
-               rapi_filter_t *filter_spec_list,
+               u_char /* errflags */,
+               int /* filter_spec_no */,
+               rapi_filter_t * /* filter_spec_list */,
                int flow_spec_no,
                rapi_flowspec_t *flow_spec_list,
-               int ad_spec_no,
-               rapi_adspec_t *ad_spec_list,
+               int /* ad_spec_no */,
+               rapi_adspec_t * /* ad_spec_list */,
                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);
-  ACE_UNUSED_ARG (errflags);
-
   if (args == 0)
     ACE_DEBUG ((LM_DEBUG,
                 "Argument in the call back function is null\n\n"));
@@ -56,7 +54,7 @@ rsvp_callback (rapi_sid_t sid,
 
   qos_flowspecx_t *csxp = 0;
   
-  if(!flow_spec_list)
+  if (!flow_spec_list)
     {
       ACE_DEBUG ((LM_DEBUG,
 		  "(%N|%l) Null flow_spec_list\n"));
@@ -313,12 +311,10 @@ ACE_RAPI_Session::rsvp_event_type (ACE_QoS_Session::RSVP_Event_Type event_type)
 }
 
 int
-ACE_RAPI_Session::qos (ACE_SOCK *socket,
-                       ACE_QoS_Manager *qos_manager,
+ACE_RAPI_Session::qos (ACE_SOCK * /* socket */,
+                       ACE_QoS_Manager * /* qos_manager */,
                        const ACE_QoS &ace_qos)
 {
-  ACE_UNUSED_ARG (socket);
-  ACE_UNUSED_ARG (qos_manager);
 
   // If sender : call sending_qos ()
   // If receiver : call receiving_qos ()
@@ -631,8 +627,12 @@ ACE_RAPI_Session::init_flowspec_simplified(const ACE_Flow_Spec &flow_spec)
   return flowsp;
 }
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_RAPI */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // This is a GQoS session ID generator.
 int ACE_GQoS_Session::GQoS_session_id = 0;
 
@@ -720,3 +720,5 @@ ACE_GQoS_Session::rsvp_event_type (ACE_QoS_Session::RSVP_Event_Type event_type)
 {
   this->rsvp_event_type_ = event_type;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/QoS/QoS_Session_Impl.h b/ace/QoS/QoS_Session_Impl.h
index 5b2ac9e829d..193c537a74c 100644
--- a/ace/QoS/QoS_Session_Impl.h
+++ b/ace/QoS/QoS_Session_Impl.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -27,6 +27,8 @@
 
 #define DEFAULT_SOURCE_SENDER_PORT 10001
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_RAPI_Session
  *
@@ -146,8 +148,12 @@ private:
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* ACE_HAS_RAPI */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_GQoS_Session
  *
@@ -249,6 +255,8 @@ private:
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "QoS_Session_Impl.i"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/QoS/QoS_Session_Impl.i b/ace/QoS/QoS_Session_Impl.i
index fe701b32aa2..b3971b46d52 100644
--- a/ace/QoS/QoS_Session_Impl.i
+++ b/ace/QoS/QoS_Session_Impl.i
@@ -1,7 +1,8 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
-// QoS_Session_Impl.i
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 #if defined (ACE_HAS_RAPI)
 
@@ -224,3 +225,5 @@ ACE_GQoS_Session::version (void)
 {
   return 0;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp b/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
index a994146215b..548c56bef12 100644
--- a/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
+++ b/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
@@ -23,6 +23,7 @@ ACE_RCSID (QoS,
            SOCK_Dgram_Mcast_QoS,
            "$Id$")
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Dgram_Mcast_QoS)
 
@@ -253,3 +254,5 @@ ACE_SOCK_Dgram_Mcast_QoS::subscribe (const ACE_INET_Addr &mcast_addr,
       return 0;
     }
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ace/QoS/SOCK_Dgram_Mcast_QoS.h b/ace/QoS/SOCK_Dgram_Mcast_QoS.h
index 5da29c71d4b..032bbe22f11 100644
--- a/ace/QoS/SOCK_Dgram_Mcast_QoS.h
+++ b/ace/QoS/SOCK_Dgram_Mcast_QoS.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /**
  * @class ACE_SOCK_Dgram_Mcast_QoS
  *
@@ -130,6 +132,8 @@ private:
 
 };
 
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 #if defined (__ACE_INLINE__)
 #include "SOCK_Dgram_Mcast_QoS.i"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/QoS/SOCK_Dgram_Mcast_QoS.i b/ace/QoS/SOCK_Dgram_Mcast_QoS.i
index 5bf7c57a5ac..9e2347669c5 100644
--- a/ace/QoS/SOCK_Dgram_Mcast_QoS.i
+++ b/ace/QoS/SOCK_Dgram_Mcast_QoS.i
@@ -1,6 +1,9 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
 // $Id$
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ACE_INLINE
 ACE_SOCK_Dgram_Mcast_QoS::~ACE_SOCK_Dgram_Mcast_QoS (void)
 {
@@ -50,3 +53,5 @@ ACE_SOCK_Dgram_Mcast_QoS::qos_manager (void)
 {
   return this->qos_manager_;
 }
+
+ACE_END_VERSIONED_NAMESPACE_DECL