summaryrefslogtreecommitdiff
path: root/ACE/ace/QoS
diff options
context:
space:
mode:
Diffstat (limited to 'ACE/ace/QoS')
-rw-r--r--ACE/ace/QoS/QoS_Decorator.cpp14
-rw-r--r--ACE/ace/QoS/QoS_Decorator.h14
-rw-r--r--ACE/ace/QoS/QoS_Manager.cpp6
-rw-r--r--ACE/ace/QoS/QoS_Manager.h6
-rw-r--r--ACE/ace/QoS/QoS_Session_Factory.cpp4
-rw-r--r--ACE/ace/QoS/QoS_Session_Factory.h4
-rw-r--r--ACE/ace/QoS/QoS_Session_Impl.cpp16
-rw-r--r--ACE/ace/QoS/QoS_Session_Impl.h22
-rw-r--r--ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.h4
9 files changed, 45 insertions, 45 deletions
diff --git a/ACE/ace/QoS/QoS_Decorator.cpp b/ACE/ace/QoS/QoS_Decorator.cpp
index 13ee649acb9..3cbe77a40d4 100644
--- a/ACE/ace/QoS/QoS_Decorator.cpp
+++ b/ACE/ace/QoS/QoS_Decorator.cpp
@@ -6,7 +6,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_ALLOC_HOOK_DEFINE(ACE_QOS_DECORATOR)
// Constructor.
-ACE_QoS_Decorator_Base::ACE_QoS_Decorator_Base (void)
+ACE_QoS_Decorator_Base::ACE_QoS_Decorator_Base ()
{}
// Constructor.
@@ -17,7 +17,7 @@ ACE_QoS_Decorator_Base::ACE_QoS_Decorator_Base (ACE_Event_Handler
}
// Destructor.
-ACE_QoS_Decorator_Base::~ACE_QoS_Decorator_Base (void)
+ACE_QoS_Decorator_Base::~ACE_QoS_Decorator_Base ()
{
}
@@ -43,7 +43,7 @@ ACE_QoS_Decorator_Base::handle_qos (ACE_HANDLE fd)
}
// Constructor.
-ACE_QoS_Decorator::ACE_QoS_Decorator (void)
+ACE_QoS_Decorator::ACE_QoS_Decorator ()
{}
// Constructor.
@@ -61,7 +61,7 @@ ACE_QoS_Decorator::ACE_QoS_Decorator (ACE_Event_Handler *event_handler,
}
// Destructor.
-ACE_QoS_Decorator::~ACE_QoS_Decorator (void)
+ACE_QoS_Decorator::~ACE_QoS_Decorator ()
{
delete this->decorator_base_;
delete this->qos_event_handler_;
@@ -98,7 +98,7 @@ ACE_QoS_Decorator::handle_qos (ACE_HANDLE fd)
// if the application is using RAPI. Note that it is a no-op for GQoS
// because an extra socket for handling QoS events is not required.
int
-ACE_QoS_Decorator::init (void)
+ACE_QoS_Decorator::init ()
{
#if defined (ACE_HAS_RAPI)
@@ -113,7 +113,7 @@ ACE_QoS_Decorator::init (void)
}
// Constructor.
-ACE_QoS_Event_Handler::ACE_QoS_Event_Handler (void)
+ACE_QoS_Event_Handler::ACE_QoS_Event_Handler ()
{
}
@@ -125,7 +125,7 @@ ACE_QoS_Event_Handler::ACE_QoS_Event_Handler (ACE_QoS_Decorator_Base
}
// Destructor.
-ACE_QoS_Event_Handler::~ACE_QoS_Event_Handler (void)
+ACE_QoS_Event_Handler::~ACE_QoS_Event_Handler ()
{
}
diff --git a/ACE/ace/QoS/QoS_Decorator.h b/ACE/ace/QoS/QoS_Decorator.h
index a15d3654bdc..4b578cec30f 100644
--- a/ACE/ace/QoS/QoS_Decorator.h
+++ b/ACE/ace/QoS/QoS_Decorator.h
@@ -43,13 +43,13 @@ class ACE_QoS_Export ACE_QoS_Decorator_Base : public ACE_Event_Handler
public:
// Initialization and termination methods.
/// Constructor.
- ACE_QoS_Decorator_Base (void);
+ ACE_QoS_Decorator_Base ();
/// Constructor.
ACE_QoS_Decorator_Base (ACE_Event_Handler *event_handler);
/// Destructor.
- ~ACE_QoS_Decorator_Base (void);
+ ~ACE_QoS_Decorator_Base ();
/// Forwards the request to its event_handler_ component.
virtual ACE_HANDLE get_handle () const;
@@ -78,7 +78,7 @@ private:
class ACE_QoS_Export ACE_QoS_Event_Handler : public ACE_Event_Handler
{
/// Destructor.
- ~ACE_QoS_Event_Handler (void);
+ ~ACE_QoS_Event_Handler ();
/// Returns the RAPI file descriptor for receiving QoS events.
virtual ACE_HANDLE get_handle () const;
@@ -94,7 +94,7 @@ class ACE_QoS_Export ACE_QoS_Event_Handler : public ACE_Event_Handler
private:
/// Constructor is private because only ACE_QoS_Decorator should
/// create this object.
- ACE_QoS_Event_Handler (void);
+ ACE_QoS_Event_Handler ();
/// The QoS Decorator passes in its base for this handler to use.
ACE_QoS_Event_Handler (ACE_QoS_Decorator_Base *decorator_base);
@@ -120,7 +120,7 @@ class ACE_QoS_Export ACE_QoS_Decorator : public ACE_QoS_Decorator_Base
public:
// Initialization and termination methods.
/// Constructor.
- ACE_QoS_Decorator (void);
+ ACE_QoS_Decorator ();
/// Constructor.
ACE_QoS_Decorator (ACE_Event_Handler *event_handler,
@@ -128,7 +128,7 @@ public:
ACE_Reactor *reactor = ACE_Reactor::instance ());
/// Destructor.
- ~ACE_QoS_Decorator (void);
+ ~ACE_QoS_Decorator ();
/// Calls the base class get_handle ().
virtual ACE_HANDLE get_handle () const;
@@ -141,7 +141,7 @@ public:
/// This method registers the QoS Event Handler with the Reactor
/// to receive RAPI events.
- int init (void);
+ int init ();
private:
/// Requests on the class are forwarded to this base class;
diff --git a/ACE/ace/QoS/QoS_Manager.cpp b/ACE/ace/QoS/QoS_Manager.cpp
index c7bbbb09182..d5437c91896 100644
--- a/ACE/ace/QoS/QoS_Manager.cpp
+++ b/ACE/ace/QoS/QoS_Manager.cpp
@@ -6,10 +6,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_ALLOC_HOOK_DEFINE(ACE_QOS_MANAGER)
-ACE_QoS_Manager::ACE_QoS_Manager (void)
+ACE_QoS_Manager::ACE_QoS_Manager ()
{}
-ACE_QoS_Manager::~ACE_QoS_Manager (void)
+ACE_QoS_Manager::~ACE_QoS_Manager ()
{}
// Adds the given session to the list of session objects joined by
@@ -29,7 +29,7 @@ ACE_QoS_Manager::join_qos_session (ACE_QoS_Session *qos_session)
// Returns the QoS session set for this socket.
ACE_Unbounded_Set <ACE_QoS_Session *>
-ACE_QoS_Manager::qos_session_set (void)
+ACE_QoS_Manager::qos_session_set ()
{
return this->qos_session_set_;
}
diff --git a/ACE/ace/QoS/QoS_Manager.h b/ACE/ace/QoS/QoS_Manager.h
index 81f331b4ae2..5b2b863a552 100644
--- a/ACE/ace/QoS/QoS_Manager.h
+++ b/ACE/ace/QoS/QoS_Manager.h
@@ -42,10 +42,10 @@ class ACE_QoS_Export ACE_QoS_Manager
{
public:
/// Default constructor.
- ACE_QoS_Manager (void);
+ ACE_QoS_Manager ();
/// Default destructor.
- ~ACE_QoS_Manager (void);
+ ~ACE_QoS_Manager ();
/**
* Join the given QoS session. A socket can join multiple QoS
@@ -57,7 +57,7 @@ public:
typedef ACE_Unbounded_Set <ACE_QoS_Session *> ACE_QOS_SESSION_SET;
/// Get the QoS session set.
- ACE_QOS_SESSION_SET qos_session_set (void);
+ ACE_QOS_SESSION_SET qos_session_set ();
private:
/// Set of QoS sessions that this socket has joined.
diff --git a/ACE/ace/QoS/QoS_Session_Factory.cpp b/ACE/ace/QoS/QoS_Session_Factory.cpp
index a726a5fefb2..3ff403db99d 100644
--- a/ACE/ace/QoS/QoS_Session_Factory.cpp
+++ b/ACE/ace/QoS/QoS_Session_Factory.cpp
@@ -17,12 +17,12 @@ const enum ACE_QoS_Session_Factory::ACE_QoS_Session_Type
# error "QoS type not supported. Cannot build."
#endif /* ACE_HAS_RAPI */
-ACE_QoS_Session_Factory::ACE_QoS_Session_Factory (void)
+ACE_QoS_Session_Factory::ACE_QoS_Session_Factory ()
{
ACE_TRACE ("ACE_QoS_Session_Factory::ACE_QoS_Session_Factory");
}
-ACE_QoS_Session_Factory::~ACE_QoS_Session_Factory (void)
+ACE_QoS_Session_Factory::~ACE_QoS_Session_Factory ()
{
ACE_TRACE ("ACE_QoS_Session_Factory::~ACE_QoS_Session_Factory");
}
diff --git a/ACE/ace/QoS/QoS_Session_Factory.h b/ACE/ace/QoS/QoS_Session_Factory.h
index f3d8de8cf05..db5b9e624ad 100644
--- a/ACE/ace/QoS/QoS_Session_Factory.h
+++ b/ACE/ace/QoS/QoS_Session_Factory.h
@@ -40,10 +40,10 @@ class ACE_QoS_Export ACE_QoS_Session_Factory
{
public :
/// Default constructor.
- ACE_QoS_Session_Factory (void);
+ ACE_QoS_Session_Factory ();
/// Default destructor.
- ~ACE_QoS_Session_Factory (void);
+ ~ACE_QoS_Session_Factory ();
/// Types of sessions for this factory to manage.
enum ACE_QoS_Session_Type
diff --git a/ACE/ace/QoS/QoS_Session_Impl.cpp b/ACE/ace/QoS/QoS_Session_Impl.cpp
index dd247f68339..f552755488e 100644
--- a/ACE/ace/QoS/QoS_Session_Impl.cpp
+++ b/ACE/ace/QoS/QoS_Session_Impl.cpp
@@ -222,7 +222,7 @@ rsvp_callback (rapi_sid_t /* sid */,
}
// Constructor.
-ACE_RAPI_Session::ACE_RAPI_Session (void)
+ACE_RAPI_Session::ACE_RAPI_Session ()
{
ACE_TRACE ("ACE_RAPI_Session::ACE_RAPI_Session");
//this->source_port (DEFAULT_SOURCE_SENDER_PORT);
@@ -269,7 +269,7 @@ ACE_RAPI_Session::open (ACE_INET_Addr dest_addr,
// Close the RAPI QoS Session.
int
-ACE_RAPI_Session::close (void)
+ACE_RAPI_Session::close ()
{
this->rsvp_error = rapi_release(this->session_id_);
@@ -287,7 +287,7 @@ ACE_RAPI_Session::close (void)
//Get the most recent RSVP event that occurred
ACE_QoS_Session::RSVP_Event_Type
-ACE_RAPI_Session::rsvp_event_type (void)
+ACE_RAPI_Session::rsvp_event_type ()
{
return this->rsvp_event_type_;
}
@@ -523,7 +523,7 @@ ACE_RAPI_Session::receiving_qos (const ACE_QoS &ace_qos)
}
int
-ACE_RAPI_Session::update_qos (void)
+ACE_RAPI_Session::update_qos ()
{
// Update the session QoS Parameters based on the RSVP Event Received.
if ((rsvp_error = rapi_dispatch ()) != 0)
@@ -624,7 +624,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
int ACE_GQoS_Session::GQoS_session_id = 0;
// Constructor.
-ACE_GQoS_Session::ACE_GQoS_Session (void)
+ACE_GQoS_Session::ACE_GQoS_Session ()
{
ACE_TRACE ("ACE_GQoS_Session::ACE_GQoS_Session");
}
@@ -644,7 +644,7 @@ ACE_GQoS_Session::open (ACE_INET_Addr dest_addr,
// Close the GQoS Session.
int
-ACE_GQoS_Session::close (void)
+ACE_GQoS_Session::close ()
{
// TBD.
return 0;
@@ -687,7 +687,7 @@ ACE_GQoS_Session::qos (ACE_SOCK *socket,
}
int
-ACE_GQoS_Session::update_qos (void)
+ACE_GQoS_Session::update_qos ()
{
// WSAIoctl (GET_QOS) call goes here...
return 0;
@@ -695,7 +695,7 @@ ACE_GQoS_Session::update_qos (void)
//Get the most recent RSVP event that occurred
ACE_QoS_Session::RSVP_Event_Type
-ACE_GQoS_Session::rsvp_event_type (void)
+ACE_GQoS_Session::rsvp_event_type ()
{
return this->rsvp_event_type_;
}
diff --git a/ACE/ace/QoS/QoS_Session_Impl.h b/ACE/ace/QoS/QoS_Session_Impl.h
index 284980b5d26..d87af62f6bc 100644
--- a/ACE/ace/QoS/QoS_Session_Impl.h
+++ b/ACE/ace/QoS/QoS_Session_Impl.h
@@ -38,7 +38,7 @@ class ACE_QoS_Export ACE_RAPI_Session : public ACE_QoS_Session
{
public:
/// Default destructor.
- ~ACE_RAPI_Session (void);
+ ~ACE_RAPI_Session ();
/// Error handling for RSVP callback
static int rsvp_error;
@@ -48,7 +48,7 @@ public:
ACE_Protocol_ID protocol_id);
/// Close the RAPI QoS Session.
- virtual int close (void);
+ virtual int close ();
/// Returns the QoS for this RAPI session.
virtual ACE_QoS qos () const;
@@ -73,7 +73,7 @@ public:
* It is a mechanism of updating the QoS for this session asynchronously, as
* RSVP events occur.
*/
- virtual int update_qos (void);
+ virtual int update_qos ();
/// Get methods for the flags_.
virtual ACE_End_Point_Type flags () const;
@@ -88,13 +88,13 @@ public:
virtual void session_id (const int session_id);
/// Get the RAPI file descriptor for RSVP events.
- virtual ACE_HANDLE rsvp_events_handle (void);
+ virtual ACE_HANDLE rsvp_events_handle ();
///Set the RAPI event that last occurred
virtual void rsvp_event_type (RSVP_Event_Type event_type);
///Get the RAPI event that last occurred
- virtual RSVP_Event_Type rsvp_event_type (void);
+ virtual RSVP_Event_Type rsvp_event_type ();
/// Get the destination address for this RAPI session.
virtual ACE_INET_Addr dest_addr () const;
@@ -124,7 +124,7 @@ public:
private:
/// Default constuctor. Constructor is defined private so that only
/// the friend factory can instantiate this class.
- ACE_RAPI_Session (void);
+ ACE_RAPI_Session ();
/// Construct a simplified RAPI Sender TSpec object
/// from an ACE_Flow_Spec object. Used internally by this class.
@@ -159,7 +159,7 @@ class ACE_QoS_Export ACE_GQoS_Session : public ACE_QoS_Session
{
public:
/// Default destructor.
- ~ACE_GQoS_Session (void);
+ ~ACE_GQoS_Session ();
/// This is a session ID generator. It does a lot more than expected
/// from an int!.
@@ -170,7 +170,7 @@ public:
ACE_Protocol_ID protocol_id);
/// Close the GQoS Session.
- virtual int close (void);
+ virtual int close ();
/// Returns the QoS for this GQoS session.
virtual ACE_QoS qos () const;
@@ -192,7 +192,7 @@ public:
/// Calls the ioctl (ACE_SIO_GET_QOS). It is a mechanism of updating the
/// QoS for this session asynchronously, as RSVP events occur.
- virtual int update_qos (void);
+ virtual int update_qos ();
/// Get/Set methods for the flags_.
virtual ACE_End_Point_Type flags () const;
@@ -223,12 +223,12 @@ public:
virtual void session_id (const int session_id);
/// Get the file descriptor of the underlying socket.
- virtual ACE_HANDLE rsvp_events_handle (void);
+ virtual ACE_HANDLE rsvp_events_handle ();
virtual void rsvp_event_type (RSVP_Event_Type event_type);
///Set the RAPI event that last occurred
- virtual RSVP_Event_Type rsvp_event_type (void);
+ virtual RSVP_Event_Type rsvp_event_type ();
///Get the RAPI event that last occurred
/// GQoS version.
diff --git a/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.h b/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.h
index 3d1ca20e881..86fc8bfa36a 100644
--- a/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.h
+++ b/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.h
@@ -40,7 +40,7 @@ public:
// use <ACE_SOCK_Dgram> or <ACE_SOCK_CODgram> instead.
/// Default dtor.
- ~ACE_SOCK_Dgram_Mcast_QoS (void);
+ ~ACE_SOCK_Dgram_Mcast_QoS ();
// = Multicast group management routines.
/**
@@ -96,7 +96,7 @@ public:
ACE_OVERLAPPED_COMPLETION_FUNC func) const;
/// Returns the QoS manager for this socket.
- ACE_QoS_Manager qos_manager (void);
+ ACE_QoS_Manager qos_manager ();
/// Declare the dynamic allocation hooks.
ACE_ALLOC_HOOK_DECLARE;
View Lorry Controller Status