diff options
139 files changed, 795 insertions, 795 deletions
diff --git a/ACE/tests/ACE_Test.cpp b/ACE/tests/ACE_Test.cpp index ade30523b91..95d55bdd56a 100644 --- a/ACE/tests/ACE_Test.cpp +++ b/ACE/tests/ACE_Test.cpp @@ -18,7 +18,7 @@ #include "ace/OS_NS_stdlib.h" int -log2_test (void) +log2_test () { u_long values[] = {1, 2, 4, 8, 1048576}; u_long results[] = {0, 1, 2, 3, 20}; @@ -39,7 +39,7 @@ log2_test (void) } int -ace_debug_test (void) +ace_debug_test () { int test_status = 0; @@ -62,7 +62,7 @@ ace_debug_test (void) // Test ACE::execname to be sure it finds .exe without regard to case. int -execname_test (void) +execname_test () { int error_count = 0; diff --git a/ACE/tests/ARGV_Test.cpp b/ACE/tests/ARGV_Test.cpp index 59d72dab714..4f6f90e25cf 100644 --- a/ACE/tests/ARGV_Test.cpp +++ b/ACE/tests/ARGV_Test.cpp @@ -64,7 +64,7 @@ test_simple_argv (ACE_TCHAR *argv[]) } static int -test_argv_type_converter (void) +test_argv_type_converter () { char *argv[20]; argv[0] = ACE_OS::strdup ("one"); @@ -108,7 +108,7 @@ test_argv_type_converter (void) } static int -test_argv_type_converter2 (void) +test_argv_type_converter2 () { ACE_TCHAR *argv[20]; argv[0] = ACE_OS::strdup (ACE_TEXT ("one")); @@ -145,7 +145,7 @@ test_argv_type_converter2 (void) } static int -test_argv_buf (void) +test_argv_buf () { pid_t parent_pid = ACE_OS::getpid (); @@ -178,7 +178,7 @@ test_argv_buf (void) } static int -test_argv_quotes (void) +test_argv_quotes () { const ACE_TCHAR *argv_const[] = { ACE_TEXT ("first without quotes"), ACE_TEXT ("'second in single quotes'"), diff --git a/ACE/tests/Aio_Platform_Test.cpp b/ACE/tests/Aio_Platform_Test.cpp index 077cc6f74fa..96f71dd66d2 100644 --- a/ACE/tests/Aio_Platform_Test.cpp +++ b/ACE/tests/Aio_Platform_Test.cpp @@ -18,7 +18,7 @@ #include "ace/OS_NS_unistd.h" #if defined (_POSIX_ASYNCHRONOUS_IO) -static int do_sysconf (void) +static int do_sysconf () { ACE_DEBUG ((LM_DEBUG, "Doing <sysconf> calls to know the run-time values of POSIX feature limits\n")); @@ -101,7 +101,7 @@ static int do_sysconf (void) #endif /* _POSIX_ASYNCHRONOUS_IO */ static int -have_asynchio (void) +have_asynchio () { #if defined (_POSIX_ASYNCHRONOUS_IO) #if defined (_POSIX_ASYNC_IO) diff --git a/ACE/tests/Array_Map_Test.cpp b/ACE/tests/Array_Map_Test.cpp index 3a37624ce85..5aad75f3a7e 100644 --- a/ACE/tests/Array_Map_Test.cpp +++ b/ACE/tests/Array_Map_Test.cpp @@ -40,7 +40,7 @@ static size_t const words_len = sizeof (words) / sizeof (words[0]); // -------------------------------------------------------------- bool -insertion_removal_test (void) +insertion_removal_test () { // Instantiate the map. typedef ACE_Array_Map<char, ACE_TString> Map; @@ -220,7 +220,7 @@ insertion_removal_test (void) // -------------------------------------------------------------- bool -index_operator_test (void) +index_operator_test () { // Instantiate the map. typedef ACE_Array_Map<char, ACE_TString> Map; @@ -337,7 +337,7 @@ class RefCounted { public: - RefCounted (void) + RefCounted () : refcount_ (0) { } @@ -347,7 +347,7 @@ public: { } - ~RefCounted (void) + ~RefCounted () { if (this->refcount_) --(*this->refcount_); @@ -370,13 +370,13 @@ public: } unsigned int * - refcount_ptr (void) const + refcount_ptr () const { return this->refcount_; } unsigned int - refcount (void) const + refcount () const { return *this->refcount_; } @@ -390,7 +390,7 @@ private: // -------- bool -reference_count_test (void) +reference_count_test () { typedef ACE_Array_Map<ACE_TString, RefCounted> Map; diff --git a/ACE/tests/Atomic_Op_Test.cpp b/ACE/tests/Atomic_Op_Test.cpp index de6fbc3c938..3052e966ef5 100644 --- a/ACE/tests/Atomic_Op_Test.cpp +++ b/ACE/tests/Atomic_Op_Test.cpp @@ -34,11 +34,11 @@ class Exchange_Tester : public ACE_Task<ACE_NULL_SYNCH> { public: Exchange_Tester (unsigned int thr_count); - int result (void) const; + int result () const; private: Exchange_Tester () {} - int svc (void); + int svc (); ACE_Barrier barrier_; ACE_Atomic_Op<ACE_SYNCH_MUTEX, T> op_; @@ -55,14 +55,14 @@ Exchange_Tester<T>::Exchange_Tester (unsigned int thr_count) template <typename T> int -Exchange_Tester<T>::result (void) const +Exchange_Tester<T>::result () const { return this->claimed_ == 1 ? 0 : 1; } template <typename T> int -Exchange_Tester<T>::svc (void) +Exchange_Tester<T>::svc () { this->barrier_.wait (); // Want all threads to try to claim "at once" bool claimed = this->op_.exchange (1) == 0; diff --git a/ACE/tests/Auto_Event_Test.cpp b/ACE/tests/Auto_Event_Test.cpp index 5f3b47f4348..e7449c740c0 100644 --- a/ACE/tests/Auto_Event_Test.cpp +++ b/ACE/tests/Auto_Event_Test.cpp @@ -53,7 +53,7 @@ static size_t test_timeout_count = 3; // Tests the amount of time spent in a timed wait. static int -test_timeout (void) +test_timeout () { int status = 0; @@ -105,7 +105,7 @@ test_timeout (void) // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("usage: %n [-w n_workers] [-n iteration_count]\n"))); diff --git a/ACE/tests/Based_Pointer_Test.cpp b/ACE/tests/Based_Pointer_Test.cpp index 7c8655ad8ba..064d5885d29 100644 --- a/ACE/tests/Based_Pointer_Test.cpp +++ b/ACE/tests/Based_Pointer_Test.cpp @@ -56,7 +56,7 @@ class Void_Pointer : public ACE_Based_Pointer<void> #endif /* ACE_WIN32 */ // Declare the type of the DLL symbol: -typedef void *(*Get_Bp_Repository_Inst)(void); +typedef void *(*Get_Bp_Repository_Inst)(); // Declare an allocator based MMAP_Memory_Pool typedef ACE_Malloc_T< ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_PI_Control_Block @@ -66,7 +66,7 @@ typedef ACE_Malloc_T< ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex, ACE_PI_Control_Block // Check that the ACE_Based_Pointer_Repository can be accessed // from a Windows DLL // (see http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=1991) -int singleton_test (void) +int singleton_test () { void* baddr1 = ACE_BASED_POINTER_REPOSITORY::instance(); void* baddr2 = ACE_BASED_POINTER_REPOSITORY::instance(); @@ -148,7 +148,7 @@ int singleton_test (void) // Check that MMAP memory blocks are correctly mapped // into the Based_Pointer_Repository int -mmap_map_test(void) +mmap_map_test() { MMAP_Allocator* alloc = 0; @@ -216,7 +216,7 @@ mmap_map_test(void) // present in the filesystem) // (see http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=2216) int -mmap_persistent_map_test(void) +mmap_persistent_map_test() { MMAP_Allocator* alloc = 0; @@ -283,7 +283,7 @@ mmap_persistent_map_test(void) // base address, in this case the Repository must be updated) // (see http://bugzilla.dre.vanderbilt.edu/show_bug.cgi?id=2218) int -mmap_remap_test(void) +mmap_remap_test() { // Use a Position Independent memory segment // because this one is going to move diff --git a/ACE/tests/Bound_Ptr_Test.cpp b/ACE/tests/Bound_Ptr_Test.cpp index d8cc576ddfa..cc94b2b64f8 100644 --- a/ACE/tests/Bound_Ptr_Test.cpp +++ b/ACE/tests/Bound_Ptr_Test.cpp @@ -26,10 +26,10 @@ struct Child_Base { - virtual ~Child_Base (void); + virtual ~Child_Base (); // Perform some operation. - virtual void do_something (void) = 0; + virtual void do_something () = 0; }; @@ -37,8 +37,8 @@ struct Child_Base // abstract class, and the implementation would be elsewhere. struct Parent { - Parent (void); - ~Parent (void); + Parent (); + ~Parent (); // Weak pointer to this object used to hand out new references. Must be // weak since it can't own itself! @@ -49,7 +49,7 @@ struct Parent ACE_Strong_Bound_Ptr<Child_Base, ACE_Null_Mutex> child_; // Called by the child to perform some operation. - void do_something (void); + void do_something (); static size_t instance_count_; }; @@ -59,26 +59,26 @@ struct Parent struct Child : public Child_Base { Child (ACE_Weak_Bound_Ptr<Parent, ACE_Null_Mutex> parent); - virtual ~Child (void); + virtual ~Child (); // Back pointer to the parent. The child does not own the parent so has no // effect on its lifetime. ACE_Weak_Bound_Ptr<Parent, ACE_Null_Mutex> parent_; // Perform some operation. Delegates the work to the parent. - virtual void do_something (void); + virtual void do_something (); static size_t instance_count_; }; -Child_Base::~Child_Base (void) +Child_Base::~Child_Base () { } size_t Parent::instance_count_ = 0; -Parent::Parent (void) +Parent::Parent () : weak_self_(this), child_(new Child(weak_self_)) { @@ -87,14 +87,14 @@ Parent::Parent (void) ++Parent::instance_count_; } -Parent::~Parent (void) +Parent::~Parent () { --Parent::instance_count_; ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Deleting Parent object\n"))); } -void Parent::do_something (void) +void Parent::do_something () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Parent doing something\n"))); @@ -110,14 +110,14 @@ Child::Child (ACE_Weak_Bound_Ptr<Parent, ACE_Null_Mutex> parent) ++Child::instance_count_; } -Child::~Child (void) +Child::~Child () { --Child::instance_count_; ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Deleting Child object\n"))); } -void Child::do_something (void) +void Child::do_something () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Child doing something\n"))); @@ -152,7 +152,7 @@ Printer::Printer (const char *message) ++Printer::instance_count_; } -Printer::~Printer (void) +Printer::~Printer () { --Printer::instance_count_; ACE_DEBUG ((LM_DEBUG, @@ -160,7 +160,7 @@ Printer::~Printer (void) } void -Printer::print (void) +Printer::print () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) %C\n"), @@ -178,10 +178,10 @@ class Method_Request_print : public ACE_Method_Request { public: explicit Method_Request_print (Printer_var &printer); - virtual ~Method_Request_print (void); + virtual ~Method_Request_print (); /// This is the entry point into the Active Object method. - virtual int call (void); + virtual int call (); private: Printer_var printer_; @@ -194,14 +194,14 @@ Method_Request_print::Method_Request_print (Printer_var &printer) ACE_TEXT ("(%t) Method_Request_print created\n"))); } -Method_Request_print::~Method_Request_print (void) +Method_Request_print::~Method_Request_print () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Method_Request_print will be deleted.\n"))); } int -Method_Request_print::call (void) +Method_Request_print::call () { // Dispatch the Servant's operation and store the result into the // Future. @@ -221,8 +221,8 @@ class Method_Request_end : public ACE_Method_Request { public: Method_Request_end (Scheduler *new_Prime_Scheduler); - virtual ~Method_Request_end (void); - virtual int call (void); + virtual ~Method_Request_end (); + virtual int call (); private: Scheduler *scheduler_; @@ -233,12 +233,12 @@ Method_Request_end::Method_Request_end (Scheduler *scheduler) { } -Method_Request_end::~Method_Request_end (void) +Method_Request_end::~Method_Request_end () { } int -Method_Request_end::call (void) +Method_Request_end::call () { // Shut down the scheduler by deactivating the activation queue's // underlying message queue - should pop all worker threads off their @@ -251,7 +251,7 @@ Method_Request_end::call (void) // Associates the activation queue with this task's message queue, // allowing easy access to the message queue for shutting it down // when it's time to stop this object's service threads. -Scheduler::Scheduler (void) +Scheduler::Scheduler () : activation_queue_ (msg_queue ()) { ACE_DEBUG ((LM_DEBUG, @@ -260,7 +260,7 @@ Scheduler::Scheduler (void) // Destructor -Scheduler::~Scheduler (void) +Scheduler::~Scheduler () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Scheduler will be destroyed\n"))); @@ -290,7 +290,7 @@ Scheduler::close (u_long) // Service.. int -Scheduler::svc (void) +Scheduler::svc () { for (;;) { @@ -317,7 +317,7 @@ Scheduler::svc (void) } void -Scheduler::end (void) +Scheduler::end () { this->activation_queue_.enqueue (new Method_Request_end (this)); } diff --git a/ACE/tests/Buffer_Stream_Test.cpp b/ACE/tests/Buffer_Stream_Test.cpp index 5f543167bd6..d2181159ca0 100644 --- a/ACE/tests/Buffer_Stream_Test.cpp +++ b/ACE/tests/Buffer_Stream_Test.cpp @@ -40,7 +40,7 @@ typedef ACE_Task<ACE_MT_SYNCH> MT_Task; class Common_Task : public MT_Task { public: - Common_Task (void) {} + Common_Task () {} //FUZZ: disable check_for_lack_ACE_OS // = ACE_Task hooks. @@ -57,10 +57,10 @@ public: class Supplier : public Common_Task { public: - Supplier (void) {} + Supplier () {} /// Read data from stdin and pass to consumer. - virtual int svc (void); + virtual int svc (); }; /** @@ -71,14 +71,14 @@ public: class Consumer : public Common_Task { public: - Consumer (void) {} + Consumer () {} /// Enqueue the message on the ACE_Message_Queue for subsequent /// handling in the svc() method. virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0); /// Receive message from Supplier and print to stdout. - virtual int svc (void); + virtual int svc (); private: /// Amount of time to wait for a timeout. @@ -116,7 +116,7 @@ Common_Task::close (u_long exit_status) // know when to exit. int -Supplier::svc (void) +Supplier::svc () { ACE_Message_Block *mb = 0; @@ -161,7 +161,7 @@ Consumer::put (ACE_Message_Block *mb, ACE_Time_Value *tv) // reading and exit. int -Consumer::svc (void) +Consumer::svc () { ACE_Message_Block *mb = 0; int result; diff --git a/ACE/tests/Bug_2497_Regression_Test.cpp b/ACE/tests/Bug_2497_Regression_Test.cpp index ebbf70afc34..d2586c39de2 100644 --- a/ACE/tests/Bug_2497_Regression_Test.cpp +++ b/ACE/tests/Bug_2497_Regression_Test.cpp @@ -15,12 +15,12 @@ class Test_Task : public ACE_Task<ACE_SYNCH> { public: - Test_Task( void ) : + Test_Task( ) : _destructorCalled(0) { } - virtual ~Test_Task( void ) + virtual ~Test_Task( ) { ++_destructorCalled; if (_destructorCalled > 1) @@ -36,7 +36,7 @@ private: class Test_Module : public ACE_Module<ACE_SYNCH> { public: - Test_Module( void ) + Test_Module( ) { this->open( ACE_TEXT("Test module"), &_writerTask, diff --git a/ACE/tests/Bug_2653_Regression_Test.cpp b/ACE/tests/Bug_2653_Regression_Test.cpp index 8f8fe46943c..e3922ed9fc3 100644 --- a/ACE/tests/Bug_2653_Regression_Test.cpp +++ b/ACE/tests/Bug_2653_Regression_Test.cpp @@ -31,12 +31,12 @@ static const char *message = class Watchdog : public ACE_Task_Base { public: - int svc (void); + int svc (); int my_grp_; }; int -Watchdog::svc (void) +Watchdog::svc () { ACE_OS::sleep (5); // If we make it through the sleep and haven't been canceled, that @@ -95,7 +95,7 @@ Handler::Handler (ACE_Reactor &reactor, bool close_other) } } -Handler::~Handler (void) +Handler::~Handler () { this->other_pipe_.close(); this->pipe_.close (); diff --git a/ACE/tests/Bug_2659_Regression_Test.cpp b/ACE/tests/Bug_2659_Regression_Test.cpp index ce6ac4f1301..0619240c0e7 100644 --- a/ACE/tests/Bug_2659_Regression_Test.cpp +++ b/ACE/tests/Bug_2659_Regression_Test.cpp @@ -85,7 +85,7 @@ public: EE_DEBUG ("ReactorTask", "~ReactorTask", this); }; - virtual int svc (void ) + virtual int svc ( ) { EE_DEBUG ("ReactorTask", "svc", this); diff --git a/ACE/tests/Bug_2815_Regression_Test.cpp b/ACE/tests/Bug_2815_Regression_Test.cpp index 04133884b86..ae70e44bdf1 100644 --- a/ACE/tests/Bug_2815_Regression_Test.cpp +++ b/ACE/tests/Bug_2815_Regression_Test.cpp @@ -43,7 +43,7 @@ public: char const *test_name); /// Run the test - void run (void); + void run (); /// One of the sub-handlers has received a notification void notification_received (); @@ -63,12 +63,12 @@ private: * Each iteration of the test consists of sending multiple * notifications simultaneously. */ - void send_notifications (void); + void send_notifications (); /** * @brief Return true if the test is finished. */ - bool done (void) const; + bool done () const; /** * @brief Return true if there are more iterations to run. @@ -84,7 +84,7 @@ private: * @brief Run one iteration of the test, each iteration doubles * the number of events. */ - int run_one_iteration (void); + int run_one_iteration (); /** * @brief Initialize a bunch of One_Shot_Handlers @@ -251,7 +251,7 @@ Driver::Driver ( } void -Driver::run (void) +Driver::run () { while(more_iterations()) { @@ -292,7 +292,7 @@ Driver::reactor() } void -Driver::send_notifications (void) +Driver::send_notifications () { int const nhandlers = 16; One_Shot_Handler * handlers[nhandlers]; @@ -305,7 +305,7 @@ Driver::send_notifications (void) } bool -Driver::done (void) const +Driver::done () const { return !more_iterations() && current_iteration_done(); } @@ -323,7 +323,7 @@ Driver::current_iteration_done() const } int -Driver::run_one_iteration (void) +Driver::run_one_iteration () { ACE_DEBUG ((LM_INFO, ACE_TEXT ("Running iteration with %d events for %C test\n"), diff --git a/ACE/tests/Bug_2980_Regression_Test.cpp b/ACE/tests/Bug_2980_Regression_Test.cpp index 29a6261884f..0e7a01c9691 100644 --- a/ACE/tests/Bug_2980_Regression_Test.cpp +++ b/ACE/tests/Bug_2980_Regression_Test.cpp @@ -50,7 +50,7 @@ namespace { #endif -typedef int (* voidfunction)(void); +typedef int (* voidfunction)(); #if defined (CAN_RUN_TEST) diff --git a/ACE/tests/Bug_3102_Regression_Test.cpp b/ACE/tests/Bug_3102_Regression_Test.cpp index 755a69ffed4..724aa314af8 100644 --- a/ACE/tests/Bug_3102_Regression_Test.cpp +++ b/ACE/tests/Bug_3102_Regression_Test.cpp @@ -15,7 +15,7 @@ #if defined (ACE_HAS_THREADS) -void mutexTest(void) +void mutexTest() { ACE_MT(ACE_Thread_Mutex *lock = ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object diff --git a/ACE/tests/Bug_3432_Regression_Test.cpp b/ACE/tests/Bug_3432_Regression_Test.cpp index 4da4eb21c1e..c56d92c5ae7 100644 --- a/ACE/tests/Bug_3432_Regression_Test.cpp +++ b/ACE/tests/Bug_3432_Regression_Test.cpp @@ -21,7 +21,7 @@ int -strptime_test (void) +strptime_test () { // convert UTC time string to UTC ACE_Time_Value int error_count = 0; diff --git a/ACE/tests/Bug_3744_Regression_Test.cpp b/ACE/tests/Bug_3744_Regression_Test.cpp index b557fdd9710..66fac13b54a 100644 --- a/ACE/tests/Bug_3744_Regression_Test.cpp +++ b/ACE/tests/Bug_3744_Regression_Test.cpp @@ -9,7 +9,7 @@ : ACE_VERSIONED_NAMESPACE_NAME::__ace_assert(__FILE__, __LINE__, ACE_TEXT_CHAR_TO_TCHAR (#X))) int -getmacaddress_test (void) +getmacaddress_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing getmacaddress\n"))); diff --git a/ACE/tests/Bug_3758_Regression_Test.cpp b/ACE/tests/Bug_3758_Regression_Test.cpp index af67c450089..0c4197cc8bc 100644 --- a/ACE/tests/Bug_3758_Regression_Test.cpp +++ b/ACE/tests/Bug_3758_Regression_Test.cpp @@ -23,7 +23,7 @@ // Test ACE_OS::fileno() int -fileno_test (void) +fileno_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing fileno method\n"))); diff --git a/ACE/tests/Bug_3878_Regression_Test.cpp b/ACE/tests/Bug_3878_Regression_Test.cpp index 685b8c450a2..61db0dc3556 100644 --- a/ACE/tests/Bug_3878_Regression_Test.cpp +++ b/ACE/tests/Bug_3878_Regression_Test.cpp @@ -19,7 +19,7 @@ class Worker; class IManager { public: - virtual ~IManager (void) { } + virtual ~IManager () { } virtual int return_to_work (Worker *worker) = 0; }; @@ -30,7 +30,7 @@ class Worker : public ACE_Task<ACE_MT_SYNCH> public: Worker (IManager *manager) : manager_(manager) { } - virtual int svc (void) + virtual int svc () { ACE_Thread_ID id; thread_id_ = id; @@ -56,7 +56,7 @@ public: return 0; } - const ACE_Thread_ID& thread_id (void) + const ACE_Thread_ID& thread_id () { return thread_id_; } @@ -94,7 +94,7 @@ public: ACE_TRACE ("Manager::Manager"); } - int svc (void) + int svc () { ACE_TRACE ("Manager::svc"); @@ -135,7 +135,7 @@ public: return 0; } - int shut_down (void); + int shut_down (); const ACE_Thread_ID& thread_id (Worker *worker); @@ -152,7 +152,7 @@ public: } private: - int create_worker_pool (void) + int create_worker_pool () { ACE_GUARD_RETURN (ACE_Mutex, worker_mon, @@ -169,7 +169,7 @@ private: return 0; } - int done (void); + int done (); private: int shutdown_; @@ -179,13 +179,13 @@ private: }; // Listing 1 -int Manager::done (void) +int Manager::done () { return (shutdown_ == 1); } int -Manager::shut_down (void) +Manager::shut_down () { ACE_TRACE ("Manager::shut_down"); ACE_Unbounded_Queue<Worker* >::ITERATOR iter = diff --git a/ACE/tests/Bug_3943_Regression_Test.cpp b/ACE/tests/Bug_3943_Regression_Test.cpp index c0d1b0beaa7..2ac33a561f0 100644 --- a/ACE/tests/Bug_3943_Regression_Test.cpp +++ b/ACE/tests/Bug_3943_Regression_Test.cpp @@ -223,10 +223,10 @@ namespace { virtual int open (void *); // Initialization hook. - void send_data (void); + void send_data (); // Send data to server. - void recv_data (void); + void recv_data (); // Recv data from client. int close (u_long = 0); @@ -320,7 +320,7 @@ Svc_Handler::open (void *) } void -Svc_Handler::send_data (void) +Svc_Handler::send_data () { bool successful = true; bool win32_test = false; @@ -780,7 +780,7 @@ Svc_Handler::send (char send_char, const ACE_TCHAR * const send_desc) } void -Svc_Handler::recv_data (void) +Svc_Handler::recv_data () { ACE_SOCK_Stream &new_stream = this->peer (); diff --git a/ACE/tests/Bug_4055_Regression_Test.cpp b/ACE/tests/Bug_4055_Regression_Test.cpp index 4aa1d30a3c3..7e6a6a273e5 100644 --- a/ACE/tests/Bug_4055_Regression_Test.cpp +++ b/ACE/tests/Bug_4055_Regression_Test.cpp @@ -32,7 +32,7 @@ // Create timer queue with hr support ACE_Timer_Queue * -create_timer_queue (void) +create_timer_queue () { ACE_Timer_Queue * tmq = 0; @@ -52,15 +52,15 @@ public: virtual ~MyTask () { stop (); } - virtual int svc (void); + virtual int svc (); int start (int num_threads); - int stop (void); + int stop (); ACE_Reactor* get_reactor (); - int create_reactor (void); + int create_reactor (); private: - int delete_reactor (void); + int delete_reactor (); ACE_SYNCH_RECURSIVE_MUTEX lock_; ACE_Reactor *my_reactor_; @@ -74,7 +74,7 @@ MyTask::get_reactor () } int -MyTask::create_reactor (void) +MyTask::create_reactor () { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, monitor, @@ -101,7 +101,7 @@ MyTask::create_reactor (void) } int -MyTask::delete_reactor (void) +MyTask::delete_reactor () { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, monitor, @@ -133,7 +133,7 @@ MyTask::start (int num_threads) int -MyTask::stop (void) +MyTask::stop () { if (this->my_reactor_ != 0) { @@ -157,7 +157,7 @@ MyTask::stop (void) } int -MyTask::svc (void) +MyTask::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%P|%t) MyTask started\n"))); diff --git a/ACE/tests/Bug_4189_Regression_Test.cpp b/ACE/tests/Bug_4189_Regression_Test.cpp index bff5a9297e7..1ccd0e1a768 100644 --- a/ACE/tests/Bug_4189_Regression_Test.cpp +++ b/ACE/tests/Bug_4189_Regression_Test.cpp @@ -24,7 +24,7 @@ const int SEC_TO_KEEP_SOCKET_OPEN = 2; #if defined (ACE_HAS_THREADS) -int reuseAddr_test (void) +int reuseAddr_test () { # if defined ACE_WIN32 || !defined ACE_LACKS_IOCTL ACE_SOCK_Dgram_Bcast sock1; diff --git a/ACE/tests/CDR_File_Test.cpp b/ACE/tests/CDR_File_Test.cpp index 6d44f5546a6..c10f0c2323a 100644 --- a/ACE/tests/CDR_File_Test.cpp +++ b/ACE/tests/CDR_File_Test.cpp @@ -48,7 +48,7 @@ class CDR_Test public: /// Default constructor. - CDR_Test (void); + CDR_Test (); /// Constructor. CDR_Test (ACE_CDR::Char o, @@ -121,7 +121,7 @@ operator << (ostream &os, return os; } -CDR_Test::CDR_Test (void) +CDR_Test::CDR_Test () : char_ (0), word2_ (0), word4_ (0), diff --git a/ACE/tests/CDR_Test.cpp b/ACE/tests/CDR_Test.cpp index f07a7ea9928..283f5a9e1ae 100644 --- a/ACE/tests/CDR_Test.cpp +++ b/ACE/tests/CDR_Test.cpp @@ -28,7 +28,7 @@ static int nloops = 100; struct CDR_Test_Types { - CDR_Test_Types (void); + CDR_Test_Types (); ACE_CDR::Octet o; ACE_CDR::Short s; @@ -65,7 +65,7 @@ struct CDR_Test_Types ACE_CDR::Short a[ARRAY_SIZE]; }; -CDR_Test_Types::CDR_Test_Types (void) +CDR_Test_Types::CDR_Test_Types () : o (1), s (2), l (4), @@ -95,7 +95,7 @@ CDR_Test_Types::CDR_Test_Types (void) } static int -short_stream (void) +short_stream () { // counter u_int i; diff --git a/ACE/tests/Cache_Map_Manager_Test.cpp b/ACE/tests/Cache_Map_Manager_Test.cpp index b9028eab59d..af0a5249521 100644 --- a/ACE/tests/Cache_Map_Manager_Test.cpp +++ b/ACE/tests/Cache_Map_Manager_Test.cpp @@ -416,7 +416,7 @@ functionality_test_hash_cache (HASH_MAP_CACHING_STRATEGY &caching_strategy) } void -test_caching_strategy_type (void) +test_caching_strategy_type () { HASH_MAP_CACHING_STRATEGY *hash_map_caching_strategy = 0; MAP_CACHING_STRATEGY *map_caching_strategy = 0; diff --git a/ACE/tests/Cached_Accept_Conn_Test.cpp b/ACE/tests/Cached_Accept_Conn_Test.cpp index 909e5cf31cb..3207b9f6718 100644 --- a/ACE/tests/Cached_Accept_Conn_Test.cpp +++ b/ACE/tests/Cached_Accept_Conn_Test.cpp @@ -112,7 +112,7 @@ Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::accept_svc_handler (SVC_HANDL } template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int -Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::out_of_sockets_handler (void) +Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::out_of_sockets_handler () { if (ACE::out_of_handles (errno)) { @@ -230,7 +230,7 @@ cached_connect (STRATEGY_CONNECTOR &con, } static void -server (void) +server () { int result = 1; @@ -335,7 +335,7 @@ test_connection_management (CACHING_STRATEGY &caching_strategy) } void -test_caching_strategy_type (void) +test_caching_strategy_type () { CACHING_STRATEGY *caching_strategy = 0; diff --git a/ACE/tests/Cached_Conn_Test.cpp b/ACE/tests/Cached_Conn_Test.cpp index f197be790af..803d37bd36b 100644 --- a/ACE/tests/Cached_Conn_Test.cpp +++ b/ACE/tests/Cached_Conn_Test.cpp @@ -154,7 +154,7 @@ static int iterations = 200; //==================================================================== static void -out_of_sockets_handler (void) +out_of_sockets_handler () { if (ACE::out_of_handles (errno)) { @@ -311,7 +311,7 @@ test_connection_management (CACHING_STRATEGY &caching_strategy) } void -test_caching_strategy_type (void) +test_caching_strategy_type () { CACHING_STRATEGY *caching_strategy = 0; diff --git a/ACE/tests/Capabilities_Test.cpp b/ACE/tests/Capabilities_Test.cpp index fa1ce4b99e5..75951f39bbd 100644 --- a/ACE/tests/Capabilities_Test.cpp +++ b/ACE/tests/Capabilities_Test.cpp @@ -19,7 +19,7 @@ static const ACE_TCHAR config[] = ACE_TEXT ("Capabilities_Test.cfg"); static int -load_config (void) +load_config () { ACE_Capabilities caps; if (caps.getent (config, ACE_TEXT ("Config")) == -1) diff --git a/ACE/tests/Collection_Test.cpp b/ACE/tests/Collection_Test.cpp index 09412f94791..2d5f23d7841 100644 --- a/ACE/tests/Collection_Test.cpp +++ b/ACE/tests/Collection_Test.cpp @@ -59,7 +59,7 @@ void iterate_const(const UNBOUNDED_SET& set) struct DummyFunctor { - int operator() (void) { return 0; } + int operator() () { return 0; } }; int diff --git a/ACE/tests/Config_Test.cpp b/ACE/tests/Config_Test.cpp index 56d8b26b64c..510ce0a0d35 100644 --- a/ACE/tests/Config_Test.cpp +++ b/ACE/tests/Config_Test.cpp @@ -334,7 +334,7 @@ test_subkey_path (ACE_Configuration* config) } static int -run_tests (void) +run_tests () { int status; diff --git a/ACE/tests/Conn_Test.cpp b/ACE/tests/Conn_Test.cpp index 6a9c5f7f912..bc7786b3635 100644 --- a/ACE/tests/Conn_Test.cpp +++ b/ACE/tests/Conn_Test.cpp @@ -136,7 +136,7 @@ Svc_Handler::recycle (void *) } void -Svc_Handler::send_data (void) +Svc_Handler::send_data () { // Send data to server. @@ -148,7 +148,7 @@ Svc_Handler::send_data (void) } void -Svc_Handler::recv_data (void) +Svc_Handler::recv_data () { ACE_SOCK_Stream &new_stream = this->peer (); diff --git a/ACE/tests/DLL_Test.cpp b/ACE/tests/DLL_Test.cpp index e3f02ed8429..746909efb86 100644 --- a/ACE/tests/DLL_Test.cpp +++ b/ACE/tests/DLL_Test.cpp @@ -31,7 +31,7 @@ #endif /* ACE_WIN32 */ // Declare the type of the symbol: -typedef Hello *(*Hello_Factory)(void); +typedef Hello *(*Hello_Factory)(); typedef int ( *PFN )( Parent* ); diff --git a/ACE/tests/DLL_Test_Impl.cpp b/ACE/tests/DLL_Test_Impl.cpp index 65319575d12..c99cb06fc8c 100644 --- a/ACE/tests/DLL_Test_Impl.cpp +++ b/ACE/tests/DLL_Test_Impl.cpp @@ -16,31 +16,31 @@ #include "ace/svc_export.h" #include "ace/OS_NS_string.h" -Hello_Impl::Hello_Impl (void) +Hello_Impl::Hello_Impl () { ACE_DEBUG ((LM_DEBUG, "Hello_Impl::Hello_Impl\n")); } -Hello_Impl::~Hello_Impl (void) +Hello_Impl::~Hello_Impl () { ACE_DEBUG ((LM_DEBUG, "Hello_Impl::~Hello_Impl\n")); } void -Hello_Impl::say_next (void) +Hello_Impl::say_next () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("How are you?\n"))); } ACE_TCHAR * -Hello_Impl::new_info (void) +Hello_Impl::new_info () { return ACE::strnew (ACE_TEXT ("Hello_Impl::new_info() allocated by ACE::strnew()")); } ACE_TCHAR * -Hello_Impl::malloc_info (void) +Hello_Impl::malloc_info () { return ACE_OS::strdup (ACE_TEXT ("Hello_Impl::new_info() allocated by ACE_OS::malloc()")); } @@ -94,12 +94,12 @@ get_hello (void) class Static_Constructor_Test { public: - Static_Constructor_Test (void) + Static_Constructor_Test () { ACE_DEBUG ((LM_DEBUG, "Static_Constructor_Test::Static_Constructor_Test\n")); } - ~Static_Constructor_Test (void) + ~Static_Constructor_Test () { ACE_DEBUG ((LM_DEBUG, "Static_Constructor_Test::~Static_Constructor_Test\n")); @@ -110,16 +110,16 @@ static Static_Constructor_Test the_instance; // -------------------------------------------------------- -Child::Child (void) +Child::Child () { } -Child::~Child (void) +Child::~Child () { } void -Child::test (void) +Child::test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("child called\n"))); } diff --git a/ACE/tests/DLL_Test_Parent.cpp b/ACE/tests/DLL_Test_Parent.cpp index 26c533d5518..4788c88f868 100644 --- a/ACE/tests/DLL_Test_Parent.cpp +++ b/ACE/tests/DLL_Test_Parent.cpp @@ -1,12 +1,12 @@ #include "DLL_Test_Parent.h" #include "ace/Log_Msg.h" -Parent::~Parent (void) +Parent::~Parent () { } void -Parent::test (void) +Parent::test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("parent called\n"))); } diff --git a/ACE/tests/DLList_Test.cpp b/ACE/tests/DLList_Test.cpp index f55028d3dc1..a15362672ed 100644 --- a/ACE/tests/DLList_Test.cpp +++ b/ACE/tests/DLList_Test.cpp @@ -67,7 +67,7 @@ run_reverse_iterate (STRLIST &list) } static int -run_test (void) +run_test () { STRLIST list; diff --git a/ACE/tests/Dev_Poll_Reactor_Echo_Test.cpp b/ACE/tests/Dev_Poll_Reactor_Echo_Test.cpp index e5d231dd903..daef97ae299 100644 --- a/ACE/tests/Dev_Poll_Reactor_Echo_Test.cpp +++ b/ACE/tests/Dev_Poll_Reactor_Echo_Test.cpp @@ -38,7 +38,7 @@ class Client : public SVC_HANDLER { public: - Client (void); + Client (); //FUZZ: disable check_for_lack_ACE_OS virtual int open (void * = 0); @@ -66,7 +66,7 @@ class Server : public SVC_HANDLER { public: - Server (void); + Server (); virtual int handle_input (ACE_HANDLE handle); @@ -85,7 +85,7 @@ private: // ---------------------------------------------------- -Client::Client (void) +Client::Client () : call_count_ (0) { } @@ -233,7 +233,7 @@ Client::handle_close (ACE_HANDLE handle, // ---------------------------------------------------- -Server::Server (void) +Server::Server () : offset_ (0) { } diff --git a/ACE/tests/Dev_Poll_Reactor_Test.cpp b/ACE/tests/Dev_Poll_Reactor_Test.cpp index 3d023059334..41b19063df8 100644 --- a/ACE/tests/Dev_Poll_Reactor_Test.cpp +++ b/ACE/tests/Dev_Poll_Reactor_Test.cpp @@ -44,7 +44,7 @@ class Client : public SVC_HANDLER { public: - Client (void); + Client (); //FUZZ: disable check_for_lack_ACE_OS virtual int open (void * = 0); @@ -69,7 +69,7 @@ class Server : public SVC_HANDLER { public: - Server (void); + Server (); virtual int handle_input (ACE_HANDLE handle); @@ -87,7 +87,7 @@ private: // ---------------------------------------------------- -Client::Client (void) +Client::Client () : call_count_ (0) { } @@ -198,7 +198,7 @@ Client::handle_close (ACE_HANDLE handle, // ---------------------------------------------------- -Server::Server (void) +Server::Server () : call_count_ (0) { } diff --git a/ACE/tests/Dirent_Test.cpp b/ACE/tests/Dirent_Test.cpp index 550ede491a0..118675e3730 100644 --- a/ACE/tests/Dirent_Test.cpp +++ b/ACE/tests/Dirent_Test.cpp @@ -55,7 +55,7 @@ comparator (const ACE_DIRENT **d1, const ACE_DIRENT **d2) } /* extern "C" */ static int -dirent_selector_test (void) +dirent_selector_test () { int n; int error = 0; @@ -156,7 +156,7 @@ dirent_selector_test (void) } static int -dirent_test (void) +dirent_test () { ACE_Dirent dir; @@ -315,7 +315,7 @@ dirent_count (const ACE_TCHAR *dir_path, } static int -dirent_recurse_test (void) +dirent_recurse_test () { int total_dirs = 0; int total_files = 0; diff --git a/ACE/tests/FIFO_Test.cpp b/ACE/tests/FIFO_Test.cpp index fa0cd5e7dba..ec9853d34ef 100644 --- a/ACE/tests/FIFO_Test.cpp +++ b/ACE/tests/FIFO_Test.cpp @@ -182,7 +182,7 @@ server (void *arg) } static int -test_fifo_msg (void) +test_fifo_msg () { // Reader side opens first - it may fail if fifo not supported on this // platform. diff --git a/ACE/tests/Framework_Component_DLL.cpp b/ACE/tests/Framework_Component_DLL.cpp index 2d3f50c687b..ce70f65e65f 100644 --- a/ACE/tests/Framework_Component_DLL.cpp +++ b/ACE/tests/Framework_Component_DLL.cpp @@ -19,18 +19,18 @@ ACE_DLL_UNLOAD_POLICY (Framework_Component_DLL, ACE_DLL_UNLOAD_POLICY_LAZY) -Simple_Service::Simple_Service (void) +Simple_Service::Simple_Service () { FRAMEWORK_COMPONENT_DLL_TRACE ("Simple_Service::Simple_Service"); } -Simple_Service::~Simple_Service (void) +Simple_Service::~Simple_Service () { FRAMEWORK_COMPONENT_DLL_TRACE ("Simple_Service::~Simple_Service"); } const ACE_TCHAR * -Simple_Service::name (void) +Simple_Service::name () { FRAMEWORK_COMPONENT_DLL_TRACE ("Simple_Service::dll_name"); return ACE_TEXT ("Simple_Service"); @@ -55,7 +55,7 @@ public: return 0; } - int fini (void) + int fini () { FRAMEWORK_COMPONENT_DLL_TRACE ("Server_T::fini"); return 0; diff --git a/ACE/tests/Future_Set_Test.cpp b/ACE/tests/Future_Set_Test.cpp index f2040536dfd..f05a36356dd 100644 --- a/ACE/tests/Future_Set_Test.cpp +++ b/ACE/tests/Future_Set_Test.cpp @@ -63,24 +63,24 @@ public: /// Terminator. //FUZZ: enable check_for_lack_ACE_OS - virtual int shutdown (void); + virtual int shutdown (); /// Destructor. - virtual ~Prime_Scheduler (void); + virtual ~Prime_Scheduler (); // = These methods are part of the Active Object Proxy interface. ACE_Future<u_long> work (u_long param, int count = 1); - ACE_Future<const ACE_TCHAR*> name (void); - void end (void); + ACE_Future<const ACE_TCHAR*> name (); + void end (); protected: /// Runs the Prime_Scheduler's event loop, which dequeues /// <Method_Requests> and dispatches them. - virtual int svc (void); + virtual int svc (); // = These are the Servant methods that do the actual work. u_long work_i (u_long, int); - const ACE_TCHAR *name_i (void); + const ACE_TCHAR *name_i (); private: // = These are the <Prime_Scheduler> implementation details. @@ -101,10 +101,10 @@ public: u_long, int, ACE_Future<u_long> &); - virtual ~Method_Request_work (void); + virtual ~Method_Request_work (); /// This is the entry point into the Active Object method. - virtual int call (void); + virtual int call (); private: Prime_Scheduler *scheduler_; @@ -133,14 +133,14 @@ Method_Request_work::Method_Request_work (Prime_Scheduler *new_Prime_Scheduler, ACE_TEXT ("(%t) Method_Request_work created\n"))); } -Method_Request_work::~Method_Request_work (void) +Method_Request_work::~Method_Request_work () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Method_Request_work will be deleted.\n"))); } int -Method_Request_work::call (void) +Method_Request_work::call () { // Dispatch the Servant's operation and store the result into the // Future. @@ -159,10 +159,10 @@ class Method_Request_name : public ACE_Method_Request public: Method_Request_name (Prime_Scheduler *, ACE_Future<const ACE_TCHAR*> &); - virtual ~Method_Request_name (void); + virtual ~Method_Request_name (); /// This is the entry point into the Active Object method. - virtual int call (void); + virtual int call (); private: Prime_Scheduler *scheduler_; @@ -178,14 +178,14 @@ Method_Request_name::Method_Request_name (Prime_Scheduler *new_scheduler, ACE_TEXT ("(%t) Method_Request_name created\n"))); } -Method_Request_name::~Method_Request_name (void) +Method_Request_name::~Method_Request_name () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Method_Request_name will be deleted.\n"))); } int -Method_Request_name::call (void) +Method_Request_name::call () { // Dispatch the Servant's operation and store the result into the // Future. @@ -201,8 +201,8 @@ class Method_Request_end : public ACE_Method_Request { public: Method_Request_end (Prime_Scheduler *new_Prime_Scheduler); - virtual ~Method_Request_end (void); - virtual int call (void); + virtual ~Method_Request_end (); + virtual int call (); private: Prime_Scheduler *scheduler_; @@ -213,12 +213,12 @@ Method_Request_end::Method_Request_end (Prime_Scheduler *scheduler) { } -Method_Request_end::~Method_Request_end (void) +Method_Request_end::~Method_Request_end () { } int -Method_Request_end::call (void) +Method_Request_end::call () { // Shut down the scheduler. this->scheduler_->shutdown (); @@ -241,7 +241,7 @@ Prime_Scheduler::Prime_Scheduler (const ACE_TCHAR *newname, // Destructor -Prime_Scheduler::~Prime_Scheduler (void) +Prime_Scheduler::~Prime_Scheduler () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Prime_Scheduler %s will be destroyed\n"), @@ -265,7 +265,7 @@ Prime_Scheduler::open (void *) // close int -Prime_Scheduler::shutdown (void) +Prime_Scheduler::shutdown () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Prime_Scheduler %s shutdown\n"), @@ -277,7 +277,7 @@ Prime_Scheduler::shutdown (void) // Service.. int -Prime_Scheduler::svc (void) +Prime_Scheduler::svc () { for (;;) { @@ -298,7 +298,7 @@ Prime_Scheduler::svc (void) } void -Prime_Scheduler::end (void) +Prime_Scheduler::end () { this->activation_queue_.enqueue (new Method_Request_end (this)); } @@ -316,13 +316,13 @@ Prime_Scheduler::work_i (u_long param, } const ACE_TCHAR * -Prime_Scheduler::name_i (void) +Prime_Scheduler::name_i () { return this->name_; } ACE_Future<const ACE_TCHAR *> -Prime_Scheduler::name (void) +Prime_Scheduler::name () { if (this->scheduler_) // Delegate to the Prime_Scheduler. diff --git a/ACE/tests/Future_Test.cpp b/ACE/tests/Future_Test.cpp index dc2b9e014f2..e25e573086b 100644 --- a/ACE/tests/Future_Test.cpp +++ b/ACE/tests/Future_Test.cpp @@ -69,24 +69,24 @@ public: //FUZZ: enable check_for_lack_ACE_OS /// Terminator. - virtual int shutdown (void); + virtual int shutdown (); /// Destructor. - virtual ~Prime_Scheduler (void); + virtual ~Prime_Scheduler (); // = These methods are part of the Active Object Proxy interface. ACE_Future<u_long> work (u_long param, int count = 1); - ACE_Future<const ACE_TCHAR*> name (void); - void end (void); + ACE_Future<const ACE_TCHAR*> name (); + void end (); protected: /// Runs the Prime_Scheduler's event loop, which dequeues /// <Method_Requests> and dispatches them. - virtual int svc (void); + virtual int svc (); // = These are the Servant methods that do the actual work. u_long work_i (u_long, int); - const ACE_TCHAR *name_i (void); + const ACE_TCHAR *name_i (); private: // = These are the <Prime_Scheduler> implementation details. @@ -107,10 +107,10 @@ public: u_long, int, ACE_Future<u_long> &); - virtual ~Method_Request_work (void); + virtual ~Method_Request_work (); /// This is the entry point into the Active Object method. - virtual int call (void); + virtual int call (); private: Prime_Scheduler *scheduler_; @@ -139,14 +139,14 @@ Method_Request_work::Method_Request_work (Prime_Scheduler *new_Prime_Scheduler, ACE_TEXT ("(%t) Method_Request_work created\n"))); } -Method_Request_work::~Method_Request_work (void) +Method_Request_work::~Method_Request_work () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Method_Request_work will be deleted.\n"))); } int -Method_Request_work::call (void) +Method_Request_work::call () { // Dispatch the Servant's operation and store the result into the // Future. @@ -165,10 +165,10 @@ class Method_Request_name : public ACE_Method_Request public: Method_Request_name (Prime_Scheduler *, ACE_Future<const ACE_TCHAR*> &); - virtual ~Method_Request_name (void); + virtual ~Method_Request_name (); /// This is the entry point into the Active Object method. - virtual int call (void); + virtual int call (); private: Prime_Scheduler *scheduler_; @@ -184,14 +184,14 @@ Method_Request_name::Method_Request_name (Prime_Scheduler *new_scheduler, ACE_TEXT ("(%t) Method_Request_name created\n"))); } -Method_Request_name::~Method_Request_name (void) +Method_Request_name::~Method_Request_name () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Method_Request_name will be deleted.\n"))); } int -Method_Request_name::call (void) +Method_Request_name::call () { // Dispatch the Servant's operation and store the result into the // Future. @@ -207,8 +207,8 @@ class Method_Request_end : public ACE_Method_Request { public: Method_Request_end (Prime_Scheduler *new_Prime_Scheduler); - virtual ~Method_Request_end (void); - virtual int call (void); + virtual ~Method_Request_end (); + virtual int call (); private: Prime_Scheduler *scheduler_; @@ -219,12 +219,12 @@ Method_Request_end::Method_Request_end (Prime_Scheduler *scheduler) { } -Method_Request_end::~Method_Request_end (void) +Method_Request_end::~Method_Request_end () { } int -Method_Request_end::call (void) +Method_Request_end::call () { // Shut down the scheduler. this->scheduler_->shutdown (); @@ -247,7 +247,7 @@ Prime_Scheduler::Prime_Scheduler (const ACE_TCHAR *newname, // Destructor -Prime_Scheduler::~Prime_Scheduler (void) +Prime_Scheduler::~Prime_Scheduler () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Prime_Scheduler %s will be destroyed\n"), @@ -271,7 +271,7 @@ Prime_Scheduler::open (void *) // close int -Prime_Scheduler::shutdown (void) +Prime_Scheduler::shutdown () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Prime_Scheduler %s shutdown\n"), @@ -283,7 +283,7 @@ Prime_Scheduler::shutdown (void) // Service.. int -Prime_Scheduler::svc (void) +Prime_Scheduler::svc () { for (;;) { @@ -304,7 +304,7 @@ Prime_Scheduler::svc (void) } void -Prime_Scheduler::end (void) +Prime_Scheduler::end () { this->activation_queue_.enqueue (new Method_Request_end (this)); } @@ -322,13 +322,13 @@ Prime_Scheduler::work_i (u_long param, } const ACE_TCHAR * -Prime_Scheduler::name_i (void) +Prime_Scheduler::name_i () { return this->name_; } ACE_Future<const ACE_TCHAR *> -Prime_Scheduler::name (void) +Prime_Scheduler::name () { if (this->scheduler_) // Delegate to the Prime_Scheduler. diff --git a/ACE/tests/Handle_Set_Test.cpp b/ACE/tests/Handle_Set_Test.cpp index 27ecc58ee65..8444d495d6a 100644 --- a/ACE/tests/Handle_Set_Test.cpp +++ b/ACE/tests/Handle_Set_Test.cpp @@ -91,7 +91,7 @@ static ACE_HANDLE handle_vector[] = #endif /* ACE_WIN64 */ static void -test_boundaries (void) +test_boundaries () { ACE_Handle_Set handle_set; ACE_Unbounded_Set<ACE_HANDLE> set; diff --git a/ACE/tests/Hash_Map_Manager_Test.cpp b/ACE/tests/Hash_Map_Manager_Test.cpp index ef9ffe69760..b6aa0dbd23c 100644 --- a/ACE/tests/Hash_Map_Manager_Test.cpp +++ b/ACE/tests/Hash_Map_Manager_Test.cpp @@ -178,7 +178,7 @@ int test_two_allocators () } static int -run_test (void) +run_test () { ace_test_allocator.dump (); diff --git a/ACE/tests/Hash_Multi_Map_Manager_Test.cpp b/ACE/tests/Hash_Multi_Map_Manager_Test.cpp index 8117f5763b7..6080e97fe3f 100644 --- a/ACE/tests/Hash_Multi_Map_Manager_Test.cpp +++ b/ACE/tests/Hash_Multi_Map_Manager_Test.cpp @@ -36,7 +36,7 @@ static const ACE_TCHAR *cold_colors[] = {ACE_TEXT ("blue"), ACE_TEXT ("cyan"), 0 static const ACE_TCHAR *neutral_colors[] = {ACE_TEXT ("green"), ACE_TEXT ("purple"), 0}; static int -run_test (void) +run_test () { HASH_STRING_MAP colors; diff --git a/ACE/tests/INET_Addr_Test.cpp b/ACE/tests/INET_Addr_Test.cpp index cfcc9dce132..ff1b5f8fe6e 100644 --- a/ACE/tests/INET_Addr_Test.cpp +++ b/ACE/tests/INET_Addr_Test.cpp @@ -51,7 +51,7 @@ static int check_type_consistency (const ACE_INET_Addr &addr) return 0; } -static bool test_tao_use (void) +static bool test_tao_use () { char host[256]; if (::gethostname (host, 255) != 0) @@ -85,7 +85,7 @@ static bool test_tao_use (void) return true; } -static bool test_port_assignment (void) +static bool test_port_assignment () { #if defined (ACE_HAS_IPV6) ACE_INET_Addr addr1 (static_cast<unsigned short> (0), ACE_IPV6_ANY, AF_INET6); @@ -110,7 +110,7 @@ static bool test_port_assignment (void) return true; } -static bool test_multiple (void) +static bool test_multiple () { bool success = true; diff --git a/ACE/tests/Integer_Truncate_Test.cpp b/ACE/tests/Integer_Truncate_Test.cpp index 61e5dc9d32e..4d11a38f3da 100644 --- a/ACE/tests/Integer_Truncate_Test.cpp +++ b/ACE/tests/Integer_Truncate_Test.cpp @@ -21,7 +21,7 @@ using namespace ACE_Utils; // ---------------------------------------------------- bool -sizeof_from_lt_sizeof_to (void) +sizeof_from_lt_sizeof_to () { ACE_DEBUG ((LM_INFO, ACE_TEXT ("Running sizeof(FROM) < sizeof(TO) test\n"))); @@ -120,7 +120,7 @@ sizeof_from_lt_sizeof_to (void) } bool -sizeof_from_eq_sizeof_to (void) +sizeof_from_eq_sizeof_to () { ACE_DEBUG ((LM_INFO, ACE_TEXT ("Running sizeof(FROM) == sizeof(TO) test\n"))); @@ -221,7 +221,7 @@ sizeof_from_eq_sizeof_to (void) } bool -sizeof_from_gt_sizeof_to (void) +sizeof_from_gt_sizeof_to () { ACE_DEBUG ((LM_INFO, ACE_TEXT ("Running sizeof(FROM) > sizeof(TO) test\n"))); @@ -332,7 +332,7 @@ template <typename T> struct Caller : public std::unary_function<T, void> { /// Constructor - Caller (void) : success (true) {} + Caller () : success (true) {} /// Function call operator overload. void operator() (T f) diff --git a/ACE/tests/Intrusive_Auto_Ptr_Test.cpp b/ACE/tests/Intrusive_Auto_Ptr_Test.cpp index fd6e5bc72a3..68e665d0e13 100644 --- a/ACE/tests/Intrusive_Auto_Ptr_Test.cpp +++ b/ACE/tests/Intrusive_Auto_Ptr_Test.cpp @@ -36,7 +36,7 @@ public: return this->ref == howmany; } - static bool was_released (void) + static bool was_released () { return released; } diff --git a/ACE/tests/Lazy_Map_Manager_Test.cpp b/ACE/tests/Lazy_Map_Manager_Test.cpp index 7af3f0b0675..cfdb5a8b31b 100644 --- a/ACE/tests/Lazy_Map_Manager_Test.cpp +++ b/ACE/tests/Lazy_Map_Manager_Test.cpp @@ -64,7 +64,7 @@ display_map (LAZY_MAP &map) // Test for map manager. void -map_test (void) +map_test () { // Map of size 3. LAZY_MAP map (3); @@ -209,7 +209,7 @@ display_map (ACTIVE_MAP &map) // Test for active map manager. void -active_map_test (void) +active_map_test () { // Map of size 3. ACTIVE_MAP map (3); diff --git a/ACE/tests/Log_Msg_Backend_Test.cpp b/ACE/tests/Log_Msg_Backend_Test.cpp index d4579da6044..0b7bf970113 100644 --- a/ACE/tests/Log_Msg_Backend_Test.cpp +++ b/ACE/tests/Log_Msg_Backend_Test.cpp @@ -27,17 +27,17 @@ public: ///FUZZ: enable check_for_lack_ACE_OS virtual int open (const ACE_TCHAR *logger_key); - virtual int reset (void); + virtual int reset (); //FUZZ: disable check_for_lack_ACE_OS ///FUZZ: enable check_for_lack_ACE_OS - virtual int close (void); + virtual int close (); virtual ssize_t log (ACE_Log_Record &log_record); // Test probes to see if things worked as specified. - bool hooks_ok (void) const; - unsigned int log_count (void) const { return this->log_count_; } + bool hooks_ok () const; + unsigned int log_count () const { return this->log_count_; } private: bool reset_; @@ -54,14 +54,14 @@ Backend::open (const ACE_TCHAR *) } int -Backend::reset (void) +Backend::reset () { this->reset_ = true; return 0; } int -Backend::close (void) +Backend::close () { return 0; } @@ -75,7 +75,7 @@ Backend::log (ACE_Log_Record &) // Test probes to see if things worked as specified. bool -Backend::hooks_ok (void) const +Backend::hooks_ok () const { // Close should not have been called yet. const ACE_TCHAR *yes = ACE_TEXT ("yes"); diff --git a/ACE/tests/Log_Msg_Test.cpp b/ACE/tests/Log_Msg_Test.cpp index 3bc006c0113..aa18c7180d7 100644 --- a/ACE/tests/Log_Msg_Test.cpp +++ b/ACE/tests/Log_Msg_Test.cpp @@ -32,14 +32,14 @@ #include "ace/Thread.h" static void -cleanup (void) +cleanup () { ACE_DEBUG ((LM_INFO, ACE_TEXT ("cleanup hook (%P)!\n"))); } static void -cause_error (void) +cause_error () { errno = EWOULDBLOCK; ACE_ERROR ((LM_DEBUG, @@ -138,7 +138,7 @@ Logger::log (ACE_Log_Record &log_record) } static void -test_callbacks (void) +test_callbacks () { // This message should show up in stderr. ACE_DEBUG ((LM_DEBUG, @@ -459,7 +459,7 @@ test_acelib_category() } static int -test_ostream (void) +test_ostream () { // This message should show up in the log file. ACE_DEBUG ((LM_DEBUG, @@ -704,7 +704,7 @@ Log_Spec_Verify::log (ACE_Log_Record &log_record) } int -Log_Spec_Verify::result (void) +Log_Spec_Verify::result () { if (this->fail_ == 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("All logging specifier tests passed.\n"))); @@ -722,7 +722,7 @@ Log_Spec_Verify::result (void) } static int -test_format_specs (void) +test_format_specs () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("l1:%l\n"))); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("l2:%5l\n"))); diff --git a/ACE/tests/Logging_Strategy_Test.cpp b/ACE/tests/Logging_Strategy_Test.cpp index 700d697dbf2..7cf9d41bc17 100644 --- a/ACE/tests/Logging_Strategy_Test.cpp +++ b/ACE/tests/Logging_Strategy_Test.cpp @@ -95,7 +95,7 @@ run_reactor (void *) // Initiate the cycle of messages. static -void print_till_death (void) +void print_till_death () { ACE_DEBUG ((LM_DEBUG, "\n-> start generating messages...\n")); @@ -125,7 +125,7 @@ void print_till_death (void) // Count the generated files. static void -count_files (void) +count_files () { int i = 0; int error = 0; @@ -217,7 +217,7 @@ get_statistics (ACE_TCHAR *f_name) // analyse the file order static void -order (void) +order () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n-> start testing order...\n"))); @@ -283,7 +283,7 @@ order (void) // remove log_files static void -remove_files (void) +remove_files () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("-> removing existent files...\n"))); diff --git a/ACE/tests/MEM_Stream_Test.cpp b/ACE/tests/MEM_Stream_Test.cpp index 0819d766df4..b41456d4df5 100644 --- a/ACE/tests/MEM_Stream_Test.cpp +++ b/ACE/tests/MEM_Stream_Test.cpp @@ -151,7 +151,7 @@ Echo_Handler::handle_close (ACE_HANDLE, } int -Echo_Handler::svc (void) +Echo_Handler::svc () { while (this->handle_input (this->get_handle ()) >= 0) continue; @@ -223,7 +223,7 @@ connect_client (void *arg) #endif void -create_reactor (void) +create_reactor () { ACE_Reactor_Impl *impl = 0; diff --git a/ACE/tests/MM_Shared_Memory_Test.cpp b/ACE/tests/MM_Shared_Memory_Test.cpp index 74b4f1ec4f5..a291d1fa321 100644 --- a/ACE/tests/MM_Shared_Memory_Test.cpp +++ b/ACE/tests/MM_Shared_Memory_Test.cpp @@ -136,7 +136,7 @@ parent (void * = 0) } static int -spawn (void) +spawn () { // Create the synchronizer before spawning the child process/thread, // to avoid race condition between the creation in the parent and diff --git a/ACE/tests/MT_NonBlocking_Connect_Test.cpp b/ACE/tests/MT_NonBlocking_Connect_Test.cpp index ef8a018dd66..6d9537c8e21 100644 --- a/ACE/tests/MT_NonBlocking_Connect_Test.cpp +++ b/ACE/tests/MT_NonBlocking_Connect_Test.cpp @@ -56,7 +56,7 @@ static const ACE_TCHAR* hosts[] = { class Svc_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> { public: - Svc_Handler (void) + Svc_Handler () { ACE_TEST_ASSERT (0); } @@ -144,7 +144,7 @@ public: &this->cns_, &this->cts_, &this->cys_); } - int svc (void); + int svc (); private: ACE_Reactor &reactor_; @@ -159,7 +159,7 @@ private: }; int -Connect_Thread::svc (void) +Connect_Thread::svc () { size_t const nr_names = sizeof hosts / sizeof (char *); ACE_INET_Addr *addresses = new ACE_INET_Addr[nr_names]; diff --git a/ACE/tests/MT_Reactor_Timer_Test.cpp b/ACE/tests/MT_Reactor_Timer_Test.cpp index d37f4a01e92..85cedf6f5c4 100644 --- a/ACE/tests/MT_Reactor_Timer_Test.cpp +++ b/ACE/tests/MT_Reactor_Timer_Test.cpp @@ -34,7 +34,7 @@ // destructor for Time_Handler insures that everything happened // correctly. -Time_Handler::Time_Handler (void) +Time_Handler::Time_Handler () { for (int i = 0; i < Time_Handler::TIMER_SLOTS; @@ -49,7 +49,7 @@ Time_Handler::Time_Handler (void) // starts. void -Time_Handler::setup (void) +Time_Handler::setup () { ACE_Reactor *r = ACE_Reactor::instance (); @@ -66,7 +66,7 @@ Time_Handler::setup (void) } int -Time_Handler::verify_results (void) +Time_Handler::verify_results () { ACE_TEST_ASSERT (this->timer_id_[0] == Time_Handler::TIMER_FIRED); ACE_TEST_ASSERT (this->timer_id_[1] == Time_Handler::TIMER_FIRED); @@ -83,7 +83,7 @@ Time_Handler::verify_results (void) } int -Time_Handler::svc (void) +Time_Handler::svc () { ACE_Reactor *r = ACE_Reactor::instance (); @@ -145,7 +145,7 @@ Time_Handler::handle_timeout (const ACE_Time_Value &tv, #endif /* ACE_HAS_THREADS */ -Dispatch_Count_Handler::Dispatch_Count_Handler (void) +Dispatch_Count_Handler::Dispatch_Count_Handler () { ACE_Reactor *r = ACE_Reactor::instance (); @@ -245,7 +245,7 @@ Dispatch_Count_Handler::handle_timeout (const ACE_Time_Value &tv, } int -Dispatch_Count_Handler::verify_results (void) +Dispatch_Count_Handler::verify_results () { int result = 0; diff --git a/ACE/tests/MT_Reactor_Upcall_Test.cpp b/ACE/tests/MT_Reactor_Upcall_Test.cpp index 65aaa050b78..29bcb871186 100644 --- a/ACE/tests/MT_Reactor_Upcall_Test.cpp +++ b/ACE/tests/MT_Reactor_Upcall_Test.cpp @@ -42,7 +42,7 @@ public: lock.acquire (); } - ~Guard (void) + ~Guard () { if (lock_upcall) this->lock_.release (); @@ -178,7 +178,7 @@ class Event_Loop_Task : public ACE_Task_Base { public: Event_Loop_Task (ACE_Reactor &reactor); - int svc (void); + int svc (); private: ACE_Reactor &reactor_; @@ -190,7 +190,7 @@ Event_Loop_Task::Event_Loop_Task (ACE_Reactor &reactor) } int -Event_Loop_Task::svc (void) +Event_Loop_Task::svc () { return this->reactor_.run_reactor_event_loop (); } diff --git a/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp b/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp index 8a25fcf5b10..762a67959c5 100644 --- a/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp +++ b/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp @@ -139,22 +139,22 @@ class Pipe { public: - Pipe (void); + Pipe (); //FUZZ: disable check_for_lack_ACE_OS ///FUZZ: enable check_for_lack_ACE_OS - int open (void); + int open (); - ACE_HANDLE read_handle (void) const; + ACE_HANDLE read_handle () const; - ACE_HANDLE write_handle (void) const; + ACE_HANDLE write_handle () const; private: ACE_HANDLE handles_[2]; }; int -Pipe::open (void) +Pipe::open () { ACE_INET_Addr my_addr; ACE_SOCK_Acceptor acceptor; @@ -200,20 +200,20 @@ Pipe::open (void) return 0; } -Pipe::Pipe (void) +Pipe::Pipe () { this->handles_[0] = ACE_INVALID_HANDLE; this->handles_[1] = ACE_INVALID_HANDLE; } ACE_HANDLE -Pipe::read_handle (void) const +Pipe::read_handle () const { return this->handles_[0]; } ACE_HANDLE -Pipe::write_handle (void) const +Pipe::write_handle () const { return this->handles_[1]; } @@ -230,15 +230,15 @@ public: Sender (ACE_HANDLE handle, Connection_Cache &connection_cache); - ~Sender (void); + ~Sender (); int handle_input (ACE_HANDLE); - ssize_t send_message (void); + ssize_t send_message (); //FUZZ: disable check_for_lack_ACE_OS ///FUZZ: enable check_for_lack_ACE_OS - void close (void); + void close (); ACE_HANDLE handle_; @@ -250,21 +250,21 @@ class Connection_Cache { public: - Connection_Cache (void); + Connection_Cache (); - ~Connection_Cache (void); + ~Connection_Cache (); void add_connection (Sender *sender); void remove_connection (Sender *sender); - Sender *acquire_connection (void); + Sender *acquire_connection (); void release_connection (Sender *sender); int find (Sender *sender); - ACE_SYNCH_MUTEX &lock (void); + ACE_SYNCH_MUTEX &lock (); enum State { @@ -299,7 +299,7 @@ Sender::Sender (ACE_HANDLE handle, this->reference_count_.load ())); } -Sender::~Sender (void) +Sender::~Sender () { if (debug) ACE_DEBUG ((LM_DEBUG, @@ -334,7 +334,7 @@ Sender::handle_input (ACE_HANDLE) } void -Sender::close (void) +Sender::close () { // Remove socket from Reactor (may fail if another thread has already // removed the handle from the Reactor). @@ -348,7 +348,7 @@ Sender::close (void) } ssize_t -Sender::send_message (void) +Sender::send_message () { ACE_Time_Value timeout (0, close_timeout * 1000); @@ -365,7 +365,7 @@ public: Event_Loop_Thread (ACE_Thread_Manager &thread_manager, ACE_Reactor &reactor); - int svc (void); + int svc (); ACE_Reactor &reactor_; @@ -379,9 +379,9 @@ public: ACE_HANDLE handle, int nested_upcalls); - ~Receiver (void); + ~Receiver (); - int svc (void); + int svc (); //FUZZ: disable check_for_lack_ACE_OS ///FUZZ: enable check_for_lack_ACE_OS @@ -389,7 +389,7 @@ public: int handle_input (ACE_HANDLE); - int resume_handler (void); + int resume_handler (); ACE_HANDLE handle_; @@ -420,7 +420,7 @@ Receiver::Receiver (ACE_Thread_Manager &thread_manager, this->reference_count_.load ())); } -Receiver::~Receiver (void) +Receiver::~Receiver () { if (debug) ACE_DEBUG ((LM_DEBUG, @@ -432,7 +432,7 @@ Receiver::~Receiver (void) } int -Receiver::svc (void) +Receiver::svc () { // // Continuously receive messages from the Sender. On error, exit @@ -522,7 +522,7 @@ Receiver::handle_input (ACE_HANDLE handle) } int -Receiver::resume_handler (void) +Receiver::resume_handler () { /// The application takes responsibility of resuming the handler. return ACE_APPLICATION_RESUMES_HANDLER; @@ -636,7 +636,7 @@ Connector::connect (ACE_HANDLE &client_handle, return 0; } -Connection_Cache::Connection_Cache (void) +Connection_Cache::Connection_Cache () { // Initialize the connection cache. this->entries_ = @@ -698,7 +698,7 @@ Connection_Cache::remove_connection (Sender *sender) } Sender * -Connection_Cache::acquire_connection (void) +Connection_Cache::acquire_connection () { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0); @@ -741,12 +741,12 @@ Connection_Cache::release_connection (Sender *sender) } ACE_SYNCH_MUTEX & -Connection_Cache::lock (void) +Connection_Cache::lock () { return this->lock_; } -Connection_Cache::~Connection_Cache (void) +Connection_Cache::~Connection_Cache () { for (int i = 0; i < number_of_connections; ++i) { @@ -769,9 +769,9 @@ public: int run_receiver_thread, int nested_upcalls); - int svc (void); + int svc (); - Sender *create_connection (void); + Sender *create_connection (); Connection_Cache &connection_cache_; @@ -808,7 +808,7 @@ Invocation_Thread::Invocation_Thread (ACE_Thread_Manager &thread_manager, } Sender * -Invocation_Thread::create_connection (void) +Invocation_Thread::create_connection () { int result = 0; @@ -867,7 +867,7 @@ Invocation_Thread::create_connection (void) } int -Invocation_Thread::svc (void) +Invocation_Thread::svc () { int connection_counter = 0; ACE_DEBUG ((LM_DEBUG, @@ -977,7 +977,7 @@ public: int make_invocations, int run_receiver_thread); - int svc (void); + int svc (); ACE_Auto_Event &new_connection_event_; @@ -1003,7 +1003,7 @@ Close_Socket_Thread::Close_Socket_Thread (ACE_Thread_Manager &thread_manager, } int -Close_Socket_Thread::svc (void) +Close_Socket_Thread::svc () { unsigned int seed = (unsigned int) ACE_OS::time (); ACE_Time_Value timeout (0, close_timeout * 1000); @@ -1083,7 +1083,7 @@ Event_Loop_Thread::Event_Loop_Thread (ACE_Thread_Manager &thread_manager, } int -Event_Loop_Thread::svc (void) +Event_Loop_Thread::svc () { // Simply run the event loop. this->reactor_.owner (ACE_Thread::self ()); @@ -1110,7 +1110,7 @@ public: ACE_Reactor &reactor, Connection_Cache &connection_cache); - int svc (void); + int svc (); ACE_Reactor &reactor_; @@ -1128,7 +1128,7 @@ Purger_Thread::Purger_Thread (ACE_Thread_Manager &thread_manager, } int -Purger_Thread::svc (void) +Purger_Thread::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("(%t) Purger_Thread::svc commencing\n"))); diff --git a/ACE/tests/MT_Reference_Counted_Notify_Test.cpp b/ACE/tests/MT_Reference_Counted_Notify_Test.cpp index 609e78681ae..5cce754c683 100644 --- a/ACE/tests/MT_Reference_Counted_Notify_Test.cpp +++ b/ACE/tests/MT_Reference_Counted_Notify_Test.cpp @@ -38,19 +38,19 @@ class Reference_Counted_Event_Handler : public ACE_Event_Handler { public: - Reference_Counted_Event_Handler (void); + Reference_Counted_Event_Handler (); - ~Reference_Counted_Event_Handler (void); + ~Reference_Counted_Event_Handler (); int handle_input (ACE_HANDLE); - ACE_Event_Handler::Reference_Count add_reference (void); + ACE_Event_Handler::Reference_Count add_reference (); - ACE_Event_Handler::Reference_Count remove_reference (void); + ACE_Event_Handler::Reference_Count remove_reference (); }; -Reference_Counted_Event_Handler::Reference_Counted_Event_Handler (void) +Reference_Counted_Event_Handler::Reference_Counted_Event_Handler () { this->reference_counting_policy ().value (ACE_Event_Handler::Reference_Counting_Policy::ENABLED); @@ -63,7 +63,7 @@ Reference_Counted_Event_Handler::Reference_Counted_Event_Handler (void) this->reference_count_.load ())); } -Reference_Counted_Event_Handler::~Reference_Counted_Event_Handler (void) +Reference_Counted_Event_Handler::~Reference_Counted_Event_Handler () { if (debug) ACE_DEBUG @@ -101,7 +101,7 @@ Reference_Counted_Event_Handler::handle_input (ACE_HANDLE) } ACE_Event_Handler::Reference_Count -Reference_Counted_Event_Handler::add_reference (void) +Reference_Counted_Event_Handler::add_reference () { ACE_Event_Handler::Reference_Count reference_count = this->ACE_Event_Handler::add_reference (); @@ -115,7 +115,7 @@ Reference_Counted_Event_Handler::add_reference (void) } ACE_Event_Handler::Reference_Count -Reference_Counted_Event_Handler::remove_reference (void) +Reference_Counted_Event_Handler::remove_reference () { ACE_Event_Handler::Reference_Count reference_count = this->ACE_Event_Handler::remove_reference (); @@ -134,7 +134,7 @@ public: Simple_Event_Handler (int notifies); - ~Simple_Event_Handler (void); + ~Simple_Event_Handler (); int handle_input (ACE_HANDLE); @@ -148,7 +148,7 @@ Simple_Event_Handler::Simple_Event_Handler (int notifies) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Simple_Event_Handler()\n"))); } -Simple_Event_Handler::~Simple_Event_Handler (void) +Simple_Event_Handler::~Simple_Event_Handler () { if (debug) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("~Simple_Event_Handler()\n"))); @@ -177,7 +177,7 @@ public: ACE_Reactor &reactor, int extra_iterations_needed); - int svc (void); + int svc (); ACE_Reactor &reactor_; @@ -194,7 +194,7 @@ Event_Loop_Thread::Event_Loop_Thread (ACE_Thread_Manager &thread_manager, } int -Event_Loop_Thread::svc (void) +Event_Loop_Thread::svc () { int counter = 0; diff --git a/ACE/tests/Malloc_Test.cpp b/ACE/tests/Malloc_Test.cpp index 02b6854d416..7f3eace9889 100644 --- a/ACE/tests/Malloc_Test.cpp +++ b/ACE/tests/Malloc_Test.cpp @@ -279,7 +279,7 @@ parent (Test_Data *data) } static int -child (void) +child () { void *bar = 0; // Perform "busy waiting" here until the parent stores data under a diff --git a/ACE/tests/Manual_Event_Test.cpp b/ACE/tests/Manual_Event_Test.cpp index 0653aa3db17..d8469469dfc 100644 --- a/ACE/tests/Manual_Event_Test.cpp +++ b/ACE/tests/Manual_Event_Test.cpp @@ -39,7 +39,7 @@ static ACE_Atomic_Op<ACE_SYNCH_MUTEX, long> n_awoken2; // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("usage: %n [-w n_workers] [-n iteration_count]\n"))); diff --git a/ACE/tests/Message_Block_Test.cpp b/ACE/tests/Message_Block_Test.cpp index 02e9d506805..32a3b43b239 100644 --- a/ACE/tests/Message_Block_Test.cpp +++ b/ACE/tests/Message_Block_Test.cpp @@ -58,11 +58,11 @@ class Worker_Task : public ACE_Task<ACE_MT_SYNCH> { public: /// Activate the task. - Worker_Task (void); + Worker_Task (); /// Iterate <n_iterations> time printing off a message and "waiting" /// for all other threads to complete this iteration. - virtual int svc (void); + virtual int svc (); /// Allows the producer to pass messages to the <Message_Block>. virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0); @@ -93,7 +93,7 @@ Worker_Task::put (ACE_Message_Block *mb, ACE_Time_Value *tv) // other threads to complete this iteration. int -Worker_Task::svc (void) +Worker_Task::svc () { // The <ACE_Task::svc_run()> method automatically adds us to the // process-wide <ACE_Thread_Manager> when the thread begins. @@ -238,7 +238,7 @@ Worker_Task::svc (void) return 0; } -Worker_Task::Worker_Task (void) +Worker_Task::Worker_Task () { // Make us an Active Object. if (this->activate (THR_NEW_LWP) == -1) diff --git a/ACE/tests/Message_Queue_Notifications_Test.cpp b/ACE/tests/Message_Queue_Notifications_Test.cpp index 2040c18c301..2b677fc85c7 100644 --- a/ACE/tests/Message_Queue_Notifications_Test.cpp +++ b/ACE/tests/Message_Queue_Notifications_Test.cpp @@ -67,8 +67,8 @@ public: virtual int handle_exception (ACE_HANDLE fd = ACE_INVALID_HANDLE); private: - int process_message (void); - void make_message (void); + int process_message (); + void make_message (); ACE_Reactor_Notification_Strategy notification_strategy_; }; @@ -82,15 +82,15 @@ private: class Watermark_Test : public ACE_Task<ACE_SYNCH> { public: - Watermark_Test (void); + Watermark_Test (); - virtual int svc (void); + virtual int svc (); - int consumer (void); - int producer (void); + int consumer (); + int producer (); int put_message (ACE_Time_Value* timeout = 0); - int get_message (void); - void print_producer_debug_message (void); + int get_message (); + void print_producer_debug_message (); private: const size_t len_; @@ -152,7 +152,7 @@ Message_Handler::handle_exception (ACE_HANDLE fd) } int -Message_Handler::process_message (void) +Message_Handler::process_message () { ACE_Message_Block *mb = 0; @@ -175,7 +175,7 @@ Message_Handler::process_message (void) } void -Message_Handler::make_message (void) +Message_Handler::make_message () { if (--iterations > 0) { @@ -189,7 +189,7 @@ Message_Handler::make_message (void) } } -Watermark_Test::Watermark_Test (void) +Watermark_Test::Watermark_Test () : len_ (ACE_OS::strlen (default_message) + 1), hwm_ (this->len_ * default_high_water_mark), lwm_ (this->len_ * default_low_water_mark), @@ -206,7 +206,7 @@ Watermark_Test::Watermark_Test (void) } int -Watermark_Test::producer (void) +Watermark_Test::producer () { int i = watermark_iterations; @@ -244,7 +244,7 @@ Watermark_Test::producer (void) } int -Watermark_Test::consumer (void) +Watermark_Test::consumer () { ACE_MT (this->mq_full_.wait ()); @@ -262,7 +262,7 @@ Watermark_Test::consumer (void) } int -Watermark_Test::get_message (void) +Watermark_Test::get_message () { ACE_Message_Block *mb = 0; @@ -298,7 +298,7 @@ Watermark_Test::put_message (ACE_Time_Value *timeout) } void -Watermark_Test::print_producer_debug_message (void) +Watermark_Test::print_producer_debug_message () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Producer: message size = %3d, ") @@ -308,7 +308,7 @@ Watermark_Test::print_producer_debug_message (void) } int -Watermark_Test::svc (void) +Watermark_Test::svc () { // this->role_ is an Atomic_Op object. int role = this->role_++; diff --git a/ACE/tests/Message_Queue_Test.cpp b/ACE/tests/Message_Queue_Test.cpp index 391d73f284a..9a32ac909f3 100644 --- a/ACE/tests/Message_Queue_Test.cpp +++ b/ACE/tests/Message_Queue_Test.cpp @@ -77,7 +77,7 @@ struct Queue_Wrapper ACE_Message_Block **send_block_; // Pointer to messages blocks for sender to send to reciever. - Queue_Wrapper (void) + Queue_Wrapper () : q_ (0), send_block_ (0) { } @@ -91,7 +91,7 @@ class Counting_Test_Producer : public ACE_Task<ACE_MT_SYNCH> public: Counting_Test_Producer (ACE_Message_Queue<ACE_MT_SYNCH> *queue) : ACE_Task<ACE_MT_SYNCH> (0, queue), sequence_ (0), produced_ (0) {} - virtual int svc (void); + virtual int svc (); ACE_Atomic_Op<ACE_Thread_Mutex, long> sequence_; ACE_Atomic_Op<ACE_Thread_Mutex, long> produced_; @@ -102,13 +102,13 @@ class Counting_Test_Consumer : public ACE_Task<ACE_MT_SYNCH> public: Counting_Test_Consumer (ACE_Message_Queue<ACE_MT_SYNCH> *queue) : ACE_Task<ACE_MT_SYNCH> (0, queue), consumed_ (0) {} - virtual int svc (void); + virtual int svc (); ACE_Atomic_Op<ACE_Thread_Mutex, long> consumed_; }; int -Counting_Test_Producer::svc (void) +Counting_Test_Producer::svc () { // Going to produce a lot of blocks. Since we don't necessarily want them // all consumed, there's no arrangement with the consumer to be sure that @@ -200,7 +200,7 @@ Counting_Test_Producer::svc (void) } int -Counting_Test_Consumer::svc (void) +Counting_Test_Consumer::svc () { // Consume lots of blocks and release them. To mimic a thread with work // to do, put a small random delay between dequeuing the blocks. Consume @@ -252,7 +252,7 @@ Counting_Test_Consumer::svc (void) } static int -counting_test (void) +counting_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting counting test\n"))); @@ -314,7 +314,7 @@ counting_test (void) #endif /* ACE_HAS_THREADS */ static int -iterator_test (void) +iterator_test () { const int ITERATIONS = 5; ACE_TCHAR buffer[ITERATIONS][BUFSIZ]; @@ -407,7 +407,7 @@ iterator_test (void) #if defined (ACE_HAS_THREADS) static int -chained_block_test (void) +chained_block_test () { QUEUE q; @@ -768,7 +768,7 @@ performance_test (int queue_type = 0) // Ensure that the timedout dequeue_head() sets errno code properly. static int -timeout_test (void) +timeout_test () { SYNCH_QUEUE mq; int status = 0; @@ -814,7 +814,7 @@ timeout_test (void) // thorough check... static int -prio_test (void) +prio_test () { const char S1[] = "first"; const char S2[] = "second"; @@ -848,7 +848,7 @@ prio_test (void) } static int -close_test (void) +close_test () { int status = 0; diff --git a/ACE/tests/Message_Queue_Test_Ex.cpp b/ACE/tests/Message_Queue_Test_Ex.cpp index ace1a10d227..c14496c13cf 100644 --- a/ACE/tests/Message_Queue_Test_Ex.cpp +++ b/ACE/tests/Message_Queue_Test_Ex.cpp @@ -78,7 +78,7 @@ struct Queue_Wrapper User_Class **send_block_; /// Default constructor. - Queue_Wrapper (void) + Queue_Wrapper () : q_ (0), send_block_ (0) { } @@ -169,7 +169,7 @@ struct Receive_Messages { } - int create (void) + int create () { ACE_NEW_RETURN (this->receive_block_, User_Class *[this->number_of_messages_], @@ -187,7 +187,7 @@ struct Receive_Messages }; static int -single_thread_performance_test (void) +single_thread_performance_test () { const char test_message[] = "ACE_Message_Queue_Ex Test Message"; @@ -253,7 +253,7 @@ single_thread_performance_test (void) } int -MQ_Ex_N_Tester::single_thread_performance_test (void) +MQ_Ex_N_Tester::single_thread_performance_test () { // Create the messages. Allocate off the heap in case messages is // large relative to the amount of stack space available. @@ -268,7 +268,7 @@ MQ_Ex_N_Tester::single_thread_performance_test (void) } int -MQ_Ex_N_Tester::test_enqueue_tail (void) +MQ_Ex_N_Tester::test_enqueue_tail () { const ACE_TCHAR *message = ACE_TEXT ("ACE_Message_Queue_Ex_N<ACE_NULL_SYNCH>, test_enqueue_tail"); @@ -320,7 +320,7 @@ MQ_Ex_N_Tester::test_enqueue_tail (void) } int -MQ_Ex_N_Tester::test_enqueue_head (void) +MQ_Ex_N_Tester::test_enqueue_head () { const ACE_TCHAR *message = ACE_TEXT ("ACE_Message_Queue_Ex_N<ACE_NULL_SYNCH>, test_enqueue_head"); @@ -422,7 +422,7 @@ sender (void *arg) } static int -performance_test (void) +performance_test () { Queue_Wrapper queue_wrapper; const ACE_TCHAR *message = @@ -480,7 +480,7 @@ performance_test (void) } int -MQ_Ex_N_Tester::performance_test (void) +MQ_Ex_N_Tester::performance_test () { const ACE_TCHAR *message = ACE_TEXT ("ACE_Message_Queue_Ex_N<ACE_SYNCH>"); diff --git a/ACE/tests/Monotonic_Manual_Event_Test.cpp b/ACE/tests/Monotonic_Manual_Event_Test.cpp index f38def4bafb..c0c71a048ea 100644 --- a/ACE/tests/Monotonic_Manual_Event_Test.cpp +++ b/ACE/tests/Monotonic_Manual_Event_Test.cpp @@ -57,7 +57,7 @@ static long n_awoken2; // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("usage: %n [-w n_workers] [-s]\n"))); diff --git a/ACE/tests/Monotonic_Message_Queue_Test.cpp b/ACE/tests/Monotonic_Message_Queue_Test.cpp index bbe1f5f594f..3d1232da5a2 100644 --- a/ACE/tests/Monotonic_Message_Queue_Test.cpp +++ b/ACE/tests/Monotonic_Message_Queue_Test.cpp @@ -43,7 +43,7 @@ typedef ACE_Message_Queue<ACE_MT_SYNCH, ACE_Monotonic_Time_Policy> SYNCH_QUEUE; // Create timer queue with hr support ACE_Timer_Queue * -create_timer_queue (void) +create_timer_queue () { ACE_Timer_Queue * tmq = 0; @@ -63,15 +63,15 @@ public: virtual ~MyTask () { stop (); } - virtual int svc (void); + virtual int svc (); int start (int num_threads); - int stop (void); + int stop (); ACE_Reactor* get_reactor (); - int create_reactor (void); + int create_reactor (); private: - int delete_reactor (void); + int delete_reactor (); ACE_SYNCH_RECURSIVE_MUTEX lock_; ACE_Reactor *my_reactor_; @@ -85,7 +85,7 @@ MyTask::get_reactor () } int -MyTask::create_reactor (void) +MyTask::create_reactor () { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, monitor, @@ -113,7 +113,7 @@ MyTask::create_reactor (void) } int -MyTask::delete_reactor (void) +MyTask::delete_reactor () { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, monitor, @@ -145,7 +145,7 @@ MyTask::start (int num_threads) int -MyTask::stop (void) +MyTask::stop () { if (this->my_reactor_ != 0) { @@ -169,7 +169,7 @@ MyTask::stop (void) } int -MyTask::svc (void) +MyTask::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%P|%t) MyTask started\n"))); @@ -246,7 +246,7 @@ void set_system_time(const ACE_Time_Value& tv) // Ensure that the timedout dequeue_head() keeps working in case of timeshift when using monotonic timer. static bool -timeout_test (void) +timeout_test () { bool status = true; SYNCH_QUEUE mq; diff --git a/ACE/tests/Monotonic_Task_Test.cpp b/ACE/tests/Monotonic_Task_Test.cpp index 755207ab16a..b64e467b1a0 100644 --- a/ACE/tests/Monotonic_Task_Test.cpp +++ b/ACE/tests/Monotonic_Task_Test.cpp @@ -82,7 +82,7 @@ public: virtual ~MyTask () { stop (); } - virtual int svc (void); + virtual int svc (); int start (); @@ -179,7 +179,7 @@ MyTask::stop () } int -MyTask::svc (void) +MyTask::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%P|%t) MyTask::svc started\n"))); diff --git a/ACE/tests/Multicast_Test.cpp b/ACE/tests/Multicast_Test.cpp index 12cbabc8cf5..5ff1243031a 100644 --- a/ACE/tests/Multicast_Test.cpp +++ b/ACE/tests/Multicast_Test.cpp @@ -88,7 +88,7 @@ public: BOTH = PRODUCER | CONSUMER }; - MCT_Config (void) + MCT_Config () : group_start_ (MCT_START_PORT, MCT_START_GROUP), groups_ (0), debug_ (0), @@ -103,26 +103,26 @@ public: else this->groups_ = ACE_MIN (IP_MAX_MEMBERSHIPS, MCT_GROUPS); } - ~MCT_Config (void) + ~MCT_Config () {} //FUZZ: disable check_for_lack_ACE_OS int open (int argc, ACE_TCHAR *argv[]); //FUZZ: enable check_for_lack_ACE_OS - int debug (void) const { return this->debug_;} - void dump (void) const; - int groups (void) const { return this->groups_;} - const ACE_INET_Addr group_start (void) const { return this->group_start_;} - u_long role (void) const { return this->role_;} - int iterations (void) const { return this->iterations_;} - int ttl (void) const { return this->ttl_;} + int debug () const { return this->debug_;} + void dump () const; + int groups () const { return this->groups_;} + const ACE_INET_Addr group_start () const { return this->group_start_;} + u_long role () const { return this->role_;} + int iterations () const { return this->iterations_;} + int ttl () const { return this->ttl_;} //FUZZ: disable check_for_lack_ACE_OS - int wait (void) const { return this->wait_;} + int wait () const { return this->wait_;} //FUZZ: enable check_for_lack_ACE_OS - ACE_SOCK_Dgram_Mcast::options options (void) const + ACE_SOCK_Dgram_Mcast::options options () const { return static_cast<ACE_SOCK_Dgram_Mcast::options> (this->sdm_opts_); } @@ -395,7 +395,7 @@ MCT_Config::open (int argc, ACE_TCHAR *argv[]) } void -MCT_Config::dump (void) const +MCT_Config::dump () const { ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" Dumping MCT_Config\n"))); @@ -442,7 +442,7 @@ class MCT_Event_Handler : public ACE_Event_Handler public: MCT_Event_Handler (ACE_SOCK_Dgram_Mcast::options options = ACE_SOCK_Dgram_Mcast::DEFOPTS); - virtual ~MCT_Event_Handler (void); + virtual ~MCT_Event_Handler (); int join (const ACE_INET_Addr &mcast_addr, int reuse_addr = 1, @@ -454,13 +454,13 @@ public: virtual int handle_input (ACE_HANDLE handle); virtual int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask close_mask); - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; // Turn loopback on/off. Must be called after at least 1 join() is performed. int loopback (bool on_off); protected: - ACE_SOCK_Dgram_Mcast *mcast (void); + ACE_SOCK_Dgram_Mcast *mcast (); int find (const char *buf); private: @@ -484,7 +484,7 @@ MCT_Event_Handler::MCT_Event_Handler (ACE_SOCK_Dgram_Mcast::options options) ++MCT_Event_Handler::active_handlers_; } -MCT_Event_Handler::~MCT_Event_Handler (void) +MCT_Event_Handler::~MCT_Event_Handler () { size_t size = this->address_vec_.size (); for (size_t i = 0; i < size; ++i) @@ -497,7 +497,7 @@ MCT_Event_Handler::~MCT_Event_Handler (void) ACE_SOCK_Dgram_Mcast * -MCT_Event_Handler::mcast (void) +MCT_Event_Handler::mcast () { return &this->mcast_; } @@ -627,7 +627,7 @@ MCT_Event_Handler::handle_close (ACE_HANDLE /*fd*/, } ACE_HANDLE -MCT_Event_Handler::get_handle (void) const +MCT_Event_Handler::get_handle () const { return this->mcast_.get_handle (); } @@ -652,14 +652,14 @@ class MCT_Task : public ACE_Task<ACE_NULL_SYNCH> public: MCT_Task (const MCT_Config &config, ACE_Reactor *reactor = ACE_Reactor::instance ()); - ~MCT_Task (void); + ~MCT_Task (); //FUZZ: disable check_for_lack_ACE_OS // = Task hooks. virtual int open (void *args = 0); //FUZZ: enable check_for_lack_ACE_OS - virtual int svc (void); + virtual int svc (); private: const MCT_Config &config_; @@ -672,7 +672,7 @@ MCT_Task::MCT_Task (const MCT_Config &config, this->reactor (reactor); } -MCT_Task::~MCT_Task (void) +MCT_Task::~MCT_Task () {} int @@ -742,7 +742,7 @@ MCT_Task::open (void *) } int -MCT_Task::svc (void) +MCT_Task::svc () { // make sure this thread owns the reactor or handle_events () won't do // anything. diff --git a/ACE/tests/Multicast_Test_IPV6.cpp b/ACE/tests/Multicast_Test_IPV6.cpp index e217fa7c497..37f186b1a58 100644 --- a/ACE/tests/Multicast_Test_IPV6.cpp +++ b/ACE/tests/Multicast_Test_IPV6.cpp @@ -94,7 +94,7 @@ public: BOTH = PRODUCER | CONSUMER }; - MCT_Config (void) + MCT_Config () : group_start_ (MCT_START_PORT, MCT_START_GROUP), groups_ (0), debug_ (0), @@ -110,26 +110,26 @@ public: this->groups_ = ACE_MIN (IP_MAX_MEMBERSHIPS, MCT_GROUPS); } - ~MCT_Config (void) + ~MCT_Config () {} //FUZZ: disable check_for_lack_ACE_OS int open (int argc, ACE_TCHAR *argv[]); //FUZZ: enable check_for_lack_ACE_OS - int debug (void) const { return this->debug_;} - void dump (void) const; - int groups (void) const { return this->groups_;} - const ACE_INET_Addr group_start (void) const { return this->group_start_;} - u_long role (void) const { return this->role_;} - int iterations (void) const { return this->iterations_;} - int ttl (void) const { return this->ttl_;} + int debug () const { return this->debug_;} + void dump () const; + int groups () const { return this->groups_;} + const ACE_INET_Addr group_start () const { return this->group_start_;} + u_long role () const { return this->role_;} + int iterations () const { return this->iterations_;} + int ttl () const { return this->ttl_;} //FUZZ: disable check_for_lack_ACE_OS - int wait (void) const { return this->wait_;} + int wait () const { return this->wait_;} //FUZZ: enable check_for_lack_ACE_OS - ACE_SOCK_Dgram_Mcast::options options (void) const + ACE_SOCK_Dgram_Mcast::options options () const { return static_cast<ACE_SOCK_Dgram_Mcast::options> (this->sdm_opts_); } @@ -405,7 +405,7 @@ MCT_Config::open (int argc, ACE_TCHAR *argv[]) } void -MCT_Config::dump (void) const +MCT_Config::dump () const { ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" Dumping MCT_Config\n"))); @@ -458,7 +458,7 @@ class MCT_Event_Handler : public ACE_Event_Handler public: MCT_Event_Handler (ACE_SOCK_Dgram_Mcast::options options = ACE_SOCK_Dgram_Mcast::DEFOPTS); - virtual ~MCT_Event_Handler (void); + virtual ~MCT_Event_Handler (); int join (const ACE_INET_Addr &mcast_addr, int reuse_addr = 1, @@ -470,10 +470,10 @@ public: virtual int handle_input (ACE_HANDLE handle); virtual int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask close_mask); - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; protected: - ACE_SOCK_Dgram_Mcast *mcast (void); + ACE_SOCK_Dgram_Mcast *mcast (); int find (const char *buf); private: @@ -497,7 +497,7 @@ MCT_Event_Handler::MCT_Event_Handler (ACE_SOCK_Dgram_Mcast::options options) ++MCT_Event_Handler::active_handlers_; } -MCT_Event_Handler::~MCT_Event_Handler (void) +MCT_Event_Handler::~MCT_Event_Handler () { size_t size = this->address_vec_.size (); for (size_t i = 0; i < size; ++i) @@ -509,7 +509,7 @@ MCT_Event_Handler::~MCT_Event_Handler (void) ACE_SOCK_Dgram_Mcast * -MCT_Event_Handler::mcast (void) +MCT_Event_Handler::mcast () { return &this->mcast_; } @@ -639,7 +639,7 @@ MCT_Event_Handler::handle_close (ACE_HANDLE /*fd*/, } ACE_HANDLE -MCT_Event_Handler::get_handle (void) const +MCT_Event_Handler::get_handle () const { return this->mcast_.get_handle (); } @@ -656,12 +656,12 @@ class MCT_Task : public ACE_Task<ACE_NULL_SYNCH> public: MCT_Task (const MCT_Config &config, ACE_Reactor *reactor = ACE_Reactor::instance ()); - ~MCT_Task (void); + ~MCT_Task (); //FUZZ: disable check_for_lack_ACE_OS // = Task hooks. virtual int open (void *args = 0); - virtual int svc (void); + virtual int svc (); //FUZZ: enable check_for_lack_ACE_OS private: @@ -675,7 +675,7 @@ MCT_Task::MCT_Task (const MCT_Config &config, this->reactor (reactor); } -MCT_Task::~MCT_Task (void) +MCT_Task::~MCT_Task () {} int @@ -738,7 +738,7 @@ MCT_Task::open (void *) } int -MCT_Task::svc (void) +MCT_Task::svc () { // make sure this thread owns the reactor or handle_events () won't do // anything. diff --git a/ACE/tests/Network_Adapters_Test.cpp b/ACE/tests/Network_Adapters_Test.cpp index 395b49cf117..bc83135aeca 100644 --- a/ACE/tests/Network_Adapters_Test.cpp +++ b/ACE/tests/Network_Adapters_Test.cpp @@ -86,7 +86,7 @@ * as not a ICMP_ECHOREPLY message and further ICMP_ECHOREPLY * received. Don't worry, be happy - it's ok. */ -Echo_Handler::Echo_Handler (void) +Echo_Handler::Echo_Handler () : ping_socket_ (), reply_wait_ (), remote_addrs_ (0), @@ -99,7 +99,7 @@ Echo_Handler::Echo_Handler (void) { } -Echo_Handler::~Echo_Handler (void) +Echo_Handler::~Echo_Handler () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Echo_Handler::~Echo_Handler - entered.\n"))); @@ -306,7 +306,7 @@ Echo_Handler::open (ACE_Reactor * const reactor, } ACE_Ping_Socket & -Echo_Handler::ping_socket (void) +Echo_Handler::ping_socket () { return this->ping_socket_; } @@ -378,7 +378,7 @@ Echo_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask) } ACE_HANDLE -Echo_Handler::get_handle (void) const +Echo_Handler::get_handle () const { return ((ACE_ICMP_Socket &) this->ping_socket_).get_handle (); } @@ -522,7 +522,7 @@ Echo_Handler::handle_timeout (ACE_Time_Value const &, } int -Echo_Handler::does_echo_test_successful (void) +Echo_Handler::does_echo_test_successful () { for (size_t i = 0; i < this->number_remotes_; ++i) { @@ -544,13 +544,13 @@ Stop_Handler::Stop_Handler (ACE_Reactor * const reactor) sizeof this->handlers_to_stop_); } -Stop_Handler::~Stop_Handler (void) +Stop_Handler::~Stop_Handler () { ACE_DEBUG ((LM_INFO, ACE_TEXT ("(%P|%t) Stop_Handler::~Stop_Handler.\n"))); } int -Stop_Handler::open (void) +Stop_Handler::open () { // Register the signal handler object to catch the signals. #if (SIGINT != 0) @@ -747,14 +747,14 @@ Stop_Handler::unregister_handler (ACE_Event_Handler *handler) } -Repeats_Handler::Repeats_Handler (void) +Repeats_Handler::Repeats_Handler () : check_handler_ (0), seconds_timer_ (60), counter_ (0) { } -Repeats_Handler::~Repeats_Handler (void) +Repeats_Handler::~Repeats_Handler () { ACE_DEBUG ((LM_INFO, ACE_TEXT ("(%P|%t) Repeats_Handler::~Repeats_Handler.\n"))); diff --git a/ACE/tests/New_Fail_Test.cpp b/ACE/tests/New_Fail_Test.cpp index 11d6bc12316..f542fed9f31 100644 --- a/ACE/tests/New_Fail_Test.cpp +++ b/ACE/tests/New_Fail_Test.cpp @@ -53,7 +53,7 @@ try_ace_new (char **p) } static char * -try_ace_new_return (void) +try_ace_new_return () { char *p = 0; ACE_NEW_RETURN (p, char[BIG_BLOCK], 0); @@ -61,7 +61,7 @@ try_ace_new_return (void) } static char * -try_ace_new_noreturn (void) +try_ace_new_noreturn () { char *p = 0; ACE_NEW_NORETURN (p, char[BIG_BLOCK]); diff --git a/ACE/tests/Notify_Performance_Test.cpp b/ACE/tests/Notify_Performance_Test.cpp index 032fd219027..062e3c235f6 100644 --- a/ACE/tests/Notify_Performance_Test.cpp +++ b/ACE/tests/Notify_Performance_Test.cpp @@ -90,7 +90,7 @@ client (void *arg) // Sets up the correct reactor (based on platform and options) static void -create_reactor (void) +create_reactor () { ACE_Reactor_Impl *impl = 0; diff --git a/ACE/tests/OS_Test.cpp b/ACE/tests/OS_Test.cpp index 65115e9b27b..4ffc3bf4511 100644 --- a/ACE/tests/OS_Test.cpp +++ b/ACE/tests/OS_Test.cpp @@ -41,7 +41,7 @@ // Test ACE_OS::access() to be sure a file's existence is correctly noted. int -access_test (void) +access_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing access method\n"))); @@ -67,7 +67,7 @@ access_test (void) // Test ACE_OS::rename to be sure the files come and go as expected. int -rename_test (void) +rename_test () { #if defined (ACE_LACKS_RENAME) || defined (ACE_VXWORKS) // On VxWorks only some filesystem drivers support rename @@ -181,7 +181,7 @@ rename_test (void) // int -string_emulation_test (void) +string_emulation_test () { { // ======================================================================== @@ -653,7 +653,7 @@ snprintf_test (SNPrintF_t fn) } static int -getpwnam_r_test (void) +getpwnam_r_test () { int result = 0; @@ -688,7 +688,7 @@ getpwnam_r_test (void) } static int -compiler_test (void) +compiler_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing compiler methods\n"))); @@ -702,7 +702,7 @@ compiler_test (void) } static int -version_test (void) +version_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing version macros\n"))); @@ -727,7 +727,7 @@ version_test (void) } static int -ctime_r_test (void) +ctime_r_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing ctime_r\n"))); @@ -793,7 +793,7 @@ ctime_r_test (void) int -string_strsncpy_test (void) +string_strsncpy_test () { { //FUZZ: disable check_for_lack_ACE_OS @@ -941,7 +941,7 @@ string_strsncpy_test (void) // Test conversion between narrow and wide chars. int -string_convert_test (void) +string_convert_test () { #if defined (ACE_HAS_WCHAR) ACE_DEBUG ((LM_DEBUG, @@ -990,7 +990,7 @@ string_convert_test (void) // Test ACE_OS::strsignal() int -strsignal_test (void) +strsignal_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing strsignal method\n"))); @@ -1018,7 +1018,7 @@ strsignal_test (void) // Test the methods for getting cpu info int -cpu_info_test (void) +cpu_info_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing cpu info methods\n"))); @@ -1064,7 +1064,7 @@ cpu_info_test (void) } int -last_error_test (void) +last_error_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing last_error method\n"))); @@ -1085,7 +1085,7 @@ last_error_test (void) } int -pagesize_test (void) +pagesize_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing getpagesize method\n"))); @@ -1107,7 +1107,7 @@ pagesize_test (void) } int -ace_ctype_test (void) +ace_ctype_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing ace ctype methods\n"))); @@ -1216,7 +1216,7 @@ ace_ctype_test (void) } int -ceilf_test (void) +ceilf_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing ceilf method\n"))); @@ -1244,7 +1244,7 @@ ceilf_test (void) } int -floorf_test (void) +floorf_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing floorf method\n"))); @@ -1270,7 +1270,7 @@ floorf_test (void) } int -ceil_test (void) +ceil_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing ceil method\n"))); @@ -1298,7 +1298,7 @@ ceil_test (void) } int -floor_test (void) +floor_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing floor method\n"))); @@ -1326,7 +1326,7 @@ floor_test (void) } int -ceill_test (void) +ceill_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing ceill method\n"))); @@ -1354,7 +1354,7 @@ ceill_test (void) } int -floorl_test (void) +floorl_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing floorl method\n"))); @@ -1380,7 +1380,7 @@ floorl_test (void) } int -log2_test (void) +log2_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing log2 method\n"))); @@ -1588,7 +1588,7 @@ int snprintf_emulation_test () #endif // ACE_HAS_VSNPRINTF_EMULATION int -swab_test (void) +swab_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing swab method\n"))); @@ -1611,7 +1611,7 @@ swab_test (void) } int -gai_strerror_test (void) +gai_strerror_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing gai_strerror method\n"))); diff --git a/ACE/tests/Pipe_Test.cpp b/ACE/tests/Pipe_Test.cpp index b98d33d37e3..9b1a1120d4a 100644 --- a/ACE/tests/Pipe_Test.cpp +++ b/ACE/tests/Pipe_Test.cpp @@ -30,7 +30,7 @@ static int iterations = ACE_MAX_ITERATIONS; // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("usage: %n [-d (don't close pipes)] ") diff --git a/ACE/tests/Priority_Reactor_Test.cpp b/ACE/tests/Priority_Reactor_Test.cpp index 37fd07c07da..2ea39def6bc 100644 --- a/ACE/tests/Priority_Reactor_Test.cpp +++ b/ACE/tests/Priority_Reactor_Test.cpp @@ -69,7 +69,7 @@ Read_Handler::set_countdown (int nchildren) } int -Read_Handler::get_countdown (void) +Read_Handler::get_countdown () { return Read_Handler::waiting_; } @@ -150,7 +150,7 @@ Write_Handler::open (void *) } int -Write_Handler::svc (void) +Write_Handler::svc () { // Send several short messages, doing pauses between each message. // The number of messages can be controlled from the command line. diff --git a/ACE/tests/Priority_Task_Test.cpp b/ACE/tests/Priority_Task_Test.cpp index 056dc2adae6..6a5f62ad7b0 100644 --- a/ACE/tests/Priority_Task_Test.cpp +++ b/ACE/tests/Priority_Task_Test.cpp @@ -35,7 +35,7 @@ class Priority_Task : public ACE_Task<ACE_MT_SYNCH> { public: /// The constructor - Priority_Task (void); + Priority_Task (); //FUZZ: disable check_for_lack_ACE_OS /** @@ -46,17 +46,17 @@ public: int open (void *); /// Runs on a separate thread an checks the priority. - int svc (void); + int svc (); /// Returns 1 if priority was set properly, 0 otherwise. - int succeeded (void) { return error_ == 0; } + int succeeded () { return error_ == 0; } private: int priority_; u_int error_; }; -Priority_Task::Priority_Task (void) +Priority_Task::Priority_Task () : ACE_Task<ACE_MT_SYNCH> (ACE_Thread_Manager::instance ()), priority_ (0), error_ (0) @@ -125,7 +125,7 @@ Priority_Task::open (void *arg) } int -Priority_Task::svc (void) +Priority_Task::svc () { ACE_hthread_t thr_handle; ACE_Thread::self (thr_handle); diff --git a/ACE/tests/Proactor_Test.cpp b/ACE/tests/Proactor_Test.cpp index 6424635ae52..ffc7cba3df7 100644 --- a/ACE/tests/Proactor_Test.cpp +++ b/ACE/tests/Proactor_Test.cpp @@ -164,7 +164,7 @@ disable_signal (int sigmin, int sigmax) class MyTask : public ACE_Task<ACE_MT_SYNCH> { public: - MyTask (void): + MyTask (): lock_ (), sem_ ((unsigned int) 0), proactor_(0) {} @@ -175,17 +175,17 @@ public: (void) this->delete_proactor(); } - virtual int svc (void); + virtual int svc (); int start (int num_threads, ProactorType type_proactor, size_t max_op ); - int stop (void); + int stop (); private: int create_proactor (ProactorType type_proactor, size_t max_op); - int delete_proactor (void); + int delete_proactor (); ACE_SYNCH_RECURSIVE_MUTEX lock_; ACE_Thread_Semaphore sem_; @@ -279,7 +279,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op) } int -MyTask::delete_proactor (void) +MyTask::delete_proactor () { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, monitor, @@ -341,7 +341,7 @@ MyTask::stop () } int -MyTask::svc (void) +MyTask::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) MyTask started\n"))); @@ -364,13 +364,13 @@ class TestData { public: TestData (); - bool testing_done (void); - Server *server_up (void); - Client *client_up (void); + bool testing_done (); + Server *server_up (); + Client *client_up (); void server_done (Server *s); void client_done (Client *c); - void stop_all (void); - void report (void); + void stop_all (); + void report (); private: struct Local_Stats @@ -403,7 +403,7 @@ TestData::TestData () } bool -TestData::testing_done (void) +TestData::testing_done () { int svr_up = this->servers_.sessions_up_.value (); int svr_dn = this->servers_.sessions_down_.value (); @@ -417,7 +417,7 @@ TestData::testing_done (void) } Server * -TestData::server_up (void) +TestData::server_up () { ++this->servers_.sessions_up_; ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, monitor, this->list_lock_, 0); @@ -439,7 +439,7 @@ TestData::server_up (void) } Client * -TestData::client_up (void) +TestData::client_up () { ++this->clients_.sessions_up_; ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, monitor, this->list_lock_, 0); @@ -531,7 +531,7 @@ TestData::client_done (Client *c) } void -TestData::stop_all (void) +TestData::stop_all () { int i; @@ -568,7 +568,7 @@ TestData::stop_all (void) } void -TestData::report (void) +TestData::report () { // Print statistics ACE_TCHAR bufs [256]; @@ -621,10 +621,10 @@ class Acceptor : public ACE_Asynch_Acceptor<Server> { public: Acceptor (TestData *tester); - virtual ~Acceptor (void); + virtual ~Acceptor (); // Virtual from ACE_Asynch_Acceptor - Server *make_handler (void); + Server *make_handler (); private: TestData *tester_; @@ -636,13 +636,13 @@ Acceptor::Acceptor (TestData *tester) { } -Acceptor::~Acceptor (void) +Acceptor::~Acceptor () { this->cancel (); } Server * -Acceptor::make_handler (void) +Acceptor::make_handler () { return this->tester_->server_up (); } @@ -666,7 +666,7 @@ Server::Server (TestData *tester, int id) { } -Server::~Server (void) +Server::~Server () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Server %d dtor; %d sends (%B bytes); ") @@ -776,7 +776,7 @@ Server::open (ACE_HANDLE handle, ACE_Message_Block &) } int -Server::initiate_read_stream (void) +Server::initiate_read_stream () { if (this->flg_cancel_ != 0 || this->handle_ == ACE_INVALID_HANDLE) return -1; @@ -1055,12 +1055,12 @@ class Connector : public ACE_Asynch_Connector<Client> { public: Connector (TestData *tester); - virtual ~Connector (void); + virtual ~Connector (); int start (const ACE_INET_Addr &addr, int num); // Virtual from ACE_Asynch_Connector - Client *make_handler (void); + Client *make_handler (); private: TestData *tester_; @@ -1073,13 +1073,13 @@ Connector::Connector (TestData *tester) { } -Connector::~Connector (void) +Connector::~Connector () { this->cancel (); } Client * -Connector::make_handler (void) +Connector::make_handler () { return this->tester_->client_up (); } @@ -1141,7 +1141,7 @@ Client::Client (TestData *tester, int id) { } -Client::~Client (void) +Client::~Client () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Client %d dtor; %d sends (%B bytes); ") @@ -1271,7 +1271,7 @@ Client::open (ACE_HANDLE handle, ACE_Message_Block &) } int -Client::initiate_write_stream (void) +Client::initiate_write_stream () { if (this->flg_cancel_ != 0 || this->stop_writing_ || @@ -1353,7 +1353,7 @@ Client::initiate_write_stream (void) } int -Client::initiate_read_stream (void) +Client::initiate_read_stream () { if (this->flg_cancel_ != 0 || this->handle_ == ACE_INVALID_HANDLE) return -1; diff --git a/ACE/tests/Proactor_Test_IPV6.cpp b/ACE/tests/Proactor_Test_IPV6.cpp index 341c604c30d..f35a9f99a27 100644 --- a/ACE/tests/Proactor_Test_IPV6.cpp +++ b/ACE/tests/Proactor_Test_IPV6.cpp @@ -165,7 +165,7 @@ disable_signal (int sigmin, int sigmax) class MyTask : public ACE_Task<ACE_MT_SYNCH> { public: - MyTask (void): + MyTask (): lock_ (), sem_ ((unsigned int) 0), proactor_(0) {} @@ -176,17 +176,17 @@ public: (void) this->delete_proactor(); } - virtual int svc (void); + virtual int svc (); int start (int num_threads, ProactorType type_proactor, size_t max_op ); - int stop (void); + int stop (); private: int create_proactor (ProactorType type_proactor, size_t max_op); - int delete_proactor (void); + int delete_proactor (); ACE_SYNCH_RECURSIVE_MUTEX lock_; ACE_Thread_Semaphore sem_; @@ -280,7 +280,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op) } int -MyTask::delete_proactor (void) +MyTask::delete_proactor () { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, monitor, @@ -342,7 +342,7 @@ MyTask::stop () } int -MyTask::svc (void) +MyTask::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) MyTask started\n"))); @@ -365,13 +365,13 @@ class TestData { public: TestData (); - bool testing_done (void); - Server *server_up (void); - Client *client_up (void); + bool testing_done (); + Server *server_up (); + Client *client_up (); void server_done (Server *s); void client_done (Client *c); - void stop_all (void); - void report (void); + void stop_all (); + void report (); private: struct Local_Stats @@ -404,7 +404,7 @@ TestData::TestData () } bool -TestData::testing_done (void) +TestData::testing_done () { int svr_up = this->servers_.sessions_up_.value (); int svr_dn = this->servers_.sessions_down_.value (); @@ -418,7 +418,7 @@ TestData::testing_done (void) } Server * -TestData::server_up (void) +TestData::server_up () { ++this->servers_.sessions_up_; ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, monitor, this->list_lock_, 0); @@ -440,7 +440,7 @@ TestData::server_up (void) } Client * -TestData::client_up (void) +TestData::client_up () { ++this->clients_.sessions_up_; ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, monitor, this->list_lock_, 0); @@ -532,7 +532,7 @@ TestData::client_done (Client *c) } void -TestData::stop_all (void) +TestData::stop_all () { int i; @@ -569,7 +569,7 @@ TestData::stop_all (void) } void -TestData::report (void) +TestData::report () { // Print statistics ACE_TCHAR bufs [256]; @@ -622,10 +622,10 @@ class Acceptor : public ACE_Asynch_Acceptor<Server> { public: Acceptor (TestData *tester); - virtual ~Acceptor (void); + virtual ~Acceptor (); // Virtual from ACE_Asynch_Acceptor - Server *make_handler (void); + Server *make_handler (); private: TestData *tester_; @@ -637,13 +637,13 @@ Acceptor::Acceptor (TestData *tester) { } -Acceptor::~Acceptor (void) +Acceptor::~Acceptor () { this->cancel (); } Server * -Acceptor::make_handler (void) +Acceptor::make_handler () { return this->tester_->server_up (); } @@ -667,7 +667,7 @@ Server::Server (TestData *tester, int id) { } -Server::~Server (void) +Server::~Server () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Server %d dtor; %d sends (%d bytes); ") @@ -777,7 +777,7 @@ Server::open (ACE_HANDLE handle, ACE_Message_Block &) } int -Server::initiate_read_stream (void) +Server::initiate_read_stream () { if (this->flg_cancel_ != 0 || this->handle_ == ACE_INVALID_HANDLE) return -1; @@ -1056,12 +1056,12 @@ class Connector : public ACE_Asynch_Connector<Client> { public: Connector (TestData *tester); - virtual ~Connector (void); + virtual ~Connector (); int start (const ACE_INET_Addr &addr, int num); // Virtual from ACE_Asynch_Connector - Client *make_handler (void); + Client *make_handler (); private: TestData *tester_; @@ -1074,13 +1074,13 @@ Connector::Connector (TestData *tester) { } -Connector::~Connector (void) +Connector::~Connector () { this->cancel (); } Client * -Connector::make_handler (void) +Connector::make_handler () { return this->tester_->client_up (); } @@ -1143,7 +1143,7 @@ Client::Client (TestData *tester, int id) { } -Client::~Client (void) +Client::~Client () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Client %d dtor; %d sends (%d bytes); ") @@ -1312,7 +1312,7 @@ Client::open (ACE_HANDLE handle, ACE_Message_Block &) } int -Client::initiate_write_stream (void) +Client::initiate_write_stream () { if (this->flg_cancel_ != 0 || this->stop_writing_ || @@ -1394,7 +1394,7 @@ Client::initiate_write_stream (void) } int -Client::initiate_read_stream (void) +Client::initiate_read_stream () { if (this->flg_cancel_ != 0 || this->handle_ == ACE_INVALID_HANDLE) return -1; diff --git a/ACE/tests/Proactor_Timer_Test.cpp b/ACE/tests/Proactor_Timer_Test.cpp index e13b01b9ff4..044cf8ca455 100644 --- a/ACE/tests/Proactor_Timer_Test.cpp +++ b/ACE/tests/Proactor_Timer_Test.cpp @@ -42,7 +42,7 @@ public: virtual void handle_time_out (const ACE_Time_Value &tv, const void *arg); /// Return our timer id. - long timer_id (void) const; + long timer_id () const; /// Set our timer id; void timer_id (long); @@ -82,7 +82,7 @@ private: }; -Time_Handler::Time_Handler (void) +Time_Handler::Time_Handler () : timer_id_ (-1) { // Nothing @@ -118,7 +118,7 @@ Time_Handler::handle_time_out (const ACE_Time_Value &, const void *arg) } long -Time_Handler::timer_id (void) const +Time_Handler::timer_id () const { return this->timer_id_; } @@ -168,7 +168,7 @@ Repeat_Timer_Handler::handle_time_out (const ACE_Time_Value &, const void *) } static void -test_registering_all_handlers (void) +test_registering_all_handlers () { ACE_Trace t (ACE_TEXT ("test_registering_all_handler"), __LINE__, @@ -194,7 +194,7 @@ test_registering_all_handlers (void) } static void -test_registering_one_handler (void) +test_registering_one_handler () { ACE_Trace t (ACE_TEXT ("test_registering_one_handler"), __LINE__, @@ -222,7 +222,7 @@ test_registering_one_handler (void) } static void -test_canceling_odd_timers (void) +test_canceling_odd_timers () { ACE_Trace t (ACE_TEXT ("test_canceling_odd_timers"), __LINE__, @@ -259,7 +259,7 @@ test_canceling_odd_timers (void) } static void -test_cancel_repeat_timer (void) +test_cancel_repeat_timer () { Repeat_Timer_Handler *handler = new Repeat_Timer_Handler; ACE_Time_Value timeout (Repeat_Timer_Handler::REPEAT_INTERVAL); diff --git a/ACE/tests/Proactor_UDP_Test.cpp b/ACE/tests/Proactor_UDP_Test.cpp index bb0ea4863cb..1b50857b768 100644 --- a/ACE/tests/Proactor_UDP_Test.cpp +++ b/ACE/tests/Proactor_UDP_Test.cpp @@ -158,7 +158,7 @@ disable_signal (int sigmin, int sigmax) class MyTask : public ACE_Task<ACE_MT_SYNCH> { public: - MyTask (void): + MyTask (): lock_ (), sem_ ((unsigned int) 0), proactor_(0) {} @@ -169,17 +169,17 @@ public: (void) this->delete_proactor(); } - virtual int svc (void); + virtual int svc (); int start (int num_threads, ProactorType type_proactor, size_t max_op ); - int stop (void); + int stop (); private: int create_proactor (ProactorType type_proactor, size_t max_op); - int delete_proactor (void); + int delete_proactor (); ACE_SYNCH_RECURSIVE_MUTEX lock_; ACE_Thread_Semaphore sem_; @@ -273,7 +273,7 @@ MyTask::create_proactor (ProactorType type_proactor, size_t max_op) } int -MyTask::delete_proactor (void) +MyTask::delete_proactor () { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, monitor, @@ -335,7 +335,7 @@ MyTask::stop () } int -MyTask::svc (void) +MyTask::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) MyTask started\n"))); @@ -377,13 +377,13 @@ class Server : public ACE_Handler public: Server (); Server (TestData *tester, int id); - ~Server (void); + ~Server (); - int id (void) { return this->id_; } - size_t get_total_snd (void) { return this->total_snd_; } - size_t get_total_rcv (void) { return this->total_rcv_; } - long get_total_w (void) { return this->total_w_; } - long get_total_r (void) { return this->total_r_; } + int id () { return this->id_; } + size_t get_total_snd () { return this->total_snd_; } + size_t get_total_rcv () { return this->total_rcv_; } + long get_total_w () { return this->total_w_; } + long get_total_r () { return this->total_r_; } /// This is called after the new session has been established. void go (ACE_HANDLE handle, const ACE_INET_Addr &client); @@ -405,7 +405,7 @@ protected: virtual void handle_write_dgram (const ACE_Asynch_Write_Dgram::Result &result); private: - int initiate_read (void); + int initiate_read (); int initiate_write (ACE_Message_Block *mb, size_t nbytes); TestData *tester_; @@ -434,14 +434,14 @@ class Client : public ACE_Handler public: Client (); Client (TestData *tester, int id); - ~Client (void); + ~Client (); void go (ACE_HANDLE h, const ACE_INET_Addr &server); - int id (void) { return this->id_; } - size_t get_total_snd (void) { return this->total_snd_; } - size_t get_total_rcv (void) { return this->total_rcv_; } - int get_total_w (void) { return this->total_w_; } - int get_total_r (void) { return this->total_r_; } + int id () { return this->id_; } + size_t get_total_snd () { return this->total_snd_; } + size_t get_total_rcv () { return this->total_rcv_; } + int get_total_w () { return this->total_w_; } + int get_total_r () { return this->total_r_; } // This is called when asynchronous reads from the socket complete virtual void handle_read_dgram (const ACE_Asynch_Read_Dgram::Result &result); @@ -449,13 +449,13 @@ public: // This is called when asynchronous writes from the socket complete virtual void handle_write_dgram (const ACE_Asynch_Write_Dgram::Result &result); - void cancel (void); + void cancel (); private: - int initiate_read (void); - int initiate_write (void); + int initiate_read (); + int initiate_write (); // FUZZ: disable check_for_lack_ACE_OS - void close (void); + void close (); // FUZZ: enable check_for_lack_ACE_OS TestData *tester_; @@ -482,13 +482,13 @@ class TestData { public: TestData (); - bool testing_done (void); - Server *server_up (void); - Client *client_up (void); + bool testing_done (); + Server *server_up (); + Client *client_up (); void server_done (Server *s); void client_done (Client *c); - void stop_all (void); - void report (void); + void stop_all (); + void report (); private: struct Local_Stats @@ -521,7 +521,7 @@ TestData::TestData () } bool -TestData::testing_done (void) +TestData::testing_done () { int svr_up = this->servers_.sessions_up_.value (); int svr_dn = this->servers_.sessions_down_.value (); @@ -535,7 +535,7 @@ TestData::testing_done (void) } Server * -TestData::server_up (void) +TestData::server_up () { ++this->servers_.sessions_up_; ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, monitor, this->list_lock_, 0); @@ -557,7 +557,7 @@ TestData::server_up (void) } Client * -TestData::client_up (void) +TestData::client_up () { ++this->clients_.sessions_up_; ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, monitor, this->list_lock_, 0); @@ -649,7 +649,7 @@ TestData::client_done (Client *c) } void -TestData::stop_all (void) +TestData::stop_all () { int i; @@ -686,7 +686,7 @@ TestData::stop_all (void) } void -TestData::report (void) +TestData::report () { // Print statistics ACE_TCHAR bufs [256]; @@ -758,13 +758,13 @@ class Master : public ACE_Handler { public: Master (TestData *tester, const ACE_INET_Addr &recv_addr, int expected); - ~Master (void); + ~Master (); // Called when dgram receive operation completes. virtual void handle_read_dgram (const ACE_Asynch_Read_Dgram::Result &result); private: - void start_recv (void); + void start_recv (); TestData *tester_; ACE_INET_Addr recv_addr_; @@ -796,7 +796,7 @@ Master::Master (TestData *tester, const ACE_INET_Addr &recv_addr, int expected) } } -Master::~Master (void) +Master::~Master () { if (this->recv_in_progress_) this->rd_.cancel (); @@ -915,7 +915,7 @@ Master::handle_read_dgram (const ACE_Asynch_Read_Dgram::Result &result) } void -Master::start_recv (void) +Master::start_recv () { if (this->mb_ == 0) return; @@ -947,7 +947,7 @@ Server::Server (TestData *tester, int id) { } -Server::~Server (void) +Server::~Server () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Server %d dtor; %d sends (%B bytes); ") @@ -1035,7 +1035,7 @@ Server::go (ACE_HANDLE handle, const ACE_INET_Addr &client) } int -Server::initiate_read (void) +Server::initiate_read () { if (this->flg_cancel_ || this->handle () == ACE_INVALID_HANDLE) return -1; @@ -1406,7 +1406,7 @@ Client::Client (TestData *tester, int id) { } -Client::~Client (void) +Client::~Client () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Client %d dtor; %d sends (%B bytes); ") @@ -1508,7 +1508,7 @@ Client::go (ACE_HANDLE handle, const ACE_INET_Addr &server) } int -Client::initiate_write (void) +Client::initiate_write () { if (this->flg_cancel_ || this->handle () == ACE_INVALID_HANDLE) return -1; @@ -1616,7 +1616,7 @@ Client::initiate_write (void) } int -Client::initiate_read (void) +Client::initiate_read () { if (this->flg_cancel_ || this->handle_ == ACE_INVALID_HANDLE) return -1; diff --git a/ACE/tests/Process_Manager_Test.cpp b/ACE/tests/Process_Manager_Test.cpp index 109019e9b12..6dda518de15 100644 --- a/ACE/tests/Process_Manager_Test.cpp +++ b/ACE/tests/Process_Manager_Test.cpp @@ -39,7 +39,7 @@ class Exit_Handler : public ACE_Event_Handler public: Exit_Handler (const char *msg): msg_ (msg) { } - virtual ~Exit_Handler (void) { } + virtual ~Exit_Handler () { } virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask) { @@ -185,7 +185,7 @@ public: return 0; } - int svc (void) + int svc () { int result = 0; ACE_exitcode exitcode; @@ -231,7 +231,7 @@ private: #ifdef ACE_HAS_PROCESS_SPAWN static int -command_line_test (void) +command_line_test () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing for last character of command line\n"))); diff --git a/ACE/tests/Process_Manual_Event_Test.cpp b/ACE/tests/Process_Manual_Event_Test.cpp index 7d1e55d0e01..10c2d9187a6 100644 --- a/ACE/tests/Process_Manual_Event_Test.cpp +++ b/ACE/tests/Process_Manual_Event_Test.cpp @@ -35,7 +35,7 @@ static const ACE_TCHAR *event_pong_name = ACE_TEXT ("ACE_Pong_Event"); // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("usage: %n [-i #iterations] [-c (child process)]\n"))); @@ -66,7 +66,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) } static void -acquire_release (void) +acquire_release () { ACE_Manual_Event event_ping (0, USYNC_PROCESS, event_ping_name); ACE_Manual_Event event_pong (0, USYNC_PROCESS, event_pong_name); diff --git a/ACE/tests/Process_Mutex_Test.cpp b/ACE/tests/Process_Mutex_Test.cpp index 74d9aa65663..5d35c51bb7a 100644 --- a/ACE/tests/Process_Mutex_Test.cpp +++ b/ACE/tests/Process_Mutex_Test.cpp @@ -30,7 +30,7 @@ static const u_int n_processes = ACE_MAX_PROCESSES; // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("usage: %n [-d (don't release mutex)] ") @@ -65,7 +65,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) } static void -acquire_release (void) +acquire_release () { ACE_Process_Mutex mutex (mutex_name); diff --git a/ACE/tests/Process_Semaphore_Test.cpp b/ACE/tests/Process_Semaphore_Test.cpp index 80b7e1aa40b..af182297bcb 100644 --- a/ACE/tests/Process_Semaphore_Test.cpp +++ b/ACE/tests/Process_Semaphore_Test.cpp @@ -37,7 +37,7 @@ static const char *sema_pong_name = "ACE_Pong_Semaphore"; // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("usage: %n [-i #iterations] [-c (child process)]\n"))); @@ -68,7 +68,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) } static void -acquire_release (void) +acquire_release () { #if defined (ACE_WIN32) || \ defined (ACE_USES_FIFO_SEM) || \ diff --git a/ACE/tests/Process_Strategy_Test.cpp b/ACE/tests/Process_Strategy_Test.cpp index aa0797fe6b7..cccb0a7554a 100644 --- a/ACE/tests/Process_Strategy_Test.cpp +++ b/ACE/tests/Process_Strategy_Test.cpp @@ -68,7 +68,7 @@ static size_t connections = 0; // Use this to show down the process gracefully. void -connection_completed (void) +connection_completed () { // Increment connection counter. ++connections; @@ -93,7 +93,7 @@ Process_Strategy::Process_Strategy (size_t n_processes, // Destructor. g++ 2.7.2.3 gets very confused ("Internal compiler // error") without it. -Process_Strategy::~Process_Strategy (void) +Process_Strategy::~Process_Strategy () { } @@ -115,24 +115,24 @@ Process_Strategy::activate_svc_handler (Counting_Service *svc_handler, } ACE_File_Lock & -Options::file_lock (void) +Options::file_lock () { return this->file_lock_; } ACE_Concurrency_Strategy <Counting_Service> * -Options::concurrency_strategy (void) +Options::concurrency_strategy () { return this->concurrency_strategy_; } const ACE_TCHAR * -Options::filename (void) +Options::filename () { return this->filename_; } -Options::Options (void) +Options::Options () : // Choose to use processes by default. #if !defined (ACE_LACKS_FORK) @@ -145,7 +145,7 @@ Options::Options (void) { } -Options::~Options (void) +Options::~Options () { delete this->concurrency_strategy_; } @@ -261,7 +261,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) } Options::Concurrency_Type -Options::concurrency_type (void) +Options::concurrency_type () { return this->concurrency_type_; } @@ -282,7 +282,7 @@ Counting_Service::Counting_Service (ACE_Thread_Manager *) // client. int -Counting_Service::read (void) +Counting_Service::read () { ACE_READ_GUARD_RETURN (ACE_File_Lock, ace_mon, OPTIONS::instance ()->file_lock (), -1); @@ -317,7 +317,7 @@ Counting_Service::read (void) // Increment the current value in the shared file by 1. int -Counting_Service::inc (void) +Counting_Service::inc () { ACE_WRITE_GUARD_RETURN (ACE_File_Lock, ace_mon, OPTIONS::instance ()->file_lock (), -1); @@ -409,7 +409,7 @@ Counting_Service::handle_input (ACE_HANDLE) } int -Counting_Service::svc (void) +Counting_Service::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) handling thread\n"))); @@ -605,7 +605,7 @@ client (void *arg) // Have all connections been serviced? int -done (void) +done () { return connections == ACE_MAX_ITERATIONS + 1; } diff --git a/ACE/tests/Process_Test.cpp b/ACE/tests/Process_Test.cpp index 328702994b5..d18a5265af8 100644 --- a/ACE/tests/Process_Test.cpp +++ b/ACE/tests/Process_Test.cpp @@ -25,7 +25,7 @@ static const char *proc_self_fd = "/proc/self/fd/"; int -test_setenv (void) +test_setenv () { int status = 0; ACE_Process_Options opts; diff --git a/ACE/tests/RB_Tree_Test.cpp b/ACE/tests/RB_Tree_Test.cpp index 481afb8cc21..1656e1b803f 100644 --- a/ACE/tests/RB_Tree_Test.cpp +++ b/ACE/tests/RB_Tree_Test.cpp @@ -523,14 +523,14 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Test // Destructor. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> -ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree_Test (void) +ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree_Test () { } // Run the interface and iteration tests. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void -ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::run_test (void) +ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::run_test () { // Run the individual portions of the test, in order. @@ -545,7 +545,7 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::run_test (void) // Tests stable and deprecated insertion interfaces. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void -ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_tree_insertion (void) +ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_tree_insertion () { // Fill in each tree with the key and item from the appropriate // arrays, using the shuffle index to create the appropriate @@ -588,7 +588,7 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_tree_insertion (v // Tests forward and reverse iteration after insertion in both trees. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void -ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_insertion_iteration (void) +ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_insertion_iteration () { // Reset iterators. @@ -662,7 +662,7 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_insertion_it } template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void -ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_partial_iteration(void) +ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_partial_iteration() { ACE_RB_Tree_Node<EXT_ID, INT_ID> *tree_node = 0; @@ -699,7 +699,7 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_partial_iteration // Tests stable and deprecated deletion interfaces. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void -ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_tree_deletion (void) +ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_tree_deletion () { // Remove the even numbered entries from each of the trees. @@ -725,7 +725,7 @@ ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_tree_deletion (vo // Tests forward and reverse iteration after deletions in both trees. template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void -ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_deletion_iteration (void) +ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_deletion_iteration () { // Reset iterators diff --git a/ACE/tests/RW_Process_Mutex_Test.cpp b/ACE/tests/RW_Process_Mutex_Test.cpp index 7c84597df70..36ba22dd187 100644 --- a/ACE/tests/RW_Process_Mutex_Test.cpp +++ b/ACE/tests/RW_Process_Mutex_Test.cpp @@ -126,7 +126,7 @@ Child::any_overlaps (const Child &other) const // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("usage: %n [-c n (child number) -p n (port number)] [-n mutex name]\n"))); @@ -310,7 +310,7 @@ reader (int num) } static void -writer (void) +writer () { ACE_RW_Process_Mutex mutex (mutex_name.c_str ()); diff --git a/ACE/tests/Reactor_Dispatch_Order_Test.cpp b/ACE/tests/Reactor_Dispatch_Order_Test.cpp index b0032d4d36a..1df24bf6e05 100644 --- a/ACE/tests/Reactor_Dispatch_Order_Test.cpp +++ b/ACE/tests/Reactor_Dispatch_Order_Test.cpp @@ -35,7 +35,7 @@ public: int handle_output (ACE_HANDLE fd); - ACE_HANDLE get_handle (void) const; + ACE_HANDLE get_handle () const; // We need to add MSG_OOB data transfer to this test to check the // order of when <handle_exception> gets called. I tried with @@ -76,14 +76,14 @@ Handler::Handler (ACE_Reactor &reactor) } -Handler::~Handler (void) +Handler::~Handler () { this->pipe_.close (); } ACE_HANDLE -Handler::get_handle (void) const +Handler::get_handle () const { return this->pipe_.read_handle (); } diff --git a/ACE/tests/Reactor_Dispatch_Order_Test_Dev_Poll.cpp b/ACE/tests/Reactor_Dispatch_Order_Test_Dev_Poll.cpp index 849f544966f..52867953927 100644 --- a/ACE/tests/Reactor_Dispatch_Order_Test_Dev_Poll.cpp +++ b/ACE/tests/Reactor_Dispatch_Order_Test_Dev_Poll.cpp @@ -37,7 +37,7 @@ public: int handle_output (ACE_HANDLE fd); - ACE_HANDLE get_handle (void) const; + ACE_HANDLE get_handle () const; // We need to add MSG_OOB data transfer to this test to check the // order of when <handle_exception> gets called. I tried with @@ -78,14 +78,14 @@ Handler::Handler (ACE_Reactor &reactor) } -Handler::~Handler (void) +Handler::~Handler () { this->pipe_.close (); } ACE_HANDLE -Handler::get_handle (void) const +Handler::get_handle () const { return this->pipe_.read_handle (); } diff --git a/ACE/tests/Reactor_Exceptions_Test.cpp b/ACE/tests/Reactor_Exceptions_Test.cpp index fe06d7813a9..ba3c3f4a9d9 100644 --- a/ACE/tests/Reactor_Exceptions_Test.cpp +++ b/ACE/tests/Reactor_Exceptions_Test.cpp @@ -20,7 +20,7 @@ class Except {}; static void -throw_exception (void) +throw_exception () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) throw exception\n"))); @@ -32,7 +32,7 @@ class My_Handler : public ACE_Event_Handler, public ACE_SOCK_Dgram public: My_Handler (const ACE_INET_Addr &local_addr); - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE handle); }; @@ -42,7 +42,7 @@ My_Handler::My_Handler (const ACE_INET_Addr &local_addr) } ACE_HANDLE -My_Handler::get_handle (void) const +My_Handler::get_handle () const { return ACE_SOCK_Dgram::get_handle (); } @@ -102,7 +102,7 @@ public: #if defined (ACE_HAS_THREADS) static int -worker (void) +worker () { ACE_Reactor::instance ()->owner (ACE_OS::thr_self ()); diff --git a/ACE/tests/Reactor_Fairness_Test.cpp b/ACE/tests/Reactor_Fairness_Test.cpp index 3e71285e641..4eacc70a1ee 100644 --- a/ACE/tests/Reactor_Fairness_Test.cpp +++ b/ACE/tests/Reactor_Fairness_Test.cpp @@ -67,7 +67,7 @@ namespace { } // Return 1 if this looks like a failure wrt fairness. - int analyze_reports (void) + int analyze_reports () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Results (%d entries):\n"), diff --git a/ACE/tests/Reactor_Notification_Queue_Test.cpp b/ACE/tests/Reactor_Notification_Queue_Test.cpp index dbe20b09708..346b23eb76e 100644 --- a/ACE/tests/Reactor_Notification_Queue_Test.cpp +++ b/ACE/tests/Reactor_Notification_Queue_Test.cpp @@ -28,7 +28,7 @@ public: char const *test_name); /// Run the test - void run(void); + void run(); /// Receive the notifications. virtual int handle_exception(ACE_HANDLE); @@ -40,12 +40,12 @@ private: * Each iteration of the test consists of sending multiple * notifications simultaneously. */ - void send_notifications (void); + void send_notifications (); /** * @brief Return true if the test is finished. */ - bool done (void) const; + bool done () const; private: /** @@ -142,7 +142,7 @@ Event_Handler::Event_Handler ( } void -Event_Handler::run (void) +Event_Handler::run () { send_notifications (); @@ -189,7 +189,7 @@ Event_Handler::handle_exception (ACE_HANDLE) } void -Event_Handler::send_notifications (void) +Event_Handler::send_notifications () { for (int i = 0; i != notifications_curr_; ++i) { @@ -210,7 +210,7 @@ Event_Handler::send_notifications (void) } bool -Event_Handler::done (void) const +Event_Handler::done () const { return (notifications_curr_ >= max_notifications_) && (notifications_sent_ == notifications_recv_); diff --git a/ACE/tests/Reactor_Notify_Test.cpp b/ACE/tests/Reactor_Notify_Test.cpp index 38207bf6aff..b258fdfe9f4 100644 --- a/ACE/tests/Reactor_Notify_Test.cpp +++ b/ACE/tests/Reactor_Notify_Test.cpp @@ -35,18 +35,18 @@ static const time_t SHORT_TIMEOUT = 2; class Quiet_Notify_Tester : public ACE_Task<ACE_NULL_SYNCH> { public: - Quiet_Notify_Tester (void) : result_ (0) {} - ~Quiet_Notify_Tester (void) { this->wait (); } + Quiet_Notify_Tester () : result_ (0) {} + ~Quiet_Notify_Tester () { this->wait (); } //FUZZ: disable check_for_lack_ACE_OS /// Start the reactor event thread. virtual int open (void * = 0); // Run the reactor event loop. - virtual int svc (void); + virtual int svc (); // Return the test result, 0 ok, -1 fail - int result (void) const { return this->result_; } + int result () const { return this->result_; } private: ACE_Reactor r_; @@ -61,7 +61,7 @@ Quiet_Notify_Tester::open (void *) } int -Quiet_Notify_Tester::svc (void) +Quiet_Notify_Tester::svc () { // Count on the main thread doing a notify in less than LONG_TIMEOUT // seconds. If we don't get it, report a failure. @@ -87,7 +87,7 @@ Quiet_Notify_Tester::svc (void) } static int -run_quiet_notify_test (void) +run_quiet_notify_test () { ACE_DEBUG ((LM_DEBUG, "(%t) Starting quiet notify test\n")); Quiet_Notify_Tester t; @@ -113,7 +113,7 @@ public: const ACE_Time_Value &tv); /// Destructor. - ~Supplier_Task (void); + ~Supplier_Task (); //FUZZ: disable check_for_lack_ACE_OS /// Make this an Active Object. @@ -125,7 +125,7 @@ public: /// Generates events and sends them to the <Reactor>'s <notify> /// method. - virtual int svc (void); + virtual int svc (); /// Releases the <waiter_> semaphore when called by the <Reactor>'s /// notify handler. @@ -139,7 +139,7 @@ public: virtual int handle_output (ACE_HANDLE); /// Release the <waiter_>. - void release (void); + void release (); private: /// Perform the notifications. @@ -169,7 +169,7 @@ private: }; void -Supplier_Task::release (void) +Supplier_Task::release () { this->waiter_.release (); } @@ -235,7 +235,7 @@ Supplier_Task::close (u_long) return 0; } -Supplier_Task::~Supplier_Task (void) +Supplier_Task::~Supplier_Task () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) ~Supplier_Task\n"))); @@ -292,7 +292,7 @@ Supplier_Task::perform_notifications (int notifications) } int -Supplier_Task::svc (void) +Supplier_Task::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) **** starting unlimited notifications test\n"))); @@ -456,7 +456,7 @@ class Purged_Notify : public ACE_Event_Handler }; static int -run_notify_purge_test (void) +run_notify_purge_test () { int status; ACE_Reactor *r = ACE_Reactor::instance (); diff --git a/ACE/tests/Reactor_Performance_Test.cpp b/ACE/tests/Reactor_Performance_Test.cpp index c241ebfeb3c..f41f81d411f 100644 --- a/ACE/tests/Reactor_Performance_Test.cpp +++ b/ACE/tests/Reactor_Performance_Test.cpp @@ -146,7 +146,7 @@ Write_Handler::open (void *) } int -Write_Handler::send_data (void) +Write_Handler::send_data () { int send_size = sizeof (ACE_ALPHABET) - 1; @@ -245,7 +245,7 @@ client (void *arg) // Sets up the correct reactor (based on platform and options). void -create_reactor (void) +create_reactor () { ACE_Reactor_Impl *impl = 0; diff --git a/ACE/tests/Reactor_Registration_Test.cpp b/ACE/tests/Reactor_Registration_Test.cpp index 3f11928bfe0..f77aa9817ac 100644 --- a/ACE/tests/Reactor_Registration_Test.cpp +++ b/ACE/tests/Reactor_Registration_Test.cpp @@ -29,7 +29,7 @@ public: ACE_HANDLE read, ACE_HANDLE write); - ~Event_Handler (void); + ~Event_Handler (); int handle_input (ACE_HANDLE fd = ACE_INVALID_HANDLE); @@ -86,7 +86,7 @@ Event_Handler::Event_Handler (ACE_Reactor &reactor, this->ok_ = true; } -Event_Handler::~Event_Handler (void) +Event_Handler::~Event_Handler () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Event_Handler::~Event_Handler for %@\n"), diff --git a/ACE/tests/Reactor_Remove_Resume_Test.cpp b/ACE/tests/Reactor_Remove_Resume_Test.cpp index ff2bd3898ad..f496a4d397b 100644 --- a/ACE/tests/Reactor_Remove_Resume_Test.cpp +++ b/ACE/tests/Reactor_Remove_Resume_Test.cpp @@ -36,13 +36,13 @@ public: protected: - virtual ~Bogus_Handler (void); + virtual ~Bogus_Handler (); - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE handle); virtual int handle_close (ACE_HANDLE handle, ACE_Reactor_Mask close_mask); - virtual int resume_handler (void); + virtual int resume_handler (); private: @@ -65,12 +65,12 @@ Bogus_Handler::Bogus_Handler (ACE_Reactor * reactor, ACE_Event_Handler::Reference_Counting_Policy::ENABLED); } -Bogus_Handler::~Bogus_Handler (void) +Bogus_Handler::~Bogus_Handler () { } ACE_HANDLE -Bogus_Handler::get_handle (void) const +Bogus_Handler::get_handle () const { return this->read_handle_; } @@ -102,7 +102,7 @@ Bogus_Handler::handle_close (ACE_HANDLE, } int -Bogus_Handler::resume_handler (void) +Bogus_Handler::resume_handler () { // We don't want the reactor to resume this event handler. return ACE_APPLICATION_RESUMES_HANDLER; @@ -119,20 +119,20 @@ public: bool & okay_to_close, bool suspension_test); - ACE_HANDLE write_handle (void) const; + ACE_HANDLE write_handle () const; protected: - virtual ~Bad_Handler (void); + virtual ~Bad_Handler (); private: - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE handle); virtual int handle_close (ACE_HANDLE handle, ACE_Reactor_Mask close_mask); - int handle_input_result (void) const; + int handle_input_result () const; private: @@ -164,12 +164,12 @@ Bad_Handler::Bad_Handler (ACE_Reactor * reactor, } -Bad_Handler::~Bad_Handler (void) +Bad_Handler::~Bad_Handler () { } ACE_HANDLE -Bad_Handler::get_handle (void) const +Bad_Handler::get_handle () const { return this->read_handle_; } @@ -243,7 +243,7 @@ Bad_Handler::handle_close (ACE_HANDLE, } int -Bad_Handler::handle_input_result (void) const +Bad_Handler::handle_input_result () const { return (this->suspension_test_ @@ -362,10 +362,10 @@ handle_events (ACE_Reactor & reactor, // ------------------------------------------------------------ -typedef auto_ptr<ACE_Reactor_Impl> (*reactor_factory_type) (void); +typedef auto_ptr<ACE_Reactor_Impl> (*reactor_factory_type) (); auto_ptr<ACE_Reactor_Impl> -tp_reactor_factory (void) +tp_reactor_factory () { ACE_DEBUG ((LM_INFO, ACE_TEXT ("Creating ACE_TP_Reactor.\n"))); diff --git a/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp b/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp index 083dda5e5ff..5ee4754a8f9 100644 --- a/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp +++ b/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp @@ -40,13 +40,13 @@ public: protected: - virtual ~Bogus_Handler (void); + virtual ~Bogus_Handler (); - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE handle); virtual int handle_close (ACE_HANDLE handle, ACE_Reactor_Mask close_mask); - virtual int resume_handler (void); + virtual int resume_handler (); private: @@ -69,12 +69,12 @@ Bogus_Handler::Bogus_Handler (ACE_Reactor * reactor, ACE_Event_Handler::Reference_Counting_Policy::ENABLED); } -Bogus_Handler::~Bogus_Handler (void) +Bogus_Handler::~Bogus_Handler () { } ACE_HANDLE -Bogus_Handler::get_handle (void) const +Bogus_Handler::get_handle () const { return this->read_handle_; } @@ -106,7 +106,7 @@ Bogus_Handler::handle_close (ACE_HANDLE, } int -Bogus_Handler::resume_handler (void) +Bogus_Handler::resume_handler () { // We don't want the reactor to resume this event handler. return ACE_APPLICATION_RESUMES_HANDLER; @@ -123,20 +123,20 @@ public: bool & okay_to_close, bool suspension_test); - ACE_HANDLE write_handle (void) const; + ACE_HANDLE write_handle () const; protected: - virtual ~Bad_Handler (void); + virtual ~Bad_Handler (); private: - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE handle); virtual int handle_close (ACE_HANDLE handle, ACE_Reactor_Mask close_mask); - int handle_input_result (void) const; + int handle_input_result () const; private: @@ -168,12 +168,12 @@ Bad_Handler::Bad_Handler (ACE_Reactor * reactor, } -Bad_Handler::~Bad_Handler (void) +Bad_Handler::~Bad_Handler () { } ACE_HANDLE -Bad_Handler::get_handle (void) const +Bad_Handler::get_handle () const { return this->read_handle_; } @@ -247,7 +247,7 @@ Bad_Handler::handle_close (ACE_HANDLE, } int -Bad_Handler::handle_input_result (void) const +Bad_Handler::handle_input_result () const { return (this->suspension_test_ @@ -366,10 +366,10 @@ handle_events (ACE_Reactor & reactor, // ------------------------------------------------------------ -typedef auto_ptr<ACE_Reactor_Impl> (*reactor_factory_type) (void); +typedef auto_ptr<ACE_Reactor_Impl> (*reactor_factory_type) (); auto_ptr<ACE_Reactor_Impl> -dev_poll_reactor_factory (void) +dev_poll_reactor_factory () { ACE_DEBUG ((LM_INFO, ACE_TEXT ("Creating ACE_Dev_Poll_Reactor.\n"))); diff --git a/ACE/tests/Reactor_Timer_Test.cpp b/ACE/tests/Reactor_Timer_Test.cpp index a3c2a3def0c..e1ed5034e6d 100644 --- a/ACE/tests/Reactor_Timer_Test.cpp +++ b/ACE/tests/Reactor_Timer_Test.cpp @@ -41,7 +41,7 @@ public: ACE_Reactor_Mask close_mask); /// Return our timer id. - long timer_id (void) const; + long timer_id () const; /// Set our timer id; void timer_id (long); @@ -106,7 +106,7 @@ Time_Handler::handle_timeout (const ACE_Time_Value &tv, } long -Time_Handler::timer_id (void) const +Time_Handler::timer_id () const { return this->timer_id_; } @@ -118,7 +118,7 @@ Time_Handler::timer_id (long t) } static void -test_registering_all_handlers (void) +test_registering_all_handlers () { ACE_Trace t (ACE_TEXT ("test_registering_all_handler"), __LINE__, @@ -141,7 +141,7 @@ test_registering_all_handlers (void) } static void -test_registering_one_handler (void) +test_registering_one_handler () { ACE_Trace t (ACE_TEXT ("test_registering_one_handler"), __LINE__, @@ -166,7 +166,7 @@ test_registering_one_handler (void) } static void -test_canceling_odd_timers (void) +test_canceling_odd_timers () { ACE_Trace t (ACE_TEXT ("test_canceling_odd_timers"), __LINE__, @@ -203,7 +203,7 @@ test_canceling_odd_timers (void) } static void -test_resetting_timer_intervals (void) +test_resetting_timer_intervals () { ACE_Trace t (ACE_TEXT ("test_resetting_timer_intervals"), __LINE__, diff --git a/ACE/tests/Reactors_Test.cpp b/ACE/tests/Reactors_Test.cpp index dad89ebb4a0..eea5ad4abaa 100644 --- a/ACE/tests/Reactors_Test.cpp +++ b/ACE/tests/Reactors_Test.cpp @@ -32,15 +32,15 @@ static const int MAX_TASKS = 20; class Test_Task : public ACE_Task<ACE_MT_SYNCH> { public: - Test_Task (void); - ~Test_Task (void); + Test_Task (); + ~Test_Task (); //FUZZ: disable check_for_lack_ACE_OS // = Task hooks. ///FUZZ: enable check_for_lack_ACE_OS virtual int open (void *args = 0); virtual int close (u_long flags = 0); - virtual int svc (void); + virtual int svc (); // = Event Handler hooks. virtual int handle_input (ACE_HANDLE handle); @@ -60,7 +60,7 @@ int Test_Task::task_count_ = 0; static ACE_Atomic_Op<ACE_Thread_Mutex, int> done_count = MAX_TASKS * 2; static ACE_Recursive_Thread_Mutex recursive_lock; -Test_Task::Test_Task (void) +Test_Task::Test_Task () : handled_ (0) { ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, recursive_lock); @@ -72,7 +72,7 @@ Test_Task::Test_Task (void) Test_Task::task_count_)); } -Test_Task::~Test_Task (void) +Test_Task::~Test_Task () { ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, recursive_lock); @@ -107,7 +107,7 @@ Test_Task::close (u_long) } int -Test_Task::svc (void) +Test_Task::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) svc\n"))); diff --git a/ACE/tests/Reader_Writer_Test.cpp b/ACE/tests/Reader_Writer_Test.cpp index a4cc9bad69c..a9c747f5f2f 100644 --- a/ACE/tests/Reader_Writer_Test.cpp +++ b/ACE/tests/Reader_Writer_Test.cpp @@ -57,7 +57,7 @@ static ACE_Atomic_Op<ACE_Thread_Mutex, long> current_writers; // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("usage: %n [-r n_readers] [-w n_writers] [-n iteration_count]\n"))); diff --git a/ACE/tests/Recursive_Condition_Bug_Test.cpp b/ACE/tests/Recursive_Condition_Bug_Test.cpp index 04e6224dca0..7d384d27d55 100644 --- a/ACE/tests/Recursive_Condition_Bug_Test.cpp +++ b/ACE/tests/Recursive_Condition_Bug_Test.cpp @@ -34,7 +34,7 @@ class Test_Handler; class Test_Task : public ACE_Task<ACE_MT_SYNCH> { public: - virtual int svc (void) + virtual int svc () { while (--max_iterations > 0) { diff --git a/ACE/tests/Recursive_Condition_Test.cpp b/ACE/tests/Recursive_Condition_Test.cpp index e1e596edf71..4d1ceac0837 100644 --- a/ACE/tests/Recursive_Condition_Test.cpp +++ b/ACE/tests/Recursive_Condition_Test.cpp @@ -27,8 +27,8 @@ typedef ACE_Thread_Timer_Queue_Adapter<ACE_Timer_Heap> Thread_Timer_Queue; class Test_Handler : public ACE_Event_Handler { public: - Test_Handler (void) : nr_expirations_ (0) {} - int nr_expirations (void) { return this->nr_expirations_; } + Test_Handler () : nr_expirations_ (0) {} + int nr_expirations () { return this->nr_expirations_; } virtual int handle_timeout (const ACE_Time_Value &, const void *arg) @@ -87,7 +87,7 @@ waiter (void *) } static int -test_1 (void) +test_1 () { protected_int = 1; if (ACE_Thread_Manager::instance()->spawn (waiter) == -1) @@ -116,7 +116,7 @@ test_1 (void) } static int -test_2 (void) +test_2 () { protected_int = 1; if (ACE_Thread_Manager::instance()->spawn (waiter) == -1) @@ -146,7 +146,7 @@ test_2 (void) } static int -test_3 (void) +test_3 () { protected_int = 1; if (ACE_Thread_Manager::instance()->spawn_n (4, waiter) == -1) @@ -174,7 +174,7 @@ test_3 (void) } static int -test_4 (void) +test_4 () { const int recurse_count = 3; diff --git a/ACE/tests/Refcounted_Auto_Ptr_Test.cpp b/ACE/tests/Refcounted_Auto_Ptr_Test.cpp index a8b8049fdb7..7c613d38b6e 100644 --- a/ACE/tests/Refcounted_Auto_Ptr_Test.cpp +++ b/ACE/tests/Refcounted_Auto_Ptr_Test.cpp @@ -35,7 +35,7 @@ Printer::Printer (const char *message) ++Printer::instance_count_; } -Printer::~Printer (void) +Printer::~Printer () { --Printer::instance_count_; ACE_DEBUG ((LM_DEBUG, @@ -45,7 +45,7 @@ Printer::~Printer (void) } void -Printer::print (void) +Printer::print () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) %C\n"), @@ -71,7 +71,7 @@ class Scheduler : public ACE_Task<ACE_SYNCH> friend class Method_Request_end; public: /// Constructor. - Scheduler (void); + Scheduler (); //FUZZ: disable check_for_lack_ACE_OS /// Initializer. @@ -82,16 +82,16 @@ public: //FUZZ: enable check_for_lack_ACE_OS /// Destructor. - virtual ~Scheduler (void); + virtual ~Scheduler (); // = These methods are part of the Active Object Proxy interface. void print (Printer_var &printer); - void end (void); + void end (); protected: /// Runs the Scheduler's event loop, which dequeues <Method_Requests> /// and dispatches them. - virtual int svc (void); + virtual int svc (); private: // = These are the <Scheduler> implementation details. @@ -107,10 +107,10 @@ class Method_Request_print : public ACE_Method_Request { public: explicit Method_Request_print (Printer_var &printer); - virtual ~Method_Request_print (void); + virtual ~Method_Request_print (); /// This is the entry point into the Active Object method. - virtual int call (void); + virtual int call (); private: Printer_var printer_; @@ -126,7 +126,7 @@ Method_Request_print::Method_Request_print (Printer_var &printer) printer_.count ())); } -Method_Request_print::~Method_Request_print (void) +Method_Request_print::~Method_Request_print () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Method_Request_print will be deleted.\n"))); @@ -136,7 +136,7 @@ Method_Request_print::~Method_Request_print (void) } int -Method_Request_print::call (void) +Method_Request_print::call () { // Dispatch the Servant's operation and store the result into the // Future. @@ -156,8 +156,8 @@ class Method_Request_end : public ACE_Method_Request { public: Method_Request_end (Scheduler *new_Prime_Scheduler); - virtual ~Method_Request_end (void); - virtual int call (void); + virtual ~Method_Request_end (); + virtual int call (); private: Scheduler *scheduler_; @@ -168,12 +168,12 @@ Method_Request_end::Method_Request_end (Scheduler *scheduler) { } -Method_Request_end::~Method_Request_end (void) +Method_Request_end::~Method_Request_end () { } int -Method_Request_end::call (void) +Method_Request_end::call () { // Shut down the scheduler by deactivating the activation queue's // underlying message queue - should pop all worker threads off their @@ -186,7 +186,7 @@ Method_Request_end::call (void) // Associates the activation queue with this task's message queue, // allowing easy access to the message queue for shutting it down // when it's time to stop this object's service threads. -Scheduler::Scheduler (void) +Scheduler::Scheduler () : activation_queue_ (msg_queue ()) { ACE_DEBUG ((LM_DEBUG, @@ -195,7 +195,7 @@ Scheduler::Scheduler (void) // Destructor -Scheduler::~Scheduler (void) +Scheduler::~Scheduler () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Scheduler will be destroyed\n"))); @@ -225,7 +225,7 @@ Scheduler::close (u_long) // Service.. int -Scheduler::svc (void) +Scheduler::svc () { for (;;) { @@ -253,7 +253,7 @@ Scheduler::svc (void) } void -Scheduler::end (void) +Scheduler::end () { this->activation_queue_.enqueue (new Method_Request_end (this)); } @@ -323,7 +323,7 @@ static bool expect (const ACE_TCHAR *name, return !fail; } -static int test_reset_release (void) +static int test_reset_release () { int errors = 0; @@ -381,7 +381,7 @@ static int test_reset_release (void) return errors; } -static int test_operator(void) +static int test_operator() { int errors = 0; diff --git a/ACE/tests/Refcounted_Event_Handler_Test_DevPoll.cpp b/ACE/tests/Refcounted_Event_Handler_Test_DevPoll.cpp index d0f233993e8..9f03d0e9e8a 100644 --- a/ACE/tests/Refcounted_Event_Handler_Test_DevPoll.cpp +++ b/ACE/tests/Refcounted_Event_Handler_Test_DevPoll.cpp @@ -41,7 +41,7 @@ public: int handle_output (ACE_HANDLE fd); - ACE_HANDLE get_handle (void) const; + ACE_HANDLE get_handle () const; // We need to add MSG_OOB data transfer to this test to check the // order of when <handle_exception> gets called. I tried with @@ -82,14 +82,14 @@ Handler::Handler (ACE_Reactor &reactor) } -Handler::~Handler (void) +Handler::~Handler () { this->pipe_.close (); } ACE_HANDLE -Handler::get_handle (void) const +Handler::get_handle () const { return this->pipe_.read_handle (); } diff --git a/ACE/tests/Reference_Counted_Event_Handler_Test.cpp b/ACE/tests/Reference_Counted_Event_Handler_Test.cpp index 4e5dc94ae29..aa02f058f99 100644 --- a/ACE/tests/Reference_Counted_Event_Handler_Test.cpp +++ b/ACE/tests/Reference_Counted_Event_Handler_Test.cpp @@ -43,7 +43,7 @@ public: Reference_Counted_Event_Handler (int &events); - ~Reference_Counted_Event_Handler (void); + ~Reference_Counted_Event_Handler (); int handle_input (ACE_HANDLE); @@ -57,9 +57,9 @@ public: int handle_close (ACE_HANDLE, ACE_Reactor_Mask); - ACE_Event_Handler::Reference_Count add_reference (void); + ACE_Event_Handler::Reference_Count add_reference (); - ACE_Event_Handler::Reference_Count remove_reference (void); + ACE_Event_Handler::Reference_Count remove_reference (); ACE_Pipe pipe_; @@ -81,7 +81,7 @@ Reference_Counted_Event_Handler::Reference_Counted_Event_Handler (int &events) this->reference_count_.load ())); } -Reference_Counted_Event_Handler::~Reference_Counted_Event_Handler (void) +Reference_Counted_Event_Handler::~Reference_Counted_Event_Handler () { ACE_DEBUG ((LM_DEBUG, "Reference count in ~Reference_Counted_Event_Handler() is %d\n", @@ -182,7 +182,7 @@ Reference_Counted_Event_Handler::handle_close (ACE_HANDLE handle, } ACE_Event_Handler::Reference_Count -Reference_Counted_Event_Handler::add_reference (void) +Reference_Counted_Event_Handler::add_reference () { ACE_Event_Handler::Reference_Count reference_count = this->ACE_Event_Handler::add_reference (); @@ -195,7 +195,7 @@ Reference_Counted_Event_Handler::add_reference (void) } ACE_Event_Handler::Reference_Count -Reference_Counted_Event_Handler::remove_reference (void) +Reference_Counted_Event_Handler::remove_reference () { ACE_Event_Handler::Reference_Count reference_count = this->ACE_Event_Handler::remove_reference (); @@ -474,7 +474,7 @@ public: Simple_Event_Handler (int &events, int close_count); - ~Simple_Event_Handler (void); + ~Simple_Event_Handler (); int handle_input (ACE_HANDLE); @@ -509,7 +509,7 @@ Simple_Event_Handler::Simple_Event_Handler (int &events, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Simple_Event_Handler()\n"))); } -Simple_Event_Handler::~Simple_Event_Handler (void) +Simple_Event_Handler::~Simple_Event_Handler () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("~Simple_Event_Handler()\n"))); @@ -772,16 +772,16 @@ public: Closed_In_Upcall_Event_Handler (int &events); - ~Closed_In_Upcall_Event_Handler (void); + ~Closed_In_Upcall_Event_Handler (); int handle_input (ACE_HANDLE); int handle_close (ACE_HANDLE, ACE_Reactor_Mask); - ACE_Event_Handler::Reference_Count add_reference (void); + ACE_Event_Handler::Reference_Count add_reference (); - ACE_Event_Handler::Reference_Count remove_reference (void); + ACE_Event_Handler::Reference_Count remove_reference (); ACE_Pipe pipe_; @@ -803,7 +803,7 @@ Closed_In_Upcall_Event_Handler::Closed_In_Upcall_Event_Handler (int &events) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Closed_In_Upcall_Event_Handler()\n"))); } -Closed_In_Upcall_Event_Handler::~Closed_In_Upcall_Event_Handler (void) +Closed_In_Upcall_Event_Handler::~Closed_In_Upcall_Event_Handler () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("~Closed_In_Upcall_Event_Handler()\n"))); @@ -860,7 +860,7 @@ Closed_In_Upcall_Event_Handler::handle_close (ACE_HANDLE handle, } ACE_Event_Handler::Reference_Count -Closed_In_Upcall_Event_Handler::add_reference (void) +Closed_In_Upcall_Event_Handler::add_reference () { ACE_Event_Handler::Reference_Count reference_count = this->ACE_Event_Handler::add_reference (); @@ -873,7 +873,7 @@ Closed_In_Upcall_Event_Handler::add_reference (void) } ACE_Event_Handler::Reference_Count -Closed_In_Upcall_Event_Handler::remove_reference (void) +Closed_In_Upcall_Event_Handler::remove_reference () { ACE_Event_Handler::Reference_Count reference_count = this->ACE_Event_Handler::remove_reference (); @@ -940,11 +940,11 @@ template <class REACTOR_IMPLEMENTATION> class test { public: - test (void); + test (); }; template <class REACTOR_IMPLEMENTATION> -test<REACTOR_IMPLEMENTATION>::test (void) +test<REACTOR_IMPLEMENTATION>::test () { if (test_simple_event_handler) simple (new REACTOR_IMPLEMENTATION); diff --git a/ACE/tests/SOCK_Connector_Test.cpp b/ACE/tests/SOCK_Connector_Test.cpp index cc878c5da5f..78cabecb0d0 100644 --- a/ACE/tests/SOCK_Connector_Test.cpp +++ b/ACE/tests/SOCK_Connector_Test.cpp @@ -142,7 +142,7 @@ find_another_host (ACE_TCHAR other_host[]) } static int -fail_no_listener_nonblocking (void) +fail_no_listener_nonblocking () { ACE_TCHAR test_host[MAXHOSTNAMELEN], test_addr[MAXHOSTNAMELEN + 8]; int status; @@ -224,7 +224,7 @@ fail_no_listener_nonblocking (void) // <ACE::handle_timed_complete> does checks on some systems. static int -succeed_nonblocking (void) +succeed_nonblocking () { ACE_TCHAR test_host[MAXHOSTNAMELEN], test_addr[MAXHOSTNAMELEN + 8]; int status; diff --git a/ACE/tests/SOCK_Dgram_Bcast_Test.cpp b/ACE/tests/SOCK_Dgram_Bcast_Test.cpp index 8951da96f1d..950aeeb67e9 100644 --- a/ACE/tests/SOCK_Dgram_Bcast_Test.cpp +++ b/ACE/tests/SOCK_Dgram_Bcast_Test.cpp @@ -197,7 +197,7 @@ int run_auto_test (const ACE_TCHAR *prog_name) return (receiver_exit_code); } -void print_usage (void) +void print_usage () { ACE_OS::printf("Usage:SOCK_Dgram_Bast_Test [-p port] [-n dgrams_no] [-t timeout_ms] [-s] [-r]\n" "\tp broadcast port [14521]\n" diff --git a/ACE/tests/SOCK_Netlink_Test.cpp b/ACE/tests/SOCK_Netlink_Test.cpp index decba0fbc08..c2d2c07f045 100644 --- a/ACE/tests/SOCK_Netlink_Test.cpp +++ b/ACE/tests/SOCK_Netlink_Test.cpp @@ -200,10 +200,10 @@ class Secondary_Ipaddr_Handler : public ACE_Event_Handler public: // Default constructor - Secondary_Ipaddr_Handler (void); + Secondary_Ipaddr_Handler (); // Destructor - virtual ~Secondary_Ipaddr_Handler (void); + virtual ~Secondary_Ipaddr_Handler (); //FUZZ: disable check_for_lack_ACE_OS // Initialization. Schedules a timer to run start the business. @@ -214,7 +214,7 @@ public: const char *const if_name); // Returns reference to netlink socket. Necessary for reactor. - virtual ACE_HANDLE get_handle (void) const; + virtual ACE_HANDLE get_handle () const; /** * Takes care of the input. Reads the incoming messages, @@ -418,7 +418,7 @@ Secondary_Ipaddr_Handler::open (ACE_Reactor *const reactor, } ACE_HANDLE -Secondary_Ipaddr_Handler::get_handle (void) const +Secondary_Ipaddr_Handler::get_handle () const { return this->socket_.get_handle (); } diff --git a/ACE/tests/SOCK_SEQPACK_SCTP_Test.cpp b/ACE/tests/SOCK_SEQPACK_SCTP_Test.cpp index 28d9de04d4c..e59d8a6925c 100644 --- a/ACE/tests/SOCK_SEQPACK_SCTP_Test.cpp +++ b/ACE/tests/SOCK_SEQPACK_SCTP_Test.cpp @@ -328,7 +328,7 @@ spawn_test(bool ipv6_test) } int -do_test(void) +do_test() { spawn_test(false); diff --git a/ACE/tests/SOCK_Send_Recv_Test.cpp b/ACE/tests/SOCK_Send_Recv_Test.cpp index eeb406cb1cf..587750e5f66 100644 --- a/ACE/tests/SOCK_Send_Recv_Test.cpp +++ b/ACE/tests/SOCK_Send_Recv_Test.cpp @@ -372,7 +372,7 @@ server (void *arg) #endif /* !ACE_LACKS_FORK || ACE_HAS_THREADS */ void -spawn (void) +spawn () { // Acceptor ACE_SOCK_Acceptor peer_acceptor; diff --git a/ACE/tests/SOCK_Test.cpp b/ACE/tests/SOCK_Test.cpp index e3405eaeabe..a283827c9d2 100644 --- a/ACE/tests/SOCK_Test.cpp +++ b/ACE/tests/SOCK_Test.cpp @@ -180,7 +180,7 @@ server (void *arg) } void -spawn (void) +spawn () { // Acceptor ACE_SOCK_Acceptor peer_acceptor; diff --git a/ACE/tests/SV_Shared_Memory_Test.cpp b/ACE/tests/SV_Shared_Memory_Test.cpp index ff0b2dc2d3c..ab3a6aba346 100644 --- a/ACE/tests/SV_Shared_Memory_Test.cpp +++ b/ACE/tests/SV_Shared_Memory_Test.cpp @@ -34,7 +34,7 @@ static ACE_Malloc<ACE_SHARED_MEMORY_POOL, ACE_SV_Semaphore_Simple> & -myallocator (void) +myallocator () { static ACE_Malloc<ACE_SHARED_MEMORY_POOL, ACE_SV_Semaphore_Simple> myallocator; diff --git a/ACE/tests/Semaphore_Test.cpp b/ACE/tests/Semaphore_Test.cpp index 3f35395ed18..a2f240e4185 100644 --- a/ACE/tests/Semaphore_Test.cpp +++ b/ACE/tests/Semaphore_Test.cpp @@ -57,7 +57,7 @@ static size_t test_timeout_count = 3; // Tests the amount of time spent in a timed wait. static int -test_timeout (void) +test_timeout () { int status = 0; @@ -110,7 +110,7 @@ test_timeout (void) // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("usage: %n [-s n_release_count] [-w n_workers] [-n iteration_count]\n"))); diff --git a/ACE/tests/Sendfile_Test.cpp b/ACE/tests/Sendfile_Test.cpp index 509dea6359e..73ad0224c49 100644 --- a/ACE/tests/Sendfile_Test.cpp +++ b/ACE/tests/Sendfile_Test.cpp @@ -262,7 +262,7 @@ server (void *arg) #endif /* !ACE_LACKS_FORK || ACE_HAS_THREADS */ void -spawn (void) +spawn () { // Acceptor ACE_SOCK_Acceptor peer_acceptor; diff --git a/ACE/tests/Service_Config_DLL.cpp b/ACE/tests/Service_Config_DLL.cpp index 7befdeb437c..8b3e61d973b 100644 --- a/ACE/tests/Service_Config_DLL.cpp +++ b/ACE/tests/Service_Config_DLL.cpp @@ -35,7 +35,7 @@ invoke_service_config (void *arg) return 0; } -Service_Config_DLL::Service_Config_DLL (void) +Service_Config_DLL::Service_Config_DLL () { ACE_OS::memset (this->directive_[0], 0, BUFSIZ * sizeof (ACE_TCHAR)); ACE_OS::memset (this->directive_[1], 0, BUFSIZ * sizeof (ACE_TCHAR)); @@ -107,13 +107,13 @@ Service_Config_DLL::init (int argc, ACE_TCHAR *argv[]) } int -Service_Config_DLL::fini (void) +Service_Config_DLL::fini () { return 0; } int -Service_Config_DLL::svc (void) +Service_Config_DLL::svc () { if (ACE_Thread_Manager::instance ()->spawn (invoke_service_config, this->directive_[1]) == -1) @@ -243,7 +243,7 @@ Refuses_Init::init (int, ACE_TCHAR *[]) /// Terminates object when dynamic unlinking occurs. int -Refuses_Init::fini (void) +Refuses_Init::fini () { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Refuses_Init::fini should not be called!\n"))); diff --git a/ACE/tests/Service_Config_Stream_DLL.cpp b/ACE/tests/Service_Config_Stream_DLL.cpp index a31165cc425..c33e875e931 100644 --- a/ACE/tests/Service_Config_Stream_DLL.cpp +++ b/ACE/tests/Service_Config_Stream_DLL.cpp @@ -33,7 +33,7 @@ Test_Task::init (int, ACE_TCHAR *[]) } int -Test_Task::fini (void) +Test_Task::fini () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("finalizing %s\n"), diff --git a/ACE/tests/Service_Config_Stream_Test.cpp b/ACE/tests/Service_Config_Stream_Test.cpp index 4d86597a457..7bbf520fd92 100644 --- a/ACE/tests/Service_Config_Stream_Test.cpp +++ b/ACE/tests/Service_Config_Stream_Test.cpp @@ -56,7 +56,7 @@ public: return 0; } - int fini (void) + int fini () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("finalizing %s\n"), diff --git a/ACE/tests/Service_Config_Test.cpp b/ACE/tests/Service_Config_Test.cpp index 0f18dec845b..faecd5b834b 100644 --- a/ACE/tests/Service_Config_Test.cpp +++ b/ACE/tests/Service_Config_Test.cpp @@ -55,7 +55,7 @@ class Test_Singleton { public: static Test_Singleton *instance (u_short variety); - ~Test_Singleton (void); + ~Test_Singleton (); private: u_short variety_; @@ -111,7 +111,7 @@ Test_Singleton::Test_Singleton (u_short variety) // We can't reliably use ACE_Log_Msg in a destructor that is called by // ACE_Object_Manager. Yet. -Test_Singleton::~Test_Singleton (void) +Test_Singleton::~Test_Singleton () { /* ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Test_Singleton %u dtor\n"), variety_)); */ diff --git a/ACE/tests/TP_Reactor_Test.cpp b/ACE/tests/TP_Reactor_Test.cpp index 50e34740ada..50391d41809 100644 --- a/ACE/tests/TP_Reactor_Test.cpp +++ b/ACE/tests/TP_Reactor_Test.cpp @@ -124,19 +124,19 @@ public: class MyTask : public ACE_Task<ACE_MT_SYNCH> { public: - MyTask (void): sem_ ((unsigned int) 0), + MyTask (): sem_ ((unsigned int) 0), my_reactor_ (0) {} virtual ~MyTask () { stop (); } - virtual int svc (void); + virtual int svc (); int start (int num_threads); - int stop (void); + int stop (); private: - int create_reactor (void); - int delete_reactor (void); + int create_reactor (); + int delete_reactor (); ACE_SYNCH_RECURSIVE_MUTEX lock_; ACE_Thread_Semaphore sem_; @@ -144,7 +144,7 @@ private: }; int -MyTask::create_reactor (void) +MyTask::create_reactor () { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, monitor, @@ -172,7 +172,7 @@ MyTask::create_reactor (void) } int -MyTask::delete_reactor (void) +MyTask::delete_reactor () { ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, monitor, @@ -213,7 +213,7 @@ MyTask::start (int num_threads) int -MyTask::stop (void) +MyTask::stop () { if (this->my_reactor_ != 0) { @@ -237,7 +237,7 @@ MyTask::stop (void) } int -MyTask::svc (void) +MyTask::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%t) MyTask started\n"))); @@ -255,7 +255,7 @@ MyTask::svc (void) // ************************************************************* -Acceptor::Acceptor (void) +Acceptor::Acceptor () : ACE_Acceptor<Receiver,ACE_SOCK_ACCEPTOR> ((ACE_Reactor *) 0), sessions_ (0), total_snd_(0), @@ -269,14 +269,14 @@ Acceptor::Acceptor (void) this->list_receivers_[i] =0; } -Acceptor::~Acceptor (void) +Acceptor::~Acceptor () { this->reactor (0); stop (); } void -Acceptor::stop (void) +Acceptor::stop () { // this method can be called only after reactor event loop id done // in all threads @@ -384,7 +384,7 @@ Receiver::Receiver (Acceptor * acceptor, size_t index) } -Receiver::~Receiver (void) +Receiver::~Receiver () { this->reactor (0); if (acceptor_ != 0) @@ -405,7 +405,7 @@ Receiver::~Receiver (void) } int -Receiver::check_destroy (void) +Receiver::check_destroy () { if (flg_mask_ == ACE_Event_Handler::NULL_MASK) return -1; @@ -614,7 +614,7 @@ Receiver::handle_output (ACE_HANDLE h) // ************************************************************* -Connector::Connector (void) +Connector::Connector () : ACE_Connector<Sender,ACE_SOCK_CONNECTOR> ((ACE_Reactor *) 0), sessions_ (0), total_snd_(0), @@ -628,7 +628,7 @@ Connector::Connector (void) this->list_senders_[i] = 0; } -Connector::~Connector (void) +Connector::~Connector () { this->reactor (0); stop (); @@ -763,7 +763,7 @@ Sender::Sender (Connector* connector, size_t index) } -Sender::~Sender (void) +Sender::~Sender () { this->reactor (0); if (connector_ != 0) @@ -784,7 +784,7 @@ Sender::~Sender (void) } int -Sender::check_destroy (void) +Sender::check_destroy () { if (flg_mask_ == ACE_Event_Handler::NULL_MASK) return -1; @@ -815,7 +815,7 @@ int Sender::open (void *) } int -Sender::initiate_write (void) +Sender::initiate_write () { if ( this->msg_queue ()->message_count () < 20) // flow control { diff --git a/ACE/tests/TSS_Leak_Test.cpp b/ACE/tests/TSS_Leak_Test.cpp index 2b7bf87e453..0c4d33daa77 100644 --- a/ACE/tests/TSS_Leak_Test.cpp +++ b/ACE/tests/TSS_Leak_Test.cpp @@ -20,7 +20,7 @@ struct Task : ACE_Task_Base { explicit Task (ACE_TSS<X> *tss) : tss_(tss) {} - int svc (void) + int svc () { X *x = *tss_; ACE_UNUSED_ARG (x); diff --git a/ACE/tests/Task_Ex_Test.cpp b/ACE/tests/Task_Ex_Test.cpp index abe6e5b7bf9..58cabe0f0fe 100644 --- a/ACE/tests/Task_Ex_Test.cpp +++ b/ACE/tests/Task_Ex_Test.cpp @@ -43,7 +43,7 @@ public: int open (void*); /// svc thread entry point - virtual int svc (void); + virtual int svc (); private: }; diff --git a/ACE/tests/Task_Group_Test.cpp b/ACE/tests/Task_Group_Test.cpp index 93017948af8..6ea79c9b501 100644 --- a/ACE/tests/Task_Group_Test.cpp +++ b/ACE/tests/Task_Group_Test.cpp @@ -28,11 +28,11 @@ class Waiter_Task : public ACE_Task_Base public: Waiter_Task (ACE_Thread_Manager* tm = 0) : ACE_Task_Base (tm) {} - virtual int svc(void); + virtual int svc(); }; int -Waiter_Task::svc(void) +Waiter_Task::svc() { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t|grp_id=%d) waiting for thread cancellation.\n"), this->grp_id ())); diff --git a/ACE/tests/Task_Test.cpp b/ACE/tests/Task_Test.cpp index 967fa03f5fb..de05a529df7 100644 --- a/ACE/tests/Task_Test.cpp +++ b/ACE/tests/Task_Test.cpp @@ -47,7 +47,7 @@ public: /// Iterate <n_iterations> time printing off a message and "waiting" /// for all other threads to complete this iteration. - virtual int svc (void); + virtual int svc (); private: /// Reference to the tester barrier. This controls each iteration of @@ -94,7 +94,7 @@ Barrier_Task::close (u_long) // Iterate <n_iterations> time printing off a message and "waiting" // for all other threads to complete this iteration. int -Barrier_Task::svc (void) +Barrier_Task::svc () { for (int iterations = 1; iterations <= this->n_iterations_; diff --git a/ACE/tests/Task_Wait_Test.cpp b/ACE/tests/Task_Wait_Test.cpp index ba56ebc1737..2a798a0923d 100644 --- a/ACE/tests/Task_Wait_Test.cpp +++ b/ACE/tests/Task_Wait_Test.cpp @@ -35,7 +35,7 @@ class Do_Nothing_Task : public ACE_Task_Base { public: virtual int close (u_long flags = 0); - virtual int svc (void); + virtual int svc (); }; // close tries to wait for other threads. There aren't any, but as long as @@ -54,7 +54,7 @@ Do_Nothing_Task::close (u_long) // svc just waits a second then exits. int -Do_Nothing_Task::svc (void) +Do_Nothing_Task::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Task 0x%x, thread %t waiting to exit\n"), diff --git a/ACE/tests/Test_Output.cpp b/ACE/tests/Test_Output.cpp index dc236ce0567..a886cfed6a3 100644 --- a/ACE/tests/Test_Output.cpp +++ b/ACE/tests/Test_Output.cpp @@ -35,7 +35,7 @@ ACE_Test_Output *ACE_Test_Output::instance_ = 0; -ACE_Test_Output::ACE_Test_Output (void) +ACE_Test_Output::ACE_Test_Output () : output_file_ (0) { #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) @@ -43,7 +43,7 @@ ACE_Test_Output::ACE_Test_Output (void) #endif /* ACE_LACKS_IOSTREAM_TOTALLY */ } -ACE_Test_Output::~ACE_Test_Output (void) +ACE_Test_Output::~ACE_Test_Output () { #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) ACE_LOG_MSG->msg_ostream (&cerr, 0); @@ -59,7 +59,7 @@ ACE_Test_Output::~ACE_Test_Output (void) } OFSTREAM * -ACE_Test_Output::output_file (void) +ACE_Test_Output::output_file () { // the output_file_ is loaned to ACE_LOG_MSG // and something else might destroy and/or change the stream @@ -160,7 +160,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) } void -ACE_Test_Output::close (void) +ACE_Test_Output::close () { if (this->output_file_ && (this->output_file_ == ACE_LOG_MSG->msg_ostream ())) @@ -199,19 +199,19 @@ ACE_Test_Output::instance () } const ACE_TCHAR * -ACE_Test_Output::dll_name (void) +ACE_Test_Output::dll_name () { return ACE_TEXT ("Test_Output"); } const ACE_TCHAR * -ACE_Test_Output::name (void) +ACE_Test_Output::name () { return ACE_TEXT ("ACE_Test_Output"); } void -ACE_Test_Output::close_singleton (void) +ACE_Test_Output::close_singleton () { delete ACE_Test_Output::instance_; ACE_Test_Output::instance_ = 0; diff --git a/ACE/tests/Thread_Attrs_Test.cpp b/ACE/tests/Thread_Attrs_Test.cpp index 8a6f4317e11..9fc26475fae 100644 --- a/ACE/tests/Thread_Attrs_Test.cpp +++ b/ACE/tests/Thread_Attrs_Test.cpp @@ -27,7 +27,7 @@ public: //FUZZ: enable check_for_lack_ACE_OS // Check the cancel settings against what is expected then exit. - virtual int svc (void); + virtual int svc (); /// Returns true iff settings match what was requested. bool operator! (); @@ -50,7 +50,7 @@ Cancel_Check::Cancel_Check (bool enable, bool async) } int -Cancel_Check::svc (void) +Cancel_Check::svc () { #if defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_CANCEL) int state; @@ -136,7 +136,7 @@ public: //FUZZ: enable check_for_lack_ACE_OS /// Check the stack size against what is expected then exit. - virtual int svc (void); + virtual int svc (); /// Returns true iff failed_ == false. bool operator! (); @@ -160,7 +160,7 @@ Stack_Size_Check::Stack_Size_Check (size_t stack_size) } int -Stack_Size_Check::svc (void) +Stack_Size_Check::svc () { size_t my_size = 0; diff --git a/ACE/tests/Thread_Creation_Threshold_Test.cpp b/ACE/tests/Thread_Creation_Threshold_Test.cpp index 2a13f4a5aa7..da7e88ccde1 100644 --- a/ACE/tests/Thread_Creation_Threshold_Test.cpp +++ b/ACE/tests/Thread_Creation_Threshold_Test.cpp @@ -57,11 +57,11 @@ public: Thread_Pool (int n_threads); /// Destructor... - ~Thread_Pool (void); + ~Thread_Pool (); /// Iterate <n_iterations> time printing off a message and "waiting" /// for all other threads to complete this iteration. - virtual int svc (void); + virtual int svc (); /// Start the threads in the pool. void start(); @@ -103,7 +103,7 @@ Thread_Pool::operator!() return ! this->failed_; } -Thread_Pool::~Thread_Pool (void) +Thread_Pool::~Thread_Pool () { } @@ -139,7 +139,7 @@ Thread_Pool::start () } int -Thread_Pool::svc (void) +Thread_Pool::svc () { unsigned long t = ++this->total_activated_threads_; if (PRINT_DEBUG_MSGS) // change this to 'true' for debugging diff --git a/ACE/tests/Thread_Manager_Test.cpp b/ACE/tests/Thread_Manager_Test.cpp index a31d7f1ee12..192c4ad8d48 100644 --- a/ACE/tests/Thread_Manager_Test.cpp +++ b/ACE/tests/Thread_Manager_Test.cpp @@ -147,7 +147,7 @@ class ThrMgr_Task : public ACE_Task_Base { public: ThrMgr_Task (ACE_Thread_Manager *); - virtual int svc (void); + virtual int svc (); static int errors; }; @@ -162,7 +162,7 @@ ThrMgr_Task::ThrMgr_Task (ACE_Thread_Manager *mgr) // svc just waits til it's been cancelled, then exits. int -ThrMgr_Task::svc (void) +ThrMgr_Task::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Task 0x%x, thread %t waiting to be cancelled\n"), diff --git a/ACE/tests/Thread_Mutex_Test.cpp b/ACE/tests/Thread_Mutex_Test.cpp index de1bf1f59e9..ce31f88090a 100644 --- a/ACE/tests/Thread_Mutex_Test.cpp +++ b/ACE/tests/Thread_Mutex_Test.cpp @@ -236,7 +236,7 @@ test (void *args) #endif /* ACE_HAS_THREADS */ static void -spawn (void) +spawn () { #if defined (ACE_HAS_THREADS) ACE_TEST_MUTEX mutex; diff --git a/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp b/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp index 3770f3d63ec..a4691f8fc3d 100644 --- a/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp +++ b/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp @@ -149,12 +149,12 @@ Request_Handler::open (void *arg) return result; } -Request_Handler::~Request_Handler (void) +Request_Handler::~Request_Handler () { } int -Request_Handler::resume_handler (void) +Request_Handler::resume_handler () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) resume_handler () called\n"))); diff --git a/ACE/tests/Thread_Pool_Test.cpp b/ACE/tests/Thread_Pool_Test.cpp index 6e4d0a061bf..2e477d87013 100644 --- a/ACE/tests/Thread_Pool_Test.cpp +++ b/ACE/tests/Thread_Pool_Test.cpp @@ -45,14 +45,14 @@ public: Thread_Pool (int n_threads); /// Destructor... - ~Thread_Pool (void); + ~Thread_Pool (); /** * Activate the task's thread pool, produce the messages that are * consumed by the threads in the thread pool, and demonstate how to * shutdown using the <ACE_Message_Queue::deactivate> method. */ - int test_queue_deactivation_shutdown (void); + int test_queue_deactivation_shutdown (); /** * Activate the task's thread pool, produce the messages that are, @@ -60,11 +60,11 @@ public: * thread pool, and demonstrate how to shutdown by enqueueing * "empty" messages into the queue. */ - int test_empty_message_shutdown (void); + int test_empty_message_shutdown (); /// Iterate <n_iterations> time printing off a message and "waiting" /// for all other threads to complete this iteration. - virtual int svc (void); + virtual int svc (); /// Allows the producer to pass messages to the <Thread_Pool>. virtual int put (ACE_Message_Block *mb, @@ -87,7 +87,7 @@ private: int n_threads_; }; -Thread_Pool::~Thread_Pool (void) +Thread_Pool::~Thread_Pool () { } @@ -117,7 +117,7 @@ Thread_Pool::put (ACE_Message_Block *mb, // other threads to complete this iteration. int -Thread_Pool::svc (void) +Thread_Pool::svc () { // Keep looping, reading a message out of the queue, until we get a // message with a length == 0, which signals us to quit. @@ -195,7 +195,7 @@ Thread_Pool::open (void *) // shutdown using the <ACE_Message_Queue::deactivate> method. int -Thread_Pool::test_queue_deactivation_shutdown (void) +Thread_Pool::test_queue_deactivation_shutdown () { if (this->open () == -1) return -1; @@ -287,7 +287,7 @@ Thread_Pool::test_queue_deactivation_shutdown (void) // messages into the queue. int -Thread_Pool::test_empty_message_shutdown (void) +Thread_Pool::test_empty_message_shutdown () { if (this->open () == -1) return -1; diff --git a/ACE/tests/Timer_Cancellation_Test.cpp b/ACE/tests/Timer_Cancellation_Test.cpp index b48f2a8849c..d60b0e62cc4 100644 --- a/ACE/tests/Timer_Cancellation_Test.cpp +++ b/ACE/tests/Timer_Cancellation_Test.cpp @@ -20,14 +20,14 @@ class Deadlock : public ACE_Task_Base { public: - int svc (void); + int svc (); int handle_timeout (const ACE_Time_Value ¤t_time, const void *act); }; int -Deadlock::svc (void) +Deadlock::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Deadlock starts accessing Reactor and Timer Queue....\n"))); diff --git a/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp b/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp index c1e0925d203..f6a4975bbaf 100644 --- a/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp +++ b/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp @@ -48,7 +48,7 @@ public: Reference_Counted_Event_Handler (int expected_number_of_handle_close_calls); - ~Reference_Counted_Event_Handler (void); + ~Reference_Counted_Event_Handler (); int handle_timeout (const ACE_Time_Value &, const void *); @@ -73,7 +73,7 @@ Reference_Counted_Event_Handler::Reference_Counted_Event_Handler (int expected_n this->reference_count_.load ())); } -Reference_Counted_Event_Handler::~Reference_Counted_Event_Handler (void) +Reference_Counted_Event_Handler::~Reference_Counted_Event_Handler () { if (debug) ACE_DEBUG ((LM_DEBUG, @@ -350,9 +350,9 @@ class Simple_Event_Handler : public ACE_Event_Handler { public: - Simple_Event_Handler (void); + Simple_Event_Handler (); - ~Simple_Event_Handler (void); + ~Simple_Event_Handler (); int handle_timeout (const ACE_Time_Value &, const void *); @@ -361,14 +361,14 @@ public: ACE_Reactor_Mask); }; -Simple_Event_Handler::Simple_Event_Handler (void) +Simple_Event_Handler::Simple_Event_Handler () { if (debug) ACE_DEBUG ((LM_DEBUG, "Simple_Event_Handler()\n")); } -Simple_Event_Handler::~Simple_Event_Handler (void) +Simple_Event_Handler::~Simple_Event_Handler () { if (debug) ACE_DEBUG ((LM_DEBUG, diff --git a/ACE/tests/Timer_Queue_Test.cpp b/ACE/tests/Timer_Queue_Test.cpp index 563c988b984..298f25353d3 100644 --- a/ACE/tests/Timer_Queue_Test.cpp +++ b/ACE/tests/Timer_Queue_Test.cpp @@ -52,7 +52,7 @@ static long *timer_ids = 0; class Example_Handler : public ACE_Event_Handler { public: - Example_Handler (void): close_count_ (0) {} + Example_Handler (): close_count_ (0) {} virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask mask) { @@ -82,7 +82,7 @@ public: struct Interval_Handler : public ACE_Event_Handler { - Interval_Handler (void) : trip_count_ (0) { } + Interval_Handler () : trip_count_ (0) { } virtual int handle_timeout (const ACE_Time_Value & , const void *) { @@ -521,7 +521,7 @@ test_performance (ACE_Timer_Queue *tq, // of ACE_Timer_Heap timer IDs around the boundary of having to enlarge // the heap. static void -test_unique_timer_heap_ids (void) +test_unique_timer_heap_ids () { Example_Handler eh; ACE_Timer_Heap timer_heap (44); diff --git a/ACE/tests/Token_Strategy_Test.cpp b/ACE/tests/Token_Strategy_Test.cpp index ae53a319d69..765ee91f7f1 100644 --- a/ACE/tests/Token_Strategy_Test.cpp +++ b/ACE/tests/Token_Strategy_Test.cpp @@ -33,13 +33,13 @@ public: Token_Strategy_Test (ACE_Token::QUEUEING_STRATEGY strategy = ACE_Token::FIFO, int threads = 5, int invocations = 10); - ~Token_Strategy_Test (void); + ~Token_Strategy_Test (); //FUZZ: disable check_for_lack_ACE_OS int open (void *a = 0); //FUZZ: enable check_for_lack_ACE_OS - int svc (void); + int svc (); private: // Number of threads for the test, must be 5 or more. @@ -105,7 +105,7 @@ Token_Strategy_Test::Token_Strategy_Test (ACE_Token::QUEUEING_STRATEGY strategy, this->invocations_)); } -Token_Strategy_Test::~Token_Strategy_Test (void) +Token_Strategy_Test::~Token_Strategy_Test () {} int @@ -121,7 +121,7 @@ Token_Strategy_Test::open (void *) } int -Token_Strategy_Test::svc (void) +Token_Strategy_Test::svc () { int current = this->active_.value (); ACE_Auto_IncDec<ACE_Atomic_Op<ACE_Thread_Mutex, int> > active_counter (this->active_); diff --git a/ACE/tests/UUID_Test.cpp b/ACE/tests/UUID_Test.cpp index 7585d6b173e..b003ee132af 100644 --- a/ACE/tests/UUID_Test.cpp +++ b/ACE/tests/UUID_Test.cpp @@ -17,11 +17,11 @@ class Tester { public: - int test (void); + int test (); }; int -Tester::test (void) +Tester::test () { int retval = 0; diff --git a/ACE/tests/Upgradable_RW_Test.cpp b/ACE/tests/Upgradable_RW_Test.cpp index f7bf15892ca..e0f02830709 100644 --- a/ACE/tests/Upgradable_RW_Test.cpp +++ b/ACE/tests/Upgradable_RW_Test.cpp @@ -72,7 +72,7 @@ static Linked_List *linked_list_ptr; // 0 if not found, // -1 on an error static int -find_last (void) +find_last () { find_called++; @@ -97,7 +97,7 @@ find_last (void) // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("usage: %n [-r n_readers] [-w n_writers]\n") @@ -144,7 +144,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) // while we have a read lock. int -Reader_Task::svc (void) +Reader_Task::svc () { ACE_Profile_Timer timer; ACE_Profile_Timer::ACE_Elapsed_Time elapsed_time; @@ -219,7 +219,7 @@ Reader_Task::svc (void) // checking that nobody steps on it while we can write it. int -Writer_Task::svc (void) +Writer_Task::svc () { ACE_Profile_Timer timer; ACE_Profile_Timer::ACE_Elapsed_Time elapsed_time; @@ -269,7 +269,7 @@ Time_Calculation::report_time (ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time } void -Time_Calculation ::print_stats (void) +Time_Calculation ::print_stats () { ACE_Profile_Timer::ACE_Elapsed_Time elapsed_time = this->times_; u_int iterations = 1; @@ -310,7 +310,7 @@ Time_Calculation ::print_stats (void) } static int -init (void) +init () { char entry[MAX_STRING_SIZE]; ACE_CString *cString_ptr = 0; |