summaryrefslogtreecommitdiff
path: root/ACE/apps
diff options
context:
space:
mode:
authorKnut Petter Svendsen <knut@altuma.no>2022-09-19 14:37:02 +0200
committerKnut Petter Svendsen <knut@altuma.no>2022-09-22 16:20:53 +0200
commit2aab75d5fddc126e8085c70fe8e1b875b75a30ef (patch)
tree82498955ff2b3829d6597ed88a9eca1b1705df96 /ACE/apps
parent5e96bb28fc7572f39b63ac2aca72800c45cdb1ee (diff)
downloadATCD-2aab75d5fddc126e8085c70fe8e1b875b75a30ef.tar.gz
Part 2: Remove obsolescent (void) in functions with no parameters
Diffstat (limited to 'ACE/apps')
-rw-r--r--ACE/apps/JAWS/clients/Caching/Local_Locator.inl6
-rw-r--r--ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.inl8
-rw-r--r--ACE/apps/JAWS/clients/Caching/URL_Locator.h2
-rw-r--r--ACE/apps/JAWS/clients/Caching/URL_Properties.inl12
-rw-r--r--ACE/apps/JAWS/server/HTTP_Handler.h2
-rw-r--r--ACE/apps/JAWS/server/JAWS_IO.h12
-rw-r--r--ACE/apps/JAWS/server/Parse_Headers.cpp2
-rw-r--r--ACE/apps/JAWS/stress_testing/connection.cpp4
-rw-r--r--ACE/apps/JAWS/stress_testing/util.cpp8
-rw-r--r--ACE/apps/JAWS2/HTTPU/http_base.h4
-rw-r--r--ACE/apps/JAWS2/HTTPU/http_base.inl8
-rw-r--r--ACE/apps/JAWS2/HTTPU/http_request.inl8
-rw-r--r--ACE/apps/JAWS2/HTTPU/http_response.inl6
-rw-r--r--ACE/apps/JAWS2/JAWS/Cache_Object.h6
-rw-r--r--ACE/apps/JAWS2/JAWS/IO_Handler.h26
-rw-r--r--ACE/apps/JAWS2/JAWS/Policy.h10
-rw-r--r--ACE/apps/JAWS3/http/HTTP_States.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/Concurrency.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/Datagram.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/Jaws_IO.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/Signal_Task.h2
-rw-r--r--ACE/apps/JAWS3/jaws3/Timer.h2
-rw-r--r--ACE/apps/drwho/Comm_Manager.h2
-rw-r--r--ACE/apps/drwho/Search_Struct.h4
24 files changed, 71 insertions, 71 deletions
diff --git a/ACE/apps/JAWS/clients/Caching/Local_Locator.inl b/ACE/apps/JAWS/clients/Caching/Local_Locator.inl
index 6ff6cb3ccd9..ad3dcc108a3 100644
--- a/ACE/apps/JAWS/clients/Caching/Local_Locator.inl
+++ b/ACE/apps/JAWS/clients/Caching/Local_Locator.inl
@@ -1,6 +1,6 @@
// -*- C++ -*-
ACE_INLINE
-ACE_URL_Record::ACE_URL_Record (void)
+ACE_URL_Record::ACE_URL_Record ()
: id_ (0),
offer_ (0)
{
@@ -16,7 +16,7 @@ ACE_URL_Record::ACE_URL_Record (ACE_URL_Offer *offer)
}
ACE_INLINE
-ACE_URL_Record::~ACE_URL_Record (void)
+ACE_URL_Record::~ACE_URL_Record ()
{
delete this->id_;
delete this->offer_;
@@ -35,6 +35,6 @@ ACE_URL_Record::operator!= (const ACE_URL_Record &rhs) const
}
ACE_INLINE
-ACE_URL_Local_Locator::~ACE_URL_Local_Locator (void)
+ACE_URL_Local_Locator::~ACE_URL_Local_Locator ()
{
}
diff --git a/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.inl b/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.inl
index 8047feb7efd..812c1b37158 100644
--- a/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.inl
+++ b/ACE/apps/JAWS/clients/Caching/Locator_Request_Reply.inl
@@ -3,7 +3,7 @@
#include "URL_Locator.h"
ACE_INLINE
-ACE_URL_Locator_Request::ACE_URL_Locator_Request (void)
+ACE_URL_Locator_Request::ACE_URL_Locator_Request ()
: code_(ACE_URL_Locator::INVALID_OPERATION),
seq1_ (0),
seq2_ (0),
@@ -13,7 +13,7 @@ ACE_URL_Locator_Request::ACE_URL_Locator_Request (void)
}
ACE_INLINE
-ACE_URL_Locator_Request::~ACE_URL_Locator_Request (void)
+ACE_URL_Locator_Request::~ACE_URL_Locator_Request ()
{
delete this->seq1_;
delete this->seq2_;
@@ -82,7 +82,7 @@ ACE_URL_Locator_Request::buffer () const
}
ACE_INLINE
-ACE_URL_Locator_Reply::ACE_URL_Locator_Reply (void)
+ACE_URL_Locator_Reply::ACE_URL_Locator_Reply ()
: code_ (ACE_URL_Locator::INVALID_OPERATION),
offer_ (0),
offers_ (0),
@@ -91,7 +91,7 @@ ACE_URL_Locator_Reply::ACE_URL_Locator_Reply (void)
}
ACE_INLINE
-ACE_URL_Locator_Reply::~ACE_URL_Locator_Reply (void)
+ACE_URL_Locator_Reply::~ACE_URL_Locator_Reply ()
{
delete this->offer_;
delete this->offers_;
diff --git a/ACE/apps/JAWS/clients/Caching/URL_Locator.h b/ACE/apps/JAWS/clients/Caching/URL_Locator.h
index 972a6543b6f..34d51e19541 100644
--- a/ACE/apps/JAWS/clients/Caching/URL_Locator.h
+++ b/ACE/apps/JAWS/clients/Caching/URL_Locator.h
@@ -73,7 +73,7 @@ public:
static const char * const err_name[];
/// Default destructor.
- virtual ~ACE_URL_Locator (void) = 0;
+ virtual ~ACE_URL_Locator () = 0;
/**
* Query the locator for HTTP with designate properties (none, some,
diff --git a/ACE/apps/JAWS/clients/Caching/URL_Properties.inl b/ACE/apps/JAWS/clients/Caching/URL_Properties.inl
index 711ac9823bc..793cc432dd9 100644
--- a/ACE/apps/JAWS/clients/Caching/URL_Properties.inl
+++ b/ACE/apps/JAWS/clients/Caching/URL_Properties.inl
@@ -28,7 +28,7 @@ ACE_URL_Property::ACE_URL_Property (const ACE_URL_Property &p)
}
ACE_INLINE
-ACE_URL_Property::~ACE_URL_Property (void)
+ACE_URL_Property::~ACE_URL_Property ()
{
}
@@ -60,7 +60,7 @@ ACE_URL_Property::operator!= (const ACE_URL_Property &rhs) const
}
ACE_INLINE ACE_WString &
-ACE_URL_Property::name_rep (void)
+ACE_URL_Property::name_rep ()
{
return this->name_;
}
@@ -84,7 +84,7 @@ ACE_URL_Property::name (const ACE_UINT16 *n)
}
ACE_INLINE ACE_WString &
-ACE_URL_Property::value_rep (void)
+ACE_URL_Property::value_rep ()
{
return this->value_;
}
@@ -131,7 +131,7 @@ ACE_URL_Offer::ACE_URL_Offer (const ACE_URL_Offer &o)
}
ACE_INLINE
-ACE_URL_Offer::~ACE_URL_Offer (void)
+ACE_URL_Offer::~ACE_URL_Offer ()
{
}
@@ -164,7 +164,7 @@ ACE_URL_Offer::operator!= (const ACE_URL_Offer &rhs) const
}
ACE_INLINE ACE_WString &
-ACE_URL_Offer::url_rep (void)
+ACE_URL_Offer::url_rep ()
{
return this->url_;
}
@@ -188,7 +188,7 @@ ACE_URL_Offer::url (const char *url)
}
ACE_INLINE ACE_URL_Property_Seq &
-ACE_URL_Offer::url_properties (void)
+ACE_URL_Offer::url_properties ()
{
return this->prop_;
}
diff --git a/ACE/apps/JAWS/server/HTTP_Handler.h b/ACE/apps/JAWS/server/HTTP_Handler.h
index beaf5c636c7..cc0226fe81a 100644
--- a/ACE/apps/JAWS/server/HTTP_Handler.h
+++ b/ACE/apps/JAWS/server/HTTP_Handler.h
@@ -135,7 +135,7 @@ public:
virtual ~HTTP_Handler_Factory ();
/// This creates a new HTTP_Handler
- virtual HTTP_Handler *create_http_handler (void) = 0;
+ virtual HTTP_Handler *create_http_handler () = 0;
/**
* The HTTP handler will call this method from HTTP_Handler::done to
diff --git a/ACE/apps/JAWS/server/JAWS_IO.h b/ACE/apps/JAWS/server/JAWS_IO.h
index 3ac34b88de1..1619dcdc2c7 100644
--- a/ACE/apps/JAWS/server/JAWS_IO.h
+++ b/ACE/apps/JAWS/server/JAWS_IO.h
@@ -93,11 +93,11 @@ public:
/// This method is called by the IO class when there was an error in
/// reading new data from the client.
- virtual void read_error (void) = 0;
+ virtual void read_error () = 0;
/// This method is called by the IO class when the requested file has
/// been successfully transmitted to the client.
- virtual void transmit_file_complete (void) = 0;
+ virtual void transmit_file_complete () = 0;
/// This method is called by the IO class when there was an error in
/// transmitting the requested file to the client.
@@ -105,7 +105,7 @@ public:
/// This method is called by the IO class when the requested file has
/// been successfully received from the client.
- virtual void receive_file_complete (void) = 0;
+ virtual void receive_file_complete () = 0;
/// This method is called by the IO class when there was an error in
/// receiving the requested file from the client.
@@ -113,15 +113,15 @@ public:
/// This method is called by the IO class when there was an error in
/// writing data to the client.
- virtual void write_error (void) = 0;
+ virtual void write_error () = 0;
/// This method is called by the IO class when the confirmation
/// message has been delivered to the client.
- virtual void confirmation_message_complete (void) = 0;
+ virtual void confirmation_message_complete () = 0;
/// This method is called by the IO class when the error message has
/// been delivered to the client.
- virtual void error_message_complete (void) = 0;
+ virtual void error_message_complete () = 0;
};
/**
diff --git a/ACE/apps/JAWS/server/Parse_Headers.cpp b/ACE/apps/JAWS/server/Parse_Headers.cpp
index 6a01e450447..614369df50c 100644
--- a/ACE/apps/JAWS/server/Parse_Headers.cpp
+++ b/ACE/apps/JAWS/server/Parse_Headers.cpp
@@ -8,7 +8,7 @@
// Implementation of class Headers
-Headers::Headers (void) : done_(0)
+Headers::Headers () : done_(0)
{
}
diff --git a/ACE/apps/JAWS/stress_testing/connection.cpp b/ACE/apps/JAWS/stress_testing/connection.cpp
index 9c3b157ba28..dd96f3d3068 100644
--- a/ACE/apps/JAWS/stress_testing/connection.cpp
+++ b/ACE/apps/JAWS/stress_testing/connection.cpp
@@ -84,13 +84,13 @@ int connection::read_n(void *buffer, size_t maxlen, unsigned int timeout_seconds
return 1;
}
-int connection::close(void) {
+int connection::close() {
stream_.close_reader();
stream_.close_writer();
stream_.close();
return 0;
}
-connection::~connection(void) {
+connection::~connection() {
this->close();
}
diff --git a/ACE/apps/JAWS/stress_testing/util.cpp b/ACE/apps/JAWS/stress_testing/util.cpp
index 6079b6e0429..f94aab5c8a9 100644
--- a/ACE/apps/JAWS/stress_testing/util.cpp
+++ b/ACE/apps/JAWS/stress_testing/util.cpp
@@ -29,22 +29,22 @@ URL::URL(char *input_buf) {
}
}
-char *URL::get_protocol(void) {
+char *URL::get_protocol() {
return protocol_;
}
-char *URL::get_hostname(void) {
+char *URL::get_hostname() {
return hostname_;
}
-char *URL::get_filename(void) {
+char *URL::get_filename() {
return filename_;
}
-void cleanup(void) {
+void cleanup() {
ACE_OS::unlink(TEMPORARY_FILE_NAME);
ACE_OS::unlink(INCOMING_FILE_NAME);
}
diff --git a/ACE/apps/JAWS2/HTTPU/http_base.h b/ACE/apps/JAWS2/HTTPU/http_base.h
index 98f33aac16c..2959185dad9 100644
--- a/ACE/apps/JAWS2/HTTPU/http_base.h
+++ b/ACE/apps/JAWS2/HTTPU/http_base.h
@@ -39,11 +39,11 @@ public:
void dump ();
protected:
- virtual void parse_line (void) = 0;
+ virtual void parse_line () = 0;
// Hook into the receive function to do specialized parsing of initial line.
// Sets the status_ variable.
- virtual int espouse_line (void) = 0;
+ virtual int espouse_line () = 0;
// Hook into the deliver function to do specialized initial line creation.
// Returns 0 for success and -1 for failure.
diff --git a/ACE/apps/JAWS2/HTTPU/http_base.inl b/ACE/apps/JAWS2/HTTPU/http_base.inl
index 805705bc89f..5dca42915d2 100644
--- a/ACE/apps/JAWS2/HTTPU/http_base.inl
+++ b/ACE/apps/JAWS2/HTTPU/http_base.inl
@@ -5,7 +5,7 @@
#endif /* ACE_HAS_INLINED_OSCALLS */
ACE_INLINE
-HTTP_Base::HTTP_Base (void)
+HTTP_Base::HTTP_Base ()
: status_ (200),
line_ (0),
deliver_state_ (0),
@@ -16,7 +16,7 @@ HTTP_Base::HTTP_Base (void)
}
ACE_INLINE
-HTTP_Base::~HTTP_Base (void)
+HTTP_Base::~HTTP_Base ()
{
if (this->line_)
ACE_OS::free (this->line_);
@@ -39,13 +39,13 @@ HTTP_Base::line () const
}
ACE_INLINE HTTP_Headers *
-HTTP_Base::http_headers (void)
+HTTP_Base::http_headers ()
{
return &(this->info_);
}
ACE_INLINE JAWS_Headers *
-HTTP_Base::headers (void)
+HTTP_Base::headers ()
{
return this->info_.table ();
}
diff --git a/ACE/apps/JAWS2/HTTPU/http_request.inl b/ACE/apps/JAWS2/HTTPU/http_request.inl
index 706d98b6f7b..5e4f3f43479 100644
--- a/ACE/apps/JAWS2/HTTPU/http_request.inl
+++ b/ACE/apps/JAWS2/HTTPU/http_request.inl
@@ -5,17 +5,17 @@
#endif /* ACE_HAS_INLINED_OSCALLS */
ACE_INLINE
-HTTP_Request::HTTP_Request (void)
+HTTP_Request::HTTP_Request ()
{
}
ACE_INLINE
-HTTP_Request::~HTTP_Request (void)
+HTTP_Request::~HTTP_Request ()
{
}
ACE_INLINE Parse_HTTP_Request *
-HTTP_Request::request_line (void)
+HTTP_Request::request_line ()
{
return &(this->request_);
}
@@ -27,7 +27,7 @@ HTTP_Request::request_line () const
}
ACE_INLINE HTTP_Parse_URL *
-HTTP_Request::url (void)
+HTTP_Request::url ()
{
return &(this->url_);
}
diff --git a/ACE/apps/JAWS2/HTTPU/http_response.inl b/ACE/apps/JAWS2/HTTPU/http_response.inl
index cd493002646..65fff68267a 100644
--- a/ACE/apps/JAWS2/HTTPU/http_response.inl
+++ b/ACE/apps/JAWS2/HTTPU/http_response.inl
@@ -5,17 +5,17 @@
#endif /* ACE_HAS_INLINED_OSCALLS */
ACE_INLINE
-HTTP_Response::HTTP_Response (void)
+HTTP_Response::HTTP_Response ()
{
}
ACE_INLINE
-HTTP_Response::~HTTP_Response (void)
+HTTP_Response::~HTTP_Response ()
{
}
ACE_INLINE Parse_HTTP_Response *
-HTTP_Response::response_line (void)
+HTTP_Response::response_line ()
{
return &(this->response_);
}
diff --git a/ACE/apps/JAWS2/JAWS/Cache_Object.h b/ACE/apps/JAWS2/JAWS/Cache_Object.h
index a2607f3fc8c..fa6120ee159 100644
--- a/ACE/apps/JAWS2/JAWS/Cache_Object.h
+++ b/ACE/apps/JAWS2/JAWS/Cache_Object.h
@@ -43,12 +43,12 @@ public:
void *heap_item () const;
void heap_item (void *item);
- virtual ACE_Lock & lock (void) = 0;
+ virtual ACE_Lock & lock () = 0;
protected:
virtual unsigned int count_i () const = 0;
- virtual int acquire_i (void) = 0;
- virtual int release_i (void) = 0;
+ virtual int acquire_i () = 0;
+ virtual int release_i () = 0;
virtual unsigned int priority_i () const = 0;
private:
diff --git a/ACE/apps/JAWS2/JAWS/IO_Handler.h b/ACE/apps/JAWS2/JAWS/IO_Handler.h
index b1236e818e0..6c5be891c2c 100644
--- a/ACE/apps/JAWS2/JAWS/IO_Handler.h
+++ b/ACE/apps/JAWS2/JAWS/IO_Handler.h
@@ -48,10 +48,10 @@ public:
virtual ~JAWS_Abstract_IO_Handler ();
virtual void task (JAWS_Pipeline_Handler *ph) = 0;
- virtual JAWS_Pipeline_Handler *task (void) = 0;
+ virtual JAWS_Pipeline_Handler *task () = 0;
virtual void message_block (JAWS_Data_Block *mb) = 0;
- virtual JAWS_Data_Block *message_block (void) = 0;
+ virtual JAWS_Data_Block *message_block () = 0;
/// This method is called by the IO class when new passive connection has
/// been established.
@@ -59,7 +59,7 @@ public:
/// This method is called by the IO class when new passive connection has
/// been established.
- virtual void accept_error (void) = 0;
+ virtual void accept_error () = 0;
#if 0
/// This method is called by the IO class when new active connection has
@@ -77,11 +77,11 @@ public:
/// This method is called by the IO class when there was an error in
/// reading new data from the client.
- virtual void read_error (void) = 0;
+ virtual void read_error () = 0;
/// This method is called by the IO class when the requested file has
/// been successfully transmitted to the client.
- virtual void transmit_file_complete (void) = 0;
+ virtual void transmit_file_complete () = 0;
/// This method is called by the IO class when there was an error in
/// transmitting the requested file to the client.
@@ -89,7 +89,7 @@ public:
/// This method is called by the IO class when the requested file has
/// been successfully received from the client.
- virtual void receive_file_complete (void) = 0;
+ virtual void receive_file_complete () = 0;
/// This method is called by the IO class when there was an error in
/// receiving the requested file from the client.
@@ -97,30 +97,30 @@ public:
/// This method is called by the IO class when there was an error in
/// writing data to the client.
- virtual void write_error (void) = 0;
+ virtual void write_error () = 0;
/// This method is called by the IO class when the confirmation
/// message has been delivered to the client.
- virtual void confirmation_message_complete (void) = 0;
+ virtual void confirmation_message_complete () = 0;
/// This method is called by the IO class when the error message has
/// been delivered to the client.
- virtual void error_message_complete (void) = 0;
+ virtual void error_message_complete () = 0;
/// Returns the factory for this IO handler
- virtual JAWS_IO_Handler_Factory *factory (void) = 0;
+ virtual JAWS_IO_Handler_Factory *factory () = 0;
/// Returns the socket handle for this handler
virtual ACE_HANDLE handle () const = 0;
/// Cleans up the handler.
- virtual void done (void) = 0;
+ virtual void done () = 0;
/// Returns the status of the handler
- virtual int status (void) = 0;
+ virtual int status () = 0;
/// puts handler in an idle state
- virtual void idle (void) = 0;
+ virtual void idle () = 0;
enum { IDLE = 0, IDLE_A = 1,
ACCEPT_OK = 2, ACCEPT_OK_A = 3,
diff --git a/ACE/apps/JAWS2/JAWS/Policy.h b/ACE/apps/JAWS2/JAWS/Policy.h
index a8fdab0c405..c7c234c8bf7 100644
--- a/ACE/apps/JAWS2/JAWS/Policy.h
+++ b/ACE/apps/JAWS2/JAWS/Policy.h
@@ -21,11 +21,11 @@ public:
JAWS_Dispatch_Policy ();
virtual ~JAWS_Dispatch_Policy ();
- virtual int ratio (void) = 0;
- virtual JAWS_IO * io (void) = 0;
- virtual JAWS_IO_Handler_Factory *ioh_factory (void) = 0;
- virtual JAWS_IO_Acceptor *acceptor (void) = 0;
- virtual JAWS_Concurrency_Base * concurrency (void) = 0;
+ virtual int ratio () = 0;
+ virtual JAWS_IO * io () = 0;
+ virtual JAWS_IO_Handler_Factory *ioh_factory () = 0;
+ virtual JAWS_IO_Acceptor *acceptor () = 0;
+ virtual JAWS_Concurrency_Base * concurrency () = 0;
virtual void ratio (int r) = 0;
virtual void io (JAWS_IO *iop) = 0;
diff --git a/ACE/apps/JAWS3/http/HTTP_States.h b/ACE/apps/JAWS3/http/HTTP_States.h
index 8d88514116e..130eaf3b578 100644
--- a/ACE/apps/JAWS3/http/HTTP_States.h
+++ b/ACE/apps/JAWS3/http/HTTP_States.h
@@ -19,7 +19,7 @@ public: \
, void * \
); \
\
- static JAWS_Protocol_State * instance (void) \
+ static JAWS_Protocol_State * instance () \
{ \
return ACE_Singleton<JAWS_HTTP_STATE_NAME, ACE_SYNCH_MUTEX> \
::instance (); \
diff --git a/ACE/apps/JAWS3/jaws3/Concurrency.h b/ACE/apps/JAWS3/jaws3/Concurrency.h
index 0a3c8e88dcd..3b303b6a312 100644
--- a/ACE/apps/JAWS3/jaws3/Concurrency.h
+++ b/ACE/apps/JAWS3/jaws3/Concurrency.h
@@ -15,7 +15,7 @@ typedef ACE_Task<ACE_SYNCH> JAWS_CONCURRENCY_TASK;
class JAWS_Export JAWS_Concurrency_Impl : public JAWS_CONCURRENCY_TASK
{
public:
- virtual ~JAWS_Concurrency_Impl (void) {};
+ virtual ~JAWS_Concurrency_Impl () {};
virtual int putq (JAWS_Protocol_Handler *ph) = 0;
diff --git a/ACE/apps/JAWS3/jaws3/Datagram.h b/ACE/apps/JAWS3/jaws3/Datagram.h
index a847a1a8f01..59e38a309b2 100644
--- a/ACE/apps/JAWS3/jaws3/Datagram.h
+++ b/ACE/apps/JAWS3/jaws3/Datagram.h
@@ -13,7 +13,7 @@
class JAWS_Export JAWS_Datagram_Impl
{
public:
- virtual ~JAWS_Datagram_Impl (void) {}
+ virtual ~JAWS_Datagram_Impl () {}
virtual void accept ( const ACE_Addr &local_sap
, ACE_SOCK_Dgram &new_dgram
diff --git a/ACE/apps/JAWS3/jaws3/Jaws_IO.h b/ACE/apps/JAWS3/jaws3/Jaws_IO.h
index 892f519452f..f6d41b73d4d 100644
--- a/ACE/apps/JAWS3/jaws3/Jaws_IO.h
+++ b/ACE/apps/JAWS3/jaws3/Jaws_IO.h
@@ -19,7 +19,7 @@ class JAWS_Export JAWS_IO_Impl
// Bridge Pattern.
{
public:
- virtual ~JAWS_IO_Impl (void) {}
+ virtual ~JAWS_IO_Impl () {}
// = Regular IO methods.
diff --git a/ACE/apps/JAWS3/jaws3/Signal_Task.h b/ACE/apps/JAWS3/jaws3/Signal_Task.h
index 8a7e749ed66..be386dec56a 100644
--- a/ACE/apps/JAWS3/jaws3/Signal_Task.h
+++ b/ACE/apps/JAWS3/jaws3/Signal_Task.h
@@ -18,7 +18,7 @@ public:
return ACE_Singleton<JAWS_Signal_Task, ACE_SYNCH_MUTEX>::instance ();
}
- ACE_Sig_Set & sigset (void) { return this->sigset_; }
+ ACE_Sig_Set & sigset () { return this->sigset_; }
private:
ACE_Sig_Set sigset_;
diff --git a/ACE/apps/JAWS3/jaws3/Timer.h b/ACE/apps/JAWS3/jaws3/Timer.h
index b69c8a50397..31c2affdc04 100644
--- a/ACE/apps/JAWS3/jaws3/Timer.h
+++ b/ACE/apps/JAWS3/jaws3/Timer.h
@@ -18,7 +18,7 @@ class JAWS_Export JAWS_Timer_Impl
// RHS of the Bridge pattern.
{
public:
- virtual ~JAWS_Timer_Impl (void) {}
+ virtual ~JAWS_Timer_Impl () {}
virtual void schedule_timer ( long *timer_id
, const ACE_Time_Value &delta
diff --git a/ACE/apps/drwho/Comm_Manager.h b/ACE/apps/drwho/Comm_Manager.h
index c062ae4f274..75a7b1a7a3e 100644
--- a/ACE/apps/drwho/Comm_Manager.h
+++ b/ACE/apps/drwho/Comm_Manager.h
@@ -32,7 +32,7 @@ protected:
virtual int demux (char *packet, int &packet_length) = 0;
virtual int open (short port_number) = 0;
virtual int receive (int timeout = 0) = 0;
- virtual int send (void) = 0;
+ virtual int send () = 0;
};
#endif /* _COMM_MANAGER_H */
diff --git a/ACE/apps/drwho/Search_Struct.h b/ACE/apps/drwho/Search_Struct.h
index c8762f70daf..1026ed5775d 100644
--- a/ACE/apps/drwho/Search_Struct.h
+++ b/ACE/apps/drwho/Search_Struct.h
@@ -29,8 +29,8 @@ public:
virtual Protocol_Record *insert (const char *key_name,
int max_len = MAXUSERIDNAMELEN) = 0;
- virtual Protocol_Record *get_next_entry (void) = 0;
- virtual Protocol_Record *get_each_entry (void) = 0;
+ virtual Protocol_Record *get_next_entry () = 0;
+ virtual Protocol_Record *get_each_entry () = 0;
protected:
int count_;