diff options
| author | Adam Mitz <mitza@objectcomputing.com> | 2022-09-19 16:40:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-19 16:40:20 -0500 |
| commit | 64b5a4fecb5806522f220d63b0744ffa40bb6bcc (patch) | |
| tree | ed14e16befd1de0a028bd6034de0f31513e1610b /ACE/examples | |
| parent | ccbb3639f96d55c38f96914c6c7c4bc8c8998db9 (diff) | |
| parent | 9bb6d09a13922f1b03f02b695f41f94a808a9517 (diff) | |
| download | ATCD-64b5a4fecb5806522f220d63b0744ffa40bb6bcc.tar.gz | |
Merge branch 'master' into format-security
Diffstat (limited to 'ACE/examples')
342 files changed, 1235 insertions, 1235 deletions
diff --git a/ACE/examples/APG/Active_Objects/AO.cpp b/ACE/examples/APG/Active_Objects/AO.cpp index 857cb941725..9600e99560e 100644 --- a/ACE/examples/APG/Active_Objects/AO.cpp +++ b/ACE/examples/APG/Active_Objects/AO.cpp @@ -18,7 +18,7 @@ public: status_result_ = 1; } - int status_update (void) + int status_update () { ACE_TRACE ("HA_ControllerAgent::status_update"); ACE_DEBUG ((LM_DEBUG, @@ -30,7 +30,7 @@ public: } private: - int next_result_id (void) + int next_result_id () { ACE_TRACE ("HA_ControllerAgent::next_cmd_id"); return status_result_++; @@ -50,7 +50,7 @@ public: ACE_TRACE ("StatusUpdate::StatusUpdate"); } - virtual int call (void) + virtual int call () { ACE_TRACE ("StatusUpdate::call"); @@ -68,7 +68,7 @@ private: class ExitMethod : public ACE_Method_Request { public: - virtual int call (void) + virtual int call () { // Cause exit. return -1; @@ -85,7 +85,7 @@ public: this->activate (); } - virtual int svc (void) + virtual int svc () { ACE_TRACE ("Scheduler::svc"); @@ -117,7 +117,7 @@ class HA_ControllerAgentProxy { // This acts as a Proxy to the controller impl object. public: - ACE_Future<int> status_update (void) + ACE_Future<int> status_update () { ACE_TRACE("HA_ControllerAgentProxy::status_update"); ACE_Future<int> result; @@ -131,7 +131,7 @@ public: } //FUZZ: disable check_for_lack_ACE_OS - void exit (void) + void exit () { //FUZZ: enable check_for_lack_ACE_OS ACE_TRACE ("HA_ControllerAgentProxy::exit"); diff --git a/ACE/examples/APG/Active_Objects/AO2.cpp b/ACE/examples/APG/Active_Objects/AO2.cpp index bd73fb10f7e..9543f6480d0 100644 --- a/ACE/examples/APG/Active_Objects/AO2.cpp +++ b/ACE/examples/APG/Active_Objects/AO2.cpp @@ -18,7 +18,7 @@ public: status_result_ = 1; } - int status_update (void) + int status_update () { ACE_TRACE ("HA_ControllerAgent::status_update"); ACE_DEBUG ((LM_DEBUG, @@ -31,7 +31,7 @@ public: } private: - int next_result_id (void) + int next_result_id () { ACE_TRACE ("HA_ControllerAgent::next_cmd_id"); return status_result_++; @@ -50,7 +50,7 @@ public: ACE_TRACE ("StatusUpdate::StatusUpdate"); } - virtual int call (void) + virtual int call () { ACE_TRACE ("StatusUpdate::call"); @@ -67,7 +67,7 @@ private: class ExitMethod : public ACE_Method_Request { public: - virtual int call (void) + virtual int call () { // Cause exit. return -1; @@ -83,7 +83,7 @@ public: this->activate (); } - virtual int svc (void) + virtual int svc () { ACE_TRACE ("Scheduler::svc"); @@ -114,7 +114,7 @@ class HA_ControllerAgentProxy { // This acts as a Proxy to the controller impl object. public: - ACE_Future<int> status_update (void) + ACE_Future<int> status_update () { ACE_TRACE("HA_ControllerAgentProxy::status_update"); ACE_Future<int> result; @@ -128,7 +128,7 @@ public: } //FUZZ: disable check_for_lack_ACE_OS - void exit (void) + void exit () { //FUZZ: enable check_for_lack_ACE_OS diff --git a/ACE/examples/APG/Containers/Allocator.cpp b/ACE/examples/APG/Containers/Allocator.cpp index bfa0bf0f510..0cb42e3d45d 100644 --- a/ACE/examples/APG/Containers/Allocator.cpp +++ b/ACE/examples/APG/Containers/Allocator.cpp @@ -8,7 +8,7 @@ class StackExample public: // Illustrate all the differnet // types of stacks provided by ACE. - int run (void); + int run (); private: // Illustrate the use of an unbounded stack. @@ -16,7 +16,7 @@ private: }; // Listing 1 code/ch05 -int StackExample::run (void) +int StackExample::run () { ACE_TRACE ("StackExample::run"); diff --git a/ACE/examples/APG/Containers/DLList.cpp b/ACE/examples/APG/Containers/DLList.cpp index dc8f25b7638..0de893dd330 100644 --- a/ACE/examples/APG/Containers/DLList.cpp +++ b/ACE/examples/APG/Containers/DLList.cpp @@ -13,14 +13,14 @@ typedef ACE_DLList<DataElement> MyList; class ListTest { public: - int run (void); + int run (); void displayList (MyList & list); // Display all elements. void destroyList (MyList& list); // Destroy all elements. }; // Listing 2 // Listing 3 code/ch05 int -ListTest::run (void) +ListTest::run () { ACE_TRACE ("ListTest::run"); diff --git a/ACE/examples/APG/Containers/Hash_Map.cpp b/ACE/examples/APG/Containers/Hash_Map.cpp index 6fdc461eb40..8d2596bfa6f 100644 --- a/ACE/examples/APG/Containers/Hash_Map.cpp +++ b/ACE/examples/APG/Containers/Hash_Map.cpp @@ -19,16 +19,16 @@ public: Hash_Map_Example (); // Illustrate the hash map. - int run (void); + int run (); // Use the forward iterator. - void iterate_forward (void); + void iterate_forward (); // Use the reverse iterator. - void iterate_reverse (void); + void iterate_reverse (); // Remove all the elements from the map. - void remove_all (void); + void remove_all (); private: Hash_Map<int, DataElement> map_; @@ -43,7 +43,7 @@ Hash_Map_Example::Hash_Map_Example() } // Listing 2 -int Hash_Map_Example::run (void) +int Hash_Map_Example::run () { ACE_TRACE ("Hash_Map_Example::run"); @@ -76,7 +76,7 @@ int Hash_Map_Example::run (void) return 0; } -void Hash_Map_Example::iterate_forward (void) +void Hash_Map_Example::iterate_forward () { ACE_TRACE ("Hash_Map_Example::iterate_forward"); @@ -89,7 +89,7 @@ void Hash_Map_Example::iterate_forward (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); } -void Hash_Map_Example::iterate_reverse (void) +void Hash_Map_Example::iterate_reverse () { ACE_TRACE ("Hash_Map_Example::iterate_reverse"); @@ -102,7 +102,7 @@ void Hash_Map_Example::iterate_reverse (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); } -void Hash_Map_Example::remove_all (void) +void Hash_Map_Example::remove_all () { ACE_TRACE ("Hash_Map_Example::remove_all"); map_.unbind_all (); diff --git a/ACE/examples/APG/Containers/Hash_Map_Hash.cpp b/ACE/examples/APG/Containers/Hash_Map_Hash.cpp index e7471806fc0..d56305e9318 100644 --- a/ACE/examples/APG/Containers/Hash_Map_Hash.cpp +++ b/ACE/examples/APG/Containers/Hash_Map_Hash.cpp @@ -21,22 +21,22 @@ public: } // illustrate the hash map - int run (void); + int run (); // use the forward iterate - void iterate_forward (void); + void iterate_forward (); // use the reverse iterator - void iterate_reverse (void); + void iterate_reverse (); // remove all the elements from the map - void remove_all (void); + void remove_all (); private: Hash_Map<KeyType, DataElement> map_; }; -int Hash_Map_Example::run (void) +int Hash_Map_Example::run () { ACE_TRACE ("Hash_Map_Example::run"); @@ -69,7 +69,7 @@ int Hash_Map_Example::run (void) return 0; } -void Hash_Map_Example::iterate_forward (void) +void Hash_Map_Example::iterate_forward () { ACE_TRACE ("Hash_Map_Example::iterate_forward"); @@ -82,7 +82,7 @@ void Hash_Map_Example::iterate_forward (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); } -void Hash_Map_Example::iterate_reverse (void) +void Hash_Map_Example::iterate_reverse () { ACE_TRACE ("Hash_Map_Example::iterate_reverse"); @@ -95,7 +95,7 @@ void Hash_Map_Example::iterate_reverse (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); } -void Hash_Map_Example::remove_all (void) +void Hash_Map_Example::remove_all () { ACE_TRACE ("Hash_Map_Example::remove_all"); map_.unbind_all (); diff --git a/ACE/examples/APG/Containers/Map_Manager.cpp b/ACE/examples/APG/Containers/Map_Manager.cpp index 5d248944415..cc1e7144035 100644 --- a/ACE/examples/APG/Containers/Map_Manager.cpp +++ b/ACE/examples/APG/Containers/Map_Manager.cpp @@ -8,24 +8,24 @@ class Map_Example { public: // Illustrate the ACE_Map_Manager. - int run (void); + int run (); private: // Iterate in the forward direction. - void iterate_forward (void); + void iterate_forward (); // Iterate in the other direction. - void iterate_reverse (void); + void iterate_reverse (); // Remove all elements from the map. - void remove_all (void); + void remove_all (); private: ACE_Map_Manager<KeyType,DataElement,ACE_Null_Mutex> map_; }; // Listing 2 code/ch05 -int Map_Example::run (void) +int Map_Example::run () { ACE_TRACE ("Map_Example::run"); @@ -60,7 +60,7 @@ int Map_Example::run (void) } // Listing 2 // Listing 3 code/ch05 -void Map_Example::iterate_forward (void) +void Map_Example::iterate_forward () { ACE_TRACE ("Map_Example::iterate_forward"); @@ -79,7 +79,7 @@ void Map_Example::iterate_forward (void) } -void Map_Example::iterate_reverse (void) +void Map_Example::iterate_reverse () { ACE_TRACE ("Map_Example::iterate_reverse"); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Reverse iteration\n"))); @@ -97,7 +97,7 @@ void Map_Example::iterate_reverse (void) } // Listing 3 // Listing 4 code/ch05 -void Map_Example::remove_all (void) +void Map_Example::remove_all () { ACE_TRACE ("Map_Example::remove_all"); diff --git a/ACE/examples/APG/Containers/Map_Manager_Specialization.cpp b/ACE/examples/APG/Containers/Map_Manager_Specialization.cpp index 6bf41ffb9a3..e28634d5a0d 100644 --- a/ACE/examples/APG/Containers/Map_Manager_Specialization.cpp +++ b/ACE/examples/APG/Containers/Map_Manager_Specialization.cpp @@ -49,23 +49,23 @@ class Map_Example { public: // Illustrate the ACE_Map_Manager<>. - int run (void); + int run (); private: // Iterate in the forward direction. - void iterate_forward (void); + void iterate_forward (); // Iterate in the other direction. - void iterate_reverse (void); + void iterate_reverse (); // Remove all elements from the map. - void remove_all (void); + void remove_all (); private: ACE_Map_Manager<KeyType,DataElement,ACE_Null_Mutex> map_; }; -int Map_Example::run (void) +int Map_Example::run () { ACE_TRACE ("Map_Example::run"); @@ -102,7 +102,7 @@ int Map_Example::run (void) return 0; } -void Map_Example::iterate_forward (void) +void Map_Example::iterate_forward () { ACE_TRACE ("Map_Example::iterate_forward"); @@ -117,7 +117,7 @@ void Map_Example::iterate_forward (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); } -void Map_Example::iterate_reverse (void) +void Map_Example::iterate_reverse () { ACE_TRACE ("Map_Example::iterate_reverse"); @@ -132,7 +132,7 @@ void Map_Example::iterate_reverse (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); } -void Map_Example::remove_all (void) +void Map_Example::remove_all () { ACE_TRACE ("Map_Example::remove_all"); diff --git a/ACE/examples/APG/Containers/Queues.cpp b/ACE/examples/APG/Containers/Queues.cpp index 6a08136ea72..a0dfda6274c 100644 --- a/ACE/examples/APG/Containers/Queues.cpp +++ b/ACE/examples/APG/Containers/Queues.cpp @@ -7,19 +7,19 @@ class QueueExample { public: // Illustrate the various ACE Queues. - int run (void); + int run (); private: // Illustrate the ACE unbounded queue // that has copies of the data elements. - int runStackUnboundedQueue (void); + int runStackUnboundedQueue (); // Illustrate the ACE unbounded queue // with pointers to elements on the heap. - int runHeapUnboundedQueue (void); + int runHeapUnboundedQueue (); }; -int QueueExample::run (void) +int QueueExample::run () { ACE_TRACE ("QueueExample::run"); @@ -45,7 +45,7 @@ int QueueExample::run (void) } // Listing 1 code/ch05 -int QueueExample::runStackUnboundedQueue (void) +int QueueExample::runStackUnboundedQueue () { ACE_TRACE ("QueueExample::runStackUnboundedQueue"); @@ -78,7 +78,7 @@ int QueueExample::runStackUnboundedQueue (void) } // Listing 1 // Listing 2 code/ch05 -int QueueExample::runHeapUnboundedQueue (void) +int QueueExample::runHeapUnboundedQueue () { ACE_TRACE ("QueueExample::runHeapUnboundedQueue"); diff --git a/ACE/examples/APG/Containers/RB_Tree.cpp b/ACE/examples/APG/Containers/RB_Tree.cpp index 1c67c48e26a..7f299451931 100644 --- a/ACE/examples/APG/Containers/RB_Tree.cpp +++ b/ACE/examples/APG/Containers/RB_Tree.cpp @@ -14,24 +14,24 @@ class Tree_Example { public: // Illustrate the tree. - int run (void); + int run (); private: // Use the forward iterator. - void iterate_forward (void); + void iterate_forward (); // Use the reverse iterator. - void iterate_reverse (void); + void iterate_reverse (); // Remove all elements from the tree. - int remove_all (void); + int remove_all (); private: Tree<int, DataElement*> tree_; }; // Listing 1 code/ch05 -int Tree_Example::run (void) +int Tree_Example::run () { ACE_TRACE ("Tree_Example::run"); @@ -71,7 +71,7 @@ int Tree_Example::run (void) return 0; } -void Tree_Example::iterate_forward (void) +void Tree_Example::iterate_forward () { ACE_TRACE ("Tree_Example::iterate_forward"); @@ -85,7 +85,7 @@ void Tree_Example::iterate_forward (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); } -void Tree_Example::iterate_reverse (void) +void Tree_Example::iterate_reverse () { ACE_TRACE ("Tree_Example::iterate_reverse"); @@ -100,7 +100,7 @@ void Tree_Example::iterate_reverse (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); } -int Tree_Example::remove_all (void) +int Tree_Example::remove_all () { ACE_TRACE ("Tree_Example::remove_all"); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Removing elements\n"))); diff --git a/ACE/examples/APG/Containers/RB_Tree_Functors.cpp b/ACE/examples/APG/Containers/RB_Tree_Functors.cpp index e82227915a3..d1fb62435ba 100644 --- a/ACE/examples/APG/Containers/RB_Tree_Functors.cpp +++ b/ACE/examples/APG/Containers/RB_Tree_Functors.cpp @@ -18,17 +18,17 @@ class Tree_Example { public: // Illustrate the tree. - int run (void); + int run (); private: // Use the forward iterator. - void iterate_forward (void); + void iterate_forward (); // Use the reverse iterator. - void iterate_reverse (void); + void iterate_reverse (); // Remove all elements from the tree. - int remove_all (void); + int remove_all (); private: Tree<KeyType, DataElement*> tree_; @@ -78,7 +78,7 @@ int Tree_Example::run () return 0; } -void Tree_Example::iterate_forward (void) +void Tree_Example::iterate_forward () { ACE_TRACE ("Tree_Example::iterate_forward"); @@ -91,7 +91,7 @@ void Tree_Example::iterate_forward (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); } -void Tree_Example::iterate_reverse (void) +void Tree_Example::iterate_reverse () { ACE_TRACE ("Tree_Example::iterate_reverse"); @@ -104,7 +104,7 @@ void Tree_Example::iterate_reverse (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); } -int Tree_Example::remove_all (void) +int Tree_Example::remove_all () { ACE_TRACE ("Tree_Example::remove_all"); diff --git a/ACE/examples/APG/Containers/Sets.cpp b/ACE/examples/APG/Containers/Sets.cpp index c4e3436abed..771cfb80f59 100644 --- a/ACE/examples/APG/Containers/Sets.cpp +++ b/ACE/examples/APG/Containers/Sets.cpp @@ -7,17 +7,17 @@ class SetExample { public: // Illustrate all ACE set types. - int run (void); + int run (); private: // Illustrate the ACE Bounded Sets. - int runBoundedSet (void); + int runBoundedSet (); // Illustrate the ACE Unbounded sets. - int runUnboundedSet (void); + int runUnboundedSet (); }; -int SetExample::run (void) +int SetExample::run () { ACE_TRACE ("SetExample::run"); diff --git a/ACE/examples/APG/Containers/Stacks.cpp b/ACE/examples/APG/Containers/Stacks.cpp index 5e8612f656f..e1a6b535c2e 100644 --- a/ACE/examples/APG/Containers/Stacks.cpp +++ b/ACE/examples/APG/Containers/Stacks.cpp @@ -10,23 +10,23 @@ public: // Illustrate all the differnet // types of stacks provided by ACE. - int run (void); + int run (); private: // Illustrate the use of a bounded stack. - int runBoundedStack (void); + int runBoundedStack (); // Illustrate the use of an unbounded stack. - int runUnboundedStack (void); + int runUnboundedStack (); // Illustrate the use of a compile time fixed stack. - int runFixedStack (void); + int runFixedStack (); private: ACE_Bounded_Stack<DataElement*> privateStack_; }; -int StackExample::run (void) +int StackExample::run () { ACE_TRACE ("StackExample::run"); @@ -45,7 +45,7 @@ int StackExample::run (void) return 0; } // Listing 1 code/ch05 -int StackExample::runBoundedStack (void) +int StackExample::runBoundedStack () { ACE_TRACE ("StackExample::runBoundedStack"); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Using a bounded stack\n"))); @@ -78,7 +78,7 @@ int StackExample::runBoundedStack (void) } // Listing 1 // Listing 2 code/ch05 -int StackExample::runFixedStack (void) +int StackExample::runFixedStack () { ACE_TRACE ("StackExample::runFixedStack"); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Using a fixed stack\n"))); @@ -102,7 +102,7 @@ int StackExample::runFixedStack (void) return 0; } -int StackExample::runUnboundedStack (void) +int StackExample::runUnboundedStack () { ACE_TRACE ("StackExample::runUnboundedStack"); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Using an unbounded stack\n"))); diff --git a/ACE/examples/APG/Logging/Change_Mask.cpp b/ACE/examples/APG/Logging/Change_Mask.cpp index 22161ddb191..96bbd75dcb1 100644 --- a/ACE/examples/APG/Logging/Change_Mask.cpp +++ b/ACE/examples/APG/Logging/Change_Mask.cpp @@ -1,6 +1,6 @@ #include "ace/Log_Msg.h" -void foo (void); +void foo (); int ACE_TMAIN (int, ACE_TCHAR *[]) { @@ -19,7 +19,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) return 0; } -void foo (void) +void foo () { ACE_TRACE ("foo"); diff --git a/ACE/examples/APG/Logging/Howto_Syslog.cpp b/ACE/examples/APG/Logging/Howto_Syslog.cpp index 500cc5b562c..333caa4f228 100644 --- a/ACE/examples/APG/Logging/Howto_Syslog.cpp +++ b/ACE/examples/APG/Logging/Howto_Syslog.cpp @@ -1,6 +1,6 @@ #include "ace/Log_Msg.h" -void foo (void); +void foo (); // Listing 1 code/ch03 int ACE_TMAIN (int, ACE_TCHAR *argv[]) @@ -18,7 +18,7 @@ int ACE_TMAIN (int, ACE_TCHAR *argv[]) return 0; } -void foo (void) +void foo () { ACE_TRACE ("foo"); diff --git a/ACE/examples/APG/Logging/LogManager.h b/ACE/examples/APG/Logging/LogManager.h index 523abff55d8..08695c70c7f 100644 --- a/ACE/examples/APG/Logging/LogManager.h +++ b/ACE/examples/APG/Logging/LogManager.h @@ -20,7 +20,7 @@ public: (const ACE_TCHAR *prog_name = ACE_TEXT ("")); void redirectToOStream (ACE_OSTREAM_TYPE *output); void redirectToFile (const char *filename); - void redirectToStderr (void); + void redirectToStderr (); ACE_Log_Msg_Callback * redirectToCallback (ACE_Log_Msg_Callback *callback); @@ -71,7 +71,7 @@ void LogManager::redirectToFile (const char *filename) this->redirectToOStream ((ACE_OSTREAM_TYPE *)log_stream_); } -void LogManager::redirectToStderr (void) +void LogManager::redirectToStderr () { ACE_LOG_MSG->clr_flags (ACE_Log_Msg::OSTREAM | ACE_Log_Msg::LOGGER); diff --git a/ACE/examples/APG/Logging/Simple1.cpp b/ACE/examples/APG/Logging/Simple1.cpp index cbbb00e7c76..3c390f2c25b 100644 --- a/ACE/examples/APG/Logging/Simple1.cpp +++ b/ACE/examples/APG/Logging/Simple1.cpp @@ -1,6 +1,6 @@ #include "ace/Log_Msg.h" -void foo (void); +void foo (); int ACE_TMAIN (int, ACE_TCHAR *[]) { @@ -13,7 +13,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) return 0; } -void foo (void) +void foo () { ACE_TRACE ("foo"); diff --git a/ACE/examples/APG/Logging/Simple2.cpp b/ACE/examples/APG/Logging/Simple2.cpp index 123f65f95ac..b0d043a98e8 100644 --- a/ACE/examples/APG/Logging/Simple2.cpp +++ b/ACE/examples/APG/Logging/Simple2.cpp @@ -1,6 +1,6 @@ #include "ace/Log_Msg.h" -void foo(void); +void foo(); int ACE_TMAIN (int, ACE_TCHAR *[]) { @@ -15,7 +15,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) return 0; } -void foo(void) +void foo() { ACE_TRACE ("foo"); diff --git a/ACE/examples/APG/Logging/Trace.h b/ACE/examples/APG/Logging/Trace.h index f0d31c4a26f..58c8827bd70 100644 --- a/ACE/examples/APG/Logging/Trace.h +++ b/ACE/examples/APG/Logging/Trace.h @@ -41,7 +41,7 @@ public: this->line_ = line; } - ~Trace (void) + ~Trace () { ACE_Log_Msg *lm = ACE_LOG_MSG; if (lm->tracing_enabled () diff --git a/ACE/examples/APG/Logging/Trace_Return.cpp b/ACE/examples/APG/Logging/Trace_Return.cpp index 1f2022c0dfe..f65e88278f5 100644 --- a/ACE/examples/APG/Logging/Trace_Return.cpp +++ b/ACE/examples/APG/Logging/Trace_Return.cpp @@ -1,7 +1,7 @@ #include "Trace.h" // Listing 1 code/ch03 -void foo (void); +void foo (); int ACE_TMAIN (int, ACE_TCHAR *[]) { @@ -14,7 +14,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) TRACE_RETURN (0); } -void foo (void) +void foo () { TRACE ("foo"); MY_DEBUG (ACE_TEXT ("Howdy Pardner\n")); diff --git a/ACE/examples/APG/Logging/Use_LogManager.cpp b/ACE/examples/APG/Logging/Use_LogManager.cpp index d7b7c3607d9..c3fcf27292f 100644 --- a/ACE/examples/APG/Logging/Use_LogManager.cpp +++ b/ACE/examples/APG/Logging/Use_LogManager.cpp @@ -1,7 +1,7 @@ #include "LogManager.h" // Listing 1 code/ch03 -void foo (void); +void foo (); int ACE_TMAIN (int, ACE_TCHAR *[]) { @@ -15,7 +15,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) return 0; } -void foo (void) +void foo () { ACE_TRACE ("foo"); LOG_MANAGER->redirectToFile ("output.test"); diff --git a/ACE/examples/APG/Logging/Use_Ostream.cpp b/ACE/examples/APG/Logging/Use_Ostream.cpp index 056de60b2c9..8834e497fe1 100644 --- a/ACE/examples/APG/Logging/Use_Ostream.cpp +++ b/ACE/examples/APG/Logging/Use_Ostream.cpp @@ -1,7 +1,7 @@ #include "ace/Log_Msg.h" #include "ace/streams.h" -void foo (void); +void foo (); int ACE_TMAIN (int, ACE_TCHAR *[]) { @@ -26,7 +26,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) return 0; } -void foo (void) +void foo () { ACE_TRACE ("foo"); diff --git a/ACE/examples/APG/Logging/Use_Stderr.cpp b/ACE/examples/APG/Logging/Use_Stderr.cpp index 465e9eb08cb..807313ca18e 100644 --- a/ACE/examples/APG/Logging/Use_Stderr.cpp +++ b/ACE/examples/APG/Logging/Use_Stderr.cpp @@ -1,6 +1,6 @@ #include "ace/Log_Msg.h" -void foo (void); +void foo (); // Listing 1 code/ch03 int ACE_TMAIN (int, ACE_TCHAR *argv[]) @@ -28,7 +28,7 @@ int ACE_TMAIN (int, ACE_TCHAR *argv[]) return 0; } -void foo (void) +void foo () { ACE_TRACE ("foo"); diff --git a/ACE/examples/APG/Logging/Use_Syslog.cpp b/ACE/examples/APG/Logging/Use_Syslog.cpp index 173f595c4bb..dce9f5d6505 100644 --- a/ACE/examples/APG/Logging/Use_Syslog.cpp +++ b/ACE/examples/APG/Logging/Use_Syslog.cpp @@ -1,6 +1,6 @@ #include "ace/Log_Msg.h" -void foo (void); +void foo (); int ACE_TMAIN (int, ACE_TCHAR *argv[]) { @@ -22,7 +22,7 @@ int ACE_TMAIN (int, ACE_TCHAR *argv[]) return 0; } -void foo (void) +void foo () { ACE_TRACE ("foo"); diff --git a/ACE/examples/APG/Logging/Wrap_Macros.cpp b/ACE/examples/APG/Logging/Wrap_Macros.cpp index 764a45f7359..65b4e031725 100644 --- a/ACE/examples/APG/Logging/Wrap_Macros.cpp +++ b/ACE/examples/APG/Logging/Wrap_Macros.cpp @@ -1,7 +1,7 @@ #include "Trace.h" // Listing 1 code/ch03 -void foo (void); +void foo (); int ACE_TMAIN (int, ACE_TCHAR *[]) { @@ -12,7 +12,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) return 0; } -void foo (void) +void foo () { ACE_TRACE ("foo"); MY_DEBUG (ACE_TEXT ("Howdy Pardner\n")); diff --git a/ACE/examples/APG/Logging/Wrap_Macros_Alt.cpp b/ACE/examples/APG/Logging/Wrap_Macros_Alt.cpp index ddeb577bbf7..81a61cc2aa4 100644 --- a/ACE/examples/APG/Logging/Wrap_Macros_Alt.cpp +++ b/ACE/examples/APG/Logging/Wrap_Macros_Alt.cpp @@ -1,6 +1,6 @@ #include "Log_Msg_Alt.h" -void foo (void); +void foo (); int ACE_TMAIN (int, ACE_TCHAR *[]) { diff --git a/ACE/examples/APG/Misc_IPC/UDP_Unicast.cpp b/ACE/examples/APG/Misc_IPC/UDP_Unicast.cpp index 75608e0fe3e..b5d63b3e6f0 100644 --- a/ACE/examples/APG/Misc_IPC/UDP_Unicast.cpp +++ b/ACE/examples/APG/Misc_IPC/UDP_Unicast.cpp @@ -26,7 +26,7 @@ int send_unicast (const ACE_INET_Addr &to) // Listing 1 // Listing 2 code/ch09 -void echo_dgram (void) +void echo_dgram () { ACE_INET_Addr my_addr (static_cast<u_short> (10102)); ACE_INET_Addr your_addr; @@ -44,7 +44,7 @@ void echo_dgram (void) // Listing 3 code/ch09 #include "ace/SOCK_CODgram.h" // Exclude 3 -static void show_codgram (void) +static void show_codgram () { char buff[BUFSIZ]; size_t buflen = sizeof (buff); diff --git a/ACE/examples/APG/Naming/Graphable_Element.h b/ACE/examples/APG/Naming/Graphable_Element.h index ae2e0c16150..505e1e0a112 100644 --- a/ACE/examples/APG/Naming/Graphable_Element.h +++ b/ACE/examples/APG/Naming/Graphable_Element.h @@ -26,7 +26,7 @@ public: return this->when_; } - inline float temp (void) + inline float temp () { return this->temp_; } diff --git a/ACE/examples/APG/Naming/Name_Binding.h b/ACE/examples/APG/Naming/Name_Binding.h index 0c21cde49e3..069ef1eae2a 100644 --- a/ACE/examples/APG/Naming/Name_Binding.h +++ b/ACE/examples/APG/Naming/Name_Binding.h @@ -35,16 +35,16 @@ public: this->type_ = 0; } - char *name (void) + char *name () { return this->name_; } - char *value (void) + char *value () { return this->value_; } - const char *type (void) + const char *type () { return this->type_; } - int int_value (void) + int int_value () { return ACE_OS::atoi (this->value ()); } private: diff --git a/ACE/examples/APG/Naming/Temperature_Grapher.cpp b/ACE/examples/APG/Naming/Temperature_Grapher.cpp index 36fa5256eab..2020981a612 100644 --- a/ACE/examples/APG/Naming/Temperature_Grapher.cpp +++ b/ACE/examples/APG/Naming/Temperature_Grapher.cpp @@ -6,7 +6,7 @@ #include "Temperature_Grapher.h" // Listing 1 code/ch21 -void Temperature_Grapher::monitor (void) +void Temperature_Grapher::monitor () { for (;;) { @@ -17,7 +17,7 @@ void Temperature_Grapher::monitor (void) // Listing 1 // Listing 2 code/ch21 -void Temperature_Grapher::update_graph (void) +void Temperature_Grapher::update_graph () { Name_Binding_Ptr lastUpdate (this->naming_context_.fetch ("lastUpdate")); diff --git a/ACE/examples/APG/Naming/Temperature_Monitor.cpp b/ACE/examples/APG/Naming/Temperature_Monitor.cpp index 7b4420bddff..0dc015cd2df 100644 --- a/ACE/examples/APG/Naming/Temperature_Monitor.cpp +++ b/ACE/examples/APG/Naming/Temperature_Monitor.cpp @@ -37,7 +37,7 @@ void Temperature_Monitor::record_temperature (float temp) } // Listing 41 code/ch21 -void Temperature_Monitor::record_failure (void) +void Temperature_Monitor::record_failure () { Name_Binding_Ptr lastReset (this->naming_context_.fetch ("lastReset")); @@ -103,7 +103,7 @@ Temperature_Monitor::reset_device (Name_Binding_Ptr &resetCount) // Listing 5 // Listing 2 code/ch21 -void Temperature_Monitor::monitor (void) +void Temperature_Monitor::monitor () { this->thermometer_ = new Thermometer (this->opt_.thermometer_address ()); diff --git a/ACE/examples/APG/Naming/Temperature_Monitor2.cpp b/ACE/examples/APG/Naming/Temperature_Monitor2.cpp index 3978a12839c..5dc3df0dd1a 100644 --- a/ACE/examples/APG/Naming/Temperature_Monitor2.cpp +++ b/ACE/examples/APG/Naming/Temperature_Monitor2.cpp @@ -81,7 +81,7 @@ void Temperature_Monitor2::reset_device (Name_Binding_Ptr &resetCount) this->naming_context_.rebind ("resetCount", number_of_resets); } -void Temperature_Monitor2::record_failure (void) +void Temperature_Monitor2::record_failure () { Name_Binding_Ptr lastFailure (this->naming_context_.fetch ("lastFailure")); Name_Binding_Ptr lastReset (this->naming_context_.fetch ("lastReset")); @@ -117,7 +117,7 @@ void Temperature_Monitor2::record_failure (void) this->naming_context_.rebind ("lastFailure", lastFailureTime); } -void Temperature_Monitor2::monitor (void) +void Temperature_Monitor2::monitor () { this->thermometer_ = new Thermometer (this->opt_.thermometer_address ()); diff --git a/ACE/examples/APG/Naming/Temperature_Monitor2.h b/ACE/examples/APG/Naming/Temperature_Monitor2.h index ab4f8b5601b..3db78c107e4 100644 --- a/ACE/examples/APG/Naming/Temperature_Monitor2.h +++ b/ACE/examples/APG/Naming/Temperature_Monitor2.h @@ -16,12 +16,12 @@ public: shared_context_(shared_context) { } - void monitor (void); + void monitor (); protected: void record_temperature (float temp); void record_history (float temp); - void record_failure (void); + void record_failure (); void reset_device (Name_Binding_Ptr & resetCount); private: diff --git a/ACE/examples/APG/Naming/Temperature_Monitor_Options.h b/ACE/examples/APG/Naming/Temperature_Monitor_Options.h index 18e84066a40..9ab5c9fabb8 100644 --- a/ACE/examples/APG/Naming/Temperature_Monitor_Options.h +++ b/ACE/examples/APG/Naming/Temperature_Monitor_Options.h @@ -7,32 +7,32 @@ class Temperature_Monitor_Options Temperature_Monitor_Options (int, ACE_TCHAR *[]) { } - const char *thermometer_address (void) + const char *thermometer_address () { return "serial:// s0/0x3e52"; } - int poll_interval (void) + int poll_interval () { return 10; // every 10 seconds } - int reset_interval (void) + int reset_interval () { return 60; // sixty seconds } - int excessive_resets (void) + int excessive_resets () { return 5; // no response in 5 minutes } - const char *admin_email (void) + const char *admin_email () { return "root@localhost"; } - const char *email_from (void) + const char *email_from () { return "temperature monitor"; } diff --git a/ACE/examples/APG/Naming/Thermometer.h b/ACE/examples/APG/Naming/Thermometer.h index 78073b1eb1d..2c4c4a0233b 100644 --- a/ACE/examples/APG/Naming/Thermometer.h +++ b/ACE/examples/APG/Naming/Thermometer.h @@ -12,7 +12,7 @@ public: : addr_(addr), threshold_(5) { } - float temperature (void) + float temperature () { int success = ACE_OS::rand () % 10; if (success < this->threshold_) @@ -26,12 +26,12 @@ public: return (float)itemp; } - const char *address (void) + const char *address () { return this->addr_; } - void reset (void) + void reset () { this->threshold_ = 4; ACE_DEBUG ((LM_ERROR, ACE_TEXT ("Resetting thermometer %C\n"), diff --git a/ACE/examples/APG/Proactor/HA_Proactive_Status.h b/ACE/examples/APG/Proactor/HA_Proactive_Status.h index d09848f3e06..9626b710b8a 100644 --- a/ACE/examples/APG/Proactor/HA_Proactive_Status.h +++ b/ACE/examples/APG/Proactor/HA_Proactive_Status.h @@ -65,7 +65,7 @@ template <class HANDLER> class ACE_Asynch_Acceptor : public ACE_Handler ... protected: - virtual HANDLER *make_handler (void) + virtual HANDLER *make_handler () { return new HANDLER; } diff --git a/ACE/examples/APG/Processes/Process_Mutex.cpp b/ACE/examples/APG/Processes/Process_Mutex.cpp index b48588301fb..e8ae41e3e17 100644 --- a/ACE/examples/APG/Processes/Process_Mutex.cpp +++ b/ACE/examples/APG/Processes/Process_Mutex.cpp @@ -12,7 +12,7 @@ public: ACE_TRACE ("GResourceUser::GResourceUser"); } - void run (void) + void run () { ACE_TRACE ("GResourceUser::run"); diff --git a/ACE/examples/APG/Processes/Spawn.cpp b/ACE/examples/APG/Processes/Spawn.cpp index 19d0bc77b8d..711b10cb5ff 100644 --- a/ACE/examples/APG/Processes/Spawn.cpp +++ b/ACE/examples/APG/Processes/Spawn.cpp @@ -19,7 +19,7 @@ public: ACE_OS::strcpy (programName_, program_name); } - int doWork (void) + int doWork () { ACE_TRACE ("Manager::doWork"); @@ -43,7 +43,7 @@ public: private: // Listing 3 code/ch10 - int dumpRun (void) + int dumpRun () { ACE_TRACE ("Manager::dumpRun"); @@ -132,7 +132,7 @@ public: ACE_TRACE ("Slave::Slave"); } - int doWork (void) + int doWork () { ACE_TRACE ("Slave::doWork"); @@ -155,7 +155,7 @@ public: } // Listing 4 - void showWho (void) + void showWho () { ACE_TRACE ("Slave::showWho"); #if !defined (ACE_LACKS_PWD_FUNCTIONS) diff --git a/ACE/examples/APG/Reactor/HAStatus.cpp b/ACE/examples/APG/Reactor/HAStatus.cpp index 0242a893b17..58c092215ca 100644 --- a/ACE/examples/APG/Reactor/HAStatus.cpp +++ b/ACE/examples/APG/Reactor/HAStatus.cpp @@ -45,7 +45,7 @@ public: ACE_SOCK_Stream &peer (void) { return this->sock_; } //FUZZ: disable check_for_lack_ACE_OS - int open (void); + int open (); //FUZZ: enable check_for_lack_ACE_OS // Get this handler's I/O handle. @@ -128,7 +128,7 @@ ClientAcceptor::handle_close (ACE_HANDLE, ACE_Reactor_Mask) // Listing 7 code/ch07 int -ClientService::open (void) +ClientService::open () { ACE_TCHAR peer_name[MAXHOSTNAMELEN]; ACE_INET_Addr peer_addr; diff --git a/ACE/examples/APG/Reactor/Timer_State_Data.cpp b/ACE/examples/APG/Reactor/Timer_State_Data.cpp index d84dfdd5c18..8cd424fdf2f 100644 --- a/ACE/examples/APG/Reactor/Timer_State_Data.cpp +++ b/ACE/examples/APG/Reactor/Timer_State_Data.cpp @@ -25,7 +25,7 @@ public: return this->location_; } - int querySensor (void) + int querySensor () { // ... return ++this->count_; diff --git a/ACE/examples/APG/Reactor/Timers.cpp b/ACE/examples/APG/Reactor/Timers.cpp index 734069456c1..f6638bcf698 100644 --- a/ACE/examples/APG/Reactor/Timers.cpp +++ b/ACE/examples/APG/Reactor/Timers.cpp @@ -8,7 +8,7 @@ #include "ace/OS_NS_time.h" #include "ace/OS_NS_signal.h" -typedef void (*timerTask_t)(void); +typedef void (*timerTask_t)(); // Listing 1 code/ch07 pid_t timerTask (int initialDelay, @@ -50,7 +50,7 @@ void foo () } // Listing 2 -void programMainLoop (void) +void programMainLoop () { ACE_OS::sleep (30); } diff --git a/ACE/examples/APG/Shared_Memory/Hash_Map.cpp b/ACE/examples/APG/Shared_Memory/Hash_Map.cpp index 908382c4736..d4f7de29e54 100644 --- a/ACE/examples/APG/Shared_Memory/Hash_Map.cpp +++ b/ACE/examples/APG/Shared_Memory/Hash_Map.cpp @@ -132,7 +132,7 @@ int addRecords(HASH_MAP *map, ALLOCATOR *shmem_allocator) } // Listing 4 // Listing 5 code/ch17 -int handle_child (void) +int handle_child () { ACE_TRACE ("handle_child"); diff --git a/ACE/examples/APG/Shared_Memory/PI_Malloc.cpp b/ACE/examples/APG/Shared_Memory/PI_Malloc.cpp index d24b6f8f770..3ab6d0f08a2 100644 --- a/ACE/examples/APG/Shared_Memory/PI_Malloc.cpp +++ b/ACE/examples/APG/Shared_Memory/PI_Malloc.cpp @@ -45,7 +45,7 @@ private: }; // Listing 2 -void showRecords (void) +void showRecords () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("The following records were found:\n"))); @@ -64,7 +64,7 @@ void showRecords (void) } } -int addRecords (void) +int addRecords () { char buf[32]; diff --git a/ACE/examples/APG/Shared_Memory/Pool_Growth.cpp b/ACE/examples/APG/Shared_Memory/Pool_Growth.cpp index 8b3a254bf9e..1e0e65418e1 100644 --- a/ACE/examples/APG/Shared_Memory/Pool_Growth.cpp +++ b/ACE/examples/APG/Shared_Memory/Pool_Growth.cpp @@ -223,7 +223,7 @@ int handle_parent (ACE_TCHAR *cmdLine) // Listing 2 // Listing 3 code/ch17 -int handle_child (void) +int handle_child () { ALLOCATOR *shmem_allocator = 0; ACE_MMAP_Memory_Pool_Options options diff --git a/ACE/examples/APG/Streams/Answerer.cpp b/ACE/examples/APG/Streams/Answerer.cpp index 87b7b8dd7a5..79cfb0101bc 100644 --- a/ACE/examples/APG/Streams/Answerer.cpp +++ b/ACE/examples/APG/Streams/Answerer.cpp @@ -108,7 +108,7 @@ protected: return 0; } - ACE_FILE_Addr get_incoming_message_queue (void) + ACE_FILE_Addr get_incoming_message_queue () { // Exclude 24 return ACE_FILE_Addr (ACE_TEXT ("/tmp/incoming_message")); diff --git a/ACE/examples/APG/Streams/BasicTask.h b/ACE/examples/APG/Streams/BasicTask.h index 8198f6b8d15..b172099b0d1 100644 --- a/ACE/examples/APG/Streams/BasicTask.h +++ b/ACE/examples/APG/Streams/BasicTask.h @@ -35,7 +35,7 @@ public: // Listing 101 // Listing 1020 code/ch18 - virtual int svc (void) + virtual int svc () { for (ACE_Message_Block *message = 0; ; ) { @@ -131,7 +131,7 @@ protected: // Listing 104 code/ch18 virtual int process (Message *message) = 0; - virtual int desired_threads (void) + virtual int desired_threads () { return 1; } diff --git a/ACE/examples/APG/Streams/CommandModule.cpp b/ACE/examples/APG/Streams/CommandModule.cpp index fc2a642ea1c..77164f537af 100644 --- a/ACE/examples/APG/Streams/CommandModule.cpp +++ b/ACE/examples/APG/Streams/CommandModule.cpp @@ -10,7 +10,7 @@ CommandModule::CommandModule (const ACE_TCHAR *module_name, // Listing 01 // Listing 02 code/ch18 -ACE_SOCK_Stream &CommandModule::peer (void) +ACE_SOCK_Stream &CommandModule::peer () { ACE_SOCK_Stream *peer = (ACE_SOCK_Stream *)this->arg (); return *peer; diff --git a/ACE/examples/APG/Streams/CommandModule.h b/ACE/examples/APG/Streams/CommandModule.h index 6b6f01a3a07..217599791d2 100644 --- a/ACE/examples/APG/Streams/CommandModule.h +++ b/ACE/examples/APG/Streams/CommandModule.h @@ -18,7 +18,7 @@ public: CommandTask *reader, ACE_SOCK_Stream *peer); - ACE_SOCK_Stream &peer (void); + ACE_SOCK_Stream &peer (); }; // Listing 01 diff --git a/ACE/examples/APG/Streams/CommandTask.cpp b/ACE/examples/APG/Streams/CommandTask.cpp index 858ccadf090..b7b715925ce 100644 --- a/ACE/examples/APG/Streams/CommandTask.cpp +++ b/ACE/examples/APG/Streams/CommandTask.cpp @@ -55,7 +55,7 @@ int CommandTask::close (u_long flags) // Listing 06 code/ch18 // Listing 061 code/ch18 -int CommandTask::svc (void) +int CommandTask::svc () { ACE_Message_Block *message; diff --git a/ACE/examples/APG/Streams/CommandTasks.cpp b/ACE/examples/APG/Streams/CommandTasks.cpp index 8ea4c397c86..a96ca9541bf 100644 --- a/ACE/examples/APG/Streams/CommandTasks.cpp +++ b/ACE/examples/APG/Streams/CommandTasks.cpp @@ -15,7 +15,7 @@ AnswerCallModule::AnswerCallModule (ACE_SOCK_Stream *peer) { } // Listing 011 // Listing 012 code/ch18 -AnswerCallDownstreamTask::AnswerCallDownstreamTask (void) +AnswerCallDownstreamTask::AnswerCallDownstreamTask () : CommandTask(Command::CMD_ANSWER_CALL) { } // Listing 012 @@ -38,7 +38,7 @@ int AnswerCallDownstreamTask::process (Command *command) } // Listing 013 // Listing 014 code/ch18 -AnswerCallUpstreamTask::AnswerCallUpstreamTask (void) +AnswerCallUpstreamTask::AnswerCallUpstreamTask () : CommandTask(Command::CMD_ANSWER_CALL) { } // Listing 014 @@ -62,7 +62,7 @@ RetrieveCallerIdModule::RetrieveCallerIdModule // Listing 021 // Listing 022 code/ch18 RetrieveCallerIdDownstreamTask::RetrieveCallerIdDownstreamTask - (void) + () : CommandTask(Command::CMD_RETRIEVE_CALLER_ID) { } @@ -76,7 +76,7 @@ int RetrieveCallerIdDownstreamTask::process (Command *) // Listing 022 // Listing 023 code/ch18 RetrieveCallerIdUpstreamTask::RetrieveCallerIdUpstreamTask - (void) + () : CommandTask(Command::CMD_RETRIEVE_CALLER_ID) { } @@ -106,7 +106,7 @@ PlayMessageModule::PlayMessageModule (ACE_SOCK_Stream *peer) peer) { } -PlayMessageDownstreamTask::PlayMessageDownstreamTask (void) +PlayMessageDownstreamTask::PlayMessageDownstreamTask () : CommandTask(Command::CMD_PLAY_MESSAGE) { } // Listing 032 code/ch18 @@ -143,7 +143,7 @@ int PlayMessageDownstreamTask::process (Command *command) return Command::RESULT_SUCCESS; } // Listing 032 -PlayMessageUpstreamTask::PlayMessageUpstreamTask (void) +PlayMessageUpstreamTask::PlayMessageUpstreamTask () : CommandTask(Command::CMD_PLAY_MESSAGE) { } @@ -166,7 +166,7 @@ RecordMessageModule::RecordMessageModule (ACE_SOCK_Stream *peer) peer) { } -RecordMessageDownstreamTask::RecordMessageDownstreamTask (void) +RecordMessageDownstreamTask::RecordMessageDownstreamTask () : CommandTask(Command::CMD_RECORD_MESSAGE) { } @@ -175,7 +175,7 @@ int RecordMessageDownstreamTask::process (Command *) return Command::RESULT_SUCCESS; } -RecordMessageUpstreamTask::RecordMessageUpstreamTask (void) +RecordMessageUpstreamTask::RecordMessageUpstreamTask () : CommandTask(Command::CMD_RECORD_MESSAGE) { } // Listing 033 code/ch18 diff --git a/ACE/examples/APG/Streams/Message.h b/ACE/examples/APG/Streams/Message.h index e6962896c85..61f2a320e38 100644 --- a/ACE/examples/APG/Streams/Message.h +++ b/ACE/examples/APG/Streams/Message.h @@ -13,7 +13,7 @@ public: ~Message () { } - RecordingDevice *recorder (void) + RecordingDevice *recorder () { return this->device_; } @@ -28,7 +28,7 @@ public: this->type_ = type; } - MessageType *type (void) + MessageType *type () { return this->type_; } @@ -38,7 +38,7 @@ public: this->id_ = id; } - CallerId *caller_id (void) + CallerId *caller_id () { return this->id_; } @@ -54,22 +54,22 @@ public: this->type_ = type; } - ACE_FILE_Addr &addr (void) + ACE_FILE_Addr &addr () { return this->addr_; } - int is_text (void) + int is_text () { return this->type_->is_text (); } - int is_audio (void) + int is_audio () { return this->type_->is_audio (); } - int is_video (void) + int is_video () { return this->type_->is_video (); } diff --git a/ACE/examples/APG/Streams/MessageInfo.h b/ACE/examples/APG/Streams/MessageInfo.h index b96a3ad67b3..ffc1ea1a25b 100644 --- a/ACE/examples/APG/Streams/MessageInfo.h +++ b/ACE/examples/APG/Streams/MessageInfo.h @@ -15,7 +15,7 @@ public: CallerId (ACE_TString id) : id_(id) { } - const ACE_TCHAR * string(void) + const ACE_TCHAR * string() { return this->id_.c_str (); } @@ -59,31 +59,31 @@ public: : codec_(codec), addr_(addr) { } - int get_codec (void) + int get_codec () { return this->codec_; } - ACE_FILE_Addr &get_addr (void) + ACE_FILE_Addr &get_addr () { return this->addr_; } - int is_video (void) + int is_video () { return this->get_codec () > FIRST_VIDEO_CODEC && this->get_codec () < LAST_VIDEO_CODEC; } - int is_audio (void) + int is_audio () { return this->get_codec () > FIRST_AUDIO_CODEC && this->get_codec () < LAST_AUDIO_CODEC ; } - int is_text (void) + int is_text () { return this->get_codec () > FIRST_TEXT_CODEC && diff --git a/ACE/examples/APG/Streams/RecordingDevice.h b/ACE/examples/APG/Streams/RecordingDevice.h index 41a9739d987..f060b78a904 100644 --- a/ACE/examples/APG/Streams/RecordingDevice.h +++ b/ACE/examples/APG/Streams/RecordingDevice.h @@ -49,7 +49,7 @@ public: virtual MessageType *record_message (ACE_FILE_Addr &addr) = 0; // Release the RecordingDevice to accept another incoming call - virtual void release (void) + virtual void release () { this->release_semaphore (); } @@ -61,7 +61,7 @@ public: return 0; } - virtual RecordingDevice *wait_for_activity (void) + virtual RecordingDevice *wait_for_activity () { // Block on a semaphore until it says we're ready to do // work. @@ -90,12 +90,12 @@ public: } protected: - void acquire_semaphore (void) + void acquire_semaphore () { this->semaphore_.acquire (); } - void release_semaphore (void) + void release_semaphore () { // Reset the semaphore so that wait_for_activity() will // unblock. diff --git a/ACE/examples/APG/Streams/RecordingDevice_Text.cpp b/ACE/examples/APG/Streams/RecordingDevice_Text.cpp index cf6cc0c084c..d06d2c131da 100644 --- a/ACE/examples/APG/Streams/RecordingDevice_Text.cpp +++ b/ACE/examples/APG/Streams/RecordingDevice_Text.cpp @@ -7,7 +7,7 @@ #include "RecordingDevice_Text.h" #include "Util.h" -TextListenerAcceptor::TextListenerAcceptor (void) +TextListenerAcceptor::TextListenerAcceptor () : ACE_Event_Handler(), RecordingDevice() { } @@ -62,18 +62,18 @@ ACE_Event_Handler *TextListenerAcceptor::get_handler () const return (ACE_Event_Handler *)this; } -RecordingDevice *TextListenerAcceptor::wait_for_activity (void) +RecordingDevice *TextListenerAcceptor::wait_for_activity () { this->RecordingDevice::wait_for_activity (); return new TextListener (this); } -int TextListenerAcceptor::answer_call (void) +int TextListenerAcceptor::answer_call () { return -1; } -CallerId *TextListenerAcceptor::retrieve_callerId (void) +CallerId *TextListenerAcceptor::retrieve_callerId () { return 0; } @@ -108,7 +108,7 @@ const ACE_TCHAR *TextListener::get_name () const } // Listing 02 code/ch18 -int TextListener::answer_call (void) +int TextListener::answer_call () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TextListener::answer_call()\n"))); @@ -129,7 +129,7 @@ int TextListener::answer_call (void) // Listing 02 // Listing 03 code/ch18 -CallerId *TextListener::retrieve_callerId (void) +CallerId *TextListener::retrieve_callerId () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TextListener::retrieve_callerId()\n"))); @@ -188,7 +188,7 @@ MessageType *TextListener::record_message (ACE_FILE_Addr &addr) // Listing 05 // Listing 06 code/ch18 -void TextListener::release (void) +void TextListener::release () { delete this; } diff --git a/ACE/examples/APG/Streams/RecordingDevice_Text.h b/ACE/examples/APG/Streams/RecordingDevice_Text.h index 10dc44df1f6..dcd6e1dc664 100644 --- a/ACE/examples/APG/Streams/RecordingDevice_Text.h +++ b/ACE/examples/APG/Streams/RecordingDevice_Text.h @@ -39,11 +39,11 @@ public: ACE_Event_Handler *get_handler () const; - virtual RecordingDevice *wait_for_activity (void); + virtual RecordingDevice *wait_for_activity (); - virtual int answer_call (void); + virtual int answer_call (); - virtual CallerId *retrieve_callerId (void); + virtual CallerId *retrieve_callerId (); virtual int play_message (ACE_FILE_Addr &addr); @@ -61,15 +61,15 @@ public: virtual const ACE_TCHAR *get_name () const; - int answer_call (void); + int answer_call (); - CallerId *retrieve_callerId (void); + CallerId *retrieve_callerId (); int play_message (ACE_FILE_Addr &addr); MessageType *record_message (ACE_FILE_Addr &addr); - virtual void release (void); + virtual void release (); // Listing 01 // Listing 02 code/ch18 private: diff --git a/ACE/examples/APG/Svc_Config/HA_Status_Dynamic.cpp b/ACE/examples/APG/Svc_Config/HA_Status_Dynamic.cpp index 5e850351bba..0cfcf309982 100644 --- a/ACE/examples/APG/Svc_Config/HA_Status_Dynamic.cpp +++ b/ACE/examples/APG/Svc_Config/HA_Status_Dynamic.cpp @@ -82,7 +82,7 @@ HA_Status::init (int argc, ACE_TCHAR *argv[]) // Listing 2 code/ch19 int -HA_Status::fini (void) +HA_Status::fini () { this->acceptor_.close (); return 0; diff --git a/ACE/examples/APG/Svc_Config/HA_Status_Static.cpp b/ACE/examples/APG/Svc_Config/HA_Status_Static.cpp index 68eb68422d0..d82a2989b2f 100644 --- a/ACE/examples/APG/Svc_Config/HA_Status_Static.cpp +++ b/ACE/examples/APG/Svc_Config/HA_Status_Static.cpp @@ -81,7 +81,7 @@ HA_Status::init (int argc, ACE_TCHAR *argv[]) // Listing 2 code/ch19 int -HA_Status::fini (void) +HA_Status::fini () { this->acceptor_.close (); return 0; diff --git a/ACE/examples/APG/ThreadManagement/Async_Cancel.cpp b/ACE/examples/APG/ThreadManagement/Async_Cancel.cpp index 007736eff47..b00697cd754 100644 --- a/ACE/examples/APG/ThreadManagement/Async_Cancel.cpp +++ b/ACE/examples/APG/ThreadManagement/Async_Cancel.cpp @@ -9,7 +9,7 @@ class CanceledTask : public ACE_Task<ACE_MT_SYNCH> { public: - virtual int svc (void) + virtual int svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Starting thread\n"))); @@ -23,7 +23,7 @@ public: } } - int set_cancel_mode (void) + int set_cancel_mode () { cancel_state new_state; diff --git a/ACE/examples/APG/ThreadManagement/Coop_Cancel.cpp b/ACE/examples/APG/ThreadManagement/Coop_Cancel.cpp index 0fd82167e7c..37129d4466e 100644 --- a/ACE/examples/APG/ThreadManagement/Coop_Cancel.cpp +++ b/ACE/examples/APG/ThreadManagement/Coop_Cancel.cpp @@ -10,7 +10,7 @@ class CanceledTask : public ACE_Task<ACE_MT_SYNCH> { public: - virtual int svc (void) + virtual int svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up\n"))); diff --git a/ACE/examples/APG/ThreadManagement/ExitHandler.cpp b/ACE/examples/APG/ThreadManagement/ExitHandler.cpp index 915edf014fa..4d62f6dc2be 100644 --- a/ACE/examples/APG/ThreadManagement/ExitHandler.cpp +++ b/ACE/examples/APG/ThreadManagement/ExitHandler.cpp @@ -5,7 +5,7 @@ class ExitHandler : public ACE_At_Thread_Exit { public: - virtual void apply (void) + virtual void apply () { ACE_DEBUG ((LM_INFO, ACE_TEXT ("(%t) is exiting\n"))); @@ -20,7 +20,7 @@ public: HA_CommandHandler(ExitHandler& eh) : eh_(eh) { } - virtual int svc (void) + virtual int svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up\n"))); diff --git a/ACE/examples/APG/ThreadManagement/Pool.cpp b/ACE/examples/APG/ThreadManagement/Pool.cpp index e90cf649751..ee4d4556b1e 100644 --- a/ACE/examples/APG/ThreadManagement/Pool.cpp +++ b/ACE/examples/APG/ThreadManagement/Pool.cpp @@ -8,7 +8,7 @@ class HA_CommandHandler : public ACE_Task<ACE_MT_SYNCH> { public: - virtual int svc (void) + virtual int svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up\n"))); ACE_Message_Block *mb = 0; diff --git a/ACE/examples/APG/ThreadManagement/Priorities.cpp b/ACE/examples/APG/ThreadManagement/Priorities.cpp index fecb466e24f..4f2c477f1a3 100644 --- a/ACE/examples/APG/ThreadManagement/Priorities.cpp +++ b/ACE/examples/APG/ThreadManagement/Priorities.cpp @@ -13,7 +13,7 @@ public: HA_CommandHandler (const char *name) : name_ (name) { } - virtual int svc (void) + virtual int svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up %C\n"), name_)); diff --git a/ACE/examples/APG/ThreadManagement/Signals.cpp b/ACE/examples/APG/ThreadManagement/Signals.cpp index 80d424a5275..157274c1e66 100644 --- a/ACE/examples/APG/ThreadManagement/Signals.cpp +++ b/ACE/examples/APG/ThreadManagement/Signals.cpp @@ -24,7 +24,7 @@ public: return 0; } - virtual int svc (void) + virtual int svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Starting thread\n"))); diff --git a/ACE/examples/APG/ThreadManagement/Signals2.cpp b/ACE/examples/APG/ThreadManagement/Signals2.cpp index 1a23f38565d..138abd01127 100644 --- a/ACE/examples/APG/ThreadManagement/Signals2.cpp +++ b/ACE/examples/APG/ThreadManagement/Signals2.cpp @@ -24,7 +24,7 @@ public: return 0; } - virtual int svc (void) + virtual int svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Starting thread\n"))); @@ -56,7 +56,7 @@ SignalableTask::process_message (ACE_Message_Block *) } void -SignalableTask::handle_alert (void) +SignalableTask::handle_alert () { return; } diff --git a/ACE/examples/APG/ThreadManagement/Start_Hook.cpp b/ACE/examples/APG/ThreadManagement/Start_Hook.cpp index 49389fcdb70..805e81435f5 100644 --- a/ACE/examples/APG/ThreadManagement/Start_Hook.cpp +++ b/ACE/examples/APG/ThreadManagement/Start_Hook.cpp @@ -34,7 +34,7 @@ HA_ThreadHook::add_sec_context_thr(ACE_TSS<SecurityContext> &secCtx) class HA_CommandHandler : public ACE_Task_Base { public: - virtual int svc (void) + virtual int svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up\n"))); diff --git a/ACE/examples/APG/ThreadManagement/State.cpp b/ACE/examples/APG/ThreadManagement/State.cpp index add2ca782ca..52b9845ca13 100644 --- a/ACE/examples/APG/ThreadManagement/State.cpp +++ b/ACE/examples/APG/ThreadManagement/State.cpp @@ -3,7 +3,7 @@ class HA_CommandHandler : public ACE_Task_Base { public: - virtual int svc (void) + virtual int svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Handler Thread running\n"))); diff --git a/ACE/examples/APG/ThreadPools/Futures.cpp b/ACE/examples/APG/ThreadPools/Futures.cpp index 3ad8c8b8c39..8f1172ba6e9 100644 --- a/ACE/examples/APG/ThreadPools/Futures.cpp +++ b/ACE/examples/APG/ThreadPools/Futures.cpp @@ -33,7 +33,7 @@ public: class LongWork : public ACE_Method_Request { public: - virtual int call (void) + virtual int call () { ACE_TRACE ("LongWork::call"); ACE_DEBUG @@ -49,7 +49,7 @@ public: return 0; } - ACE_Future<ACE_CString*> &future (void) + ACE_Future<ACE_CString*> &future () { ACE_TRACE ("LongWork::future"); return result_; @@ -68,7 +68,7 @@ private: class Exit : public ACE_Method_Request { public: - virtual int call (void) + virtual int call () { ACE_TRACE ("Exit::call"); return -1; @@ -99,7 +99,7 @@ public: return this->queue_.enqueue (req); } - virtual int svc (void) + virtual int svc () { thread_id_ = ACE_Thread::self (); while (1) @@ -120,7 +120,7 @@ public: return 0; } - ACE_thread_t thread_id (void); + ACE_thread_t thread_id (); private: IManager *manager_; @@ -129,7 +129,7 @@ private: }; // Listing 3 -ACE_thread_t Worker::thread_id (void) +ACE_thread_t Worker::thread_id () { return thread_id_; } @@ -152,7 +152,7 @@ public: return this->queue_.enqueue (req); } - int svc (void) + int svc () { ACE_TRACE ("svc"); @@ -184,7 +184,7 @@ public: return 0; } - int shut_down (void); + int shut_down (); virtual int return_to_work (Worker *worker) { @@ -199,7 +199,7 @@ public: } private: - Worker *choose_worker (void) + Worker *choose_worker () { ACE_GUARD_RETURN (ACE_Thread_Mutex, worker_mon, this->workers_lock_, 0) @@ -212,7 +212,7 @@ private: return worker; } - int create_worker_pool (void) + int create_worker_pool () { ACE_GUARD_RETURN (ACE_Thread_Mutex, worker_mon, this->workers_lock_, -1); @@ -227,7 +227,7 @@ private: return 0; } - int done (void) + int done () { return (shutdown_ == 1); } @@ -247,7 +247,7 @@ private: // Listing 4 int -Manager::shut_down (void) +Manager::shut_down () { ACE_TRACE ("Manager::shut_down"); ACE_Unbounded_Queue<Worker* >::ITERATOR iter = this->workers_.begin (); diff --git a/ACE/examples/APG/ThreadPools/LF_ThreadPool.cpp b/ACE/examples/APG/ThreadPools/LF_ThreadPool.cpp index 8f0e4a82145..6b740f60bc5 100644 --- a/ACE/examples/APG/ThreadPools/LF_ThreadPool.cpp +++ b/ACE/examples/APG/ThreadPools/LF_ThreadPool.cpp @@ -19,18 +19,18 @@ public: } //FUZZ: disable check_for_lack_ACE_OS - int wait (void) + int wait () { return this->cond_.wait (); } - int signal (void) + int signal () { return this->cond_.signal (); } //FUZZ: enable check_for_lack_ACE_OS - ACE_thread_t owner (void) + ACE_thread_t owner () { return this->owner_; } @@ -51,19 +51,19 @@ public: virtual int svc (); - void shut_down (void) + void shut_down () { shutdown_ = 1; } private: - int become_leader (void); + int become_leader (); - Follower *make_follower (void); + Follower *make_follower (); - int elect_new_leader (void); + int elect_new_leader (); - int leader_active (void) + int leader_active () { ACE_TRACE ("LF_ThreadPool::leader_active"); return this->current_leader_ != 0; @@ -77,7 +77,7 @@ private: void process_message (ACE_Message_Block *mb); - int done (void) + int done () { return (shutdown_ == 1); } @@ -93,7 +93,7 @@ private: // Listing 1 // Listing 2 code/ch16 int -LF_ThreadPool::svc (void) +LF_ThreadPool::svc () { ACE_TRACE ("LF_ThreadPool::svc"); while (!done ()) @@ -121,7 +121,7 @@ LF_ThreadPool::svc (void) // Listing 2 // Listing 3 code/ch16 int -LF_ThreadPool::become_leader (void) +LF_ThreadPool::become_leader () { ACE_TRACE ("LF_ThreadPool::become_leader"); @@ -147,7 +147,7 @@ LF_ThreadPool::become_leader (void) } Follower* -LF_ThreadPool::make_follower (void) +LF_ThreadPool::make_follower () { ACE_TRACE ("LF_ThreadPool::make_follower"); @@ -161,7 +161,7 @@ LF_ThreadPool::make_follower (void) // Listing 3 // Listing 5 code/ch16 int -LF_ThreadPool::elect_new_leader (void) +LF_ThreadPool::elect_new_leader () { ACE_TRACE ("LF_ThreadPool::elect_new_leader"); diff --git a/ACE/examples/APG/ThreadPools/TP_Reactor.cpp b/ACE/examples/APG/ThreadPools/TP_Reactor.cpp index 6386ee129bb..edd8441a815 100644 --- a/ACE/examples/APG/ThreadPools/TP_Reactor.cpp +++ b/ACE/examples/APG/ThreadPools/TP_Reactor.cpp @@ -111,7 +111,7 @@ reactor_event_hook (ACE_Reactor *) class ServerTP : public ACE_Task_Base { public: - virtual int svc (void) + virtual int svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Running the event loop\n"))); diff --git a/ACE/examples/APG/ThreadPools/Task_ThreadPool.cpp b/ACE/examples/APG/ThreadPools/Task_ThreadPool.cpp index b9f980c51ae..0b87733cde7 100644 --- a/ACE/examples/APG/ThreadPools/Task_ThreadPool.cpp +++ b/ACE/examples/APG/ThreadPools/Task_ThreadPool.cpp @@ -14,7 +14,7 @@ public: Workers () { } - virtual int svc (void) + virtual int svc () { while (1) { @@ -63,7 +63,7 @@ public: ACE_TRACE ("Manager::Manager"); } - int svc (void) + int svc () { ACE_TRACE ("Manager::svc"); @@ -95,13 +95,13 @@ public: } private: - int done (void); + int done (); int shutdown_; }; // Listing 1 -int Manager::done (void) +int Manager::done () { return (shutdown_ == 1); } diff --git a/ACE/examples/APG/ThreadPools/ThreadPool.cpp b/ACE/examples/APG/ThreadPools/ThreadPool.cpp index d5db44977f0..112ca57c991 100644 --- a/ACE/examples/APG/ThreadPools/ThreadPool.cpp +++ b/ACE/examples/APG/ThreadPools/ThreadPool.cpp @@ -28,7 +28,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; @@ -55,7 +55,7 @@ public: } // Listing 2 - const ACE_Thread_ID& thread_id (void) + const ACE_Thread_ID& thread_id () { return this->thread_id_; } @@ -93,7 +93,7 @@ public: ACE_TRACE ("Manager::Manager"); } - int svc (void) + int svc () { ACE_TRACE ("Manager::svc"); @@ -134,7 +134,7 @@ public: return 0; } - int shut_down (void); + int shut_down (); const ACE_Thread_ID& thread_id (Worker *worker); @@ -151,7 +151,7 @@ public: } private: - int create_worker_pool (void) + int create_worker_pool () { ACE_GUARD_RETURN (ACE_Thread_Mutex, worker_mon, @@ -168,7 +168,7 @@ private: return 0; } - int done (void); + int done (); private: int shutdown_; @@ -178,13 +178,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/examples/APG/ThreadSafety/Atomic_Op.cpp b/ACE/examples/APG/ThreadSafety/Atomic_Op.cpp index aadbea5068b..df3eea5c359 100644 --- a/ACE/examples/APG/ThreadSafety/Atomic_Op.cpp +++ b/ACE/examples/APG/ThreadSafety/Atomic_Op.cpp @@ -26,7 +26,7 @@ public: : buf_(buf), in_(in), out_(out) { } - int svc (void) + int svc () { SafeInt itemNo = 0; while (1) @@ -68,7 +68,7 @@ public: : buf_(buf), in_(in), out_(out) { } - int svc (void) + int svc () { while (1) { diff --git a/ACE/examples/APG/ThreadSafety/Barrier.cpp b/ACE/examples/APG/ThreadSafety/Barrier.cpp index a6d7b99e131..2bca398321f 100644 --- a/ACE/examples/APG/ThreadSafety/Barrier.cpp +++ b/ACE/examples/APG/ThreadSafety/Barrier.cpp @@ -18,10 +18,10 @@ public: shutdown_barrier_(shutdown_barrier) { } - void initialize_handler (void); - int handle_command_requests (void); + void initialize_handler (); + int handle_command_requests (); - int svc (void) + int svc () { initialize_handler (); startup_barrier_.wait (); @@ -43,7 +43,7 @@ private: // Listing 2 void -HA_CommandHandler::initialize_handler (void) +HA_CommandHandler::initialize_handler () { ACE_Time_Value tv (0, ACE_OS::rand () * 100); timespec_t t = (timespec_t)tv; @@ -51,7 +51,7 @@ HA_CommandHandler::initialize_handler (void) } int -HA_CommandHandler::handle_command_requests (void) +HA_CommandHandler::handle_command_requests () { ACE_Time_Value tv (0, ACE_OS::rand () * 100); timespec_t t = (timespec_t)tv; diff --git a/ACE/examples/APG/ThreadSafety/Mutex.cpp b/ACE/examples/APG/ThreadSafety/Mutex.cpp index 026f95dc587..937ec61b6b1 100644 --- a/ACE/examples/APG/ThreadSafety/Mutex.cpp +++ b/ACE/examples/APG/ThreadSafety/Mutex.cpp @@ -13,7 +13,7 @@ public: { } - virtual int priority (void) + virtual int priority () { return NORMAL; } @@ -21,7 +21,7 @@ public: class CriticalLogMessage : public LogMessage { - virtual int priority (void) + virtual int priority () { return LogMessage::CRITICAL; } diff --git a/ACE/examples/APG/ThreadSafety/RW_Lock.cpp b/ACE/examples/APG/ThreadSafety/RW_Lock.cpp index 27f667ef674..42cd9e629c0 100644 --- a/ACE/examples/APG/ThreadSafety/RW_Lock.cpp +++ b/ACE/examples/APG/ThreadSafety/RW_Lock.cpp @@ -94,7 +94,7 @@ public: Runner(HA_DiscoveryAgent &agent) : agent_(agent) { } - virtual int svc (void) + virtual int svc () { ACE_ASSERT(agent_.contains_device(devices[9]) == 1); agent_.remove_device (devices[9]); diff --git a/ACE/examples/APG/ThreadSafety/Semaphore.cpp b/ACE/examples/APG/ThreadSafety/Semaphore.cpp index 00cf7383a89..6ab1bc3bf33 100644 --- a/ACE/examples/APG/ThreadSafety/Semaphore.cpp +++ b/ACE/examples/APG/ThreadSafety/Semaphore.cpp @@ -15,7 +15,7 @@ public: : psema_(psema), csema_(csema), exit_condition_(0) { } - int svc (void) + int svc () { while (!is_closed ()) consume_item (); @@ -47,7 +47,7 @@ public: } //FUZZ: disable check_for_lack_ACE_OS - void shutdown (void) + void shutdown () { //FUZZ: enable check_for_lack_ACE_OS exit_condition_ = 1; @@ -55,7 +55,7 @@ public: csema_.release (N_THREADS); } - int is_closed (void) + int is_closed () { return exit_condition_; } @@ -77,7 +77,7 @@ public: : psema_(psema), csema_(csema), consumer_(consumer) { } - int svc (void) + int svc () { for (int i = 0; i <= MAX_PROD; i++) produce_item (i); diff --git a/ACE/examples/APG/ThreadSafety/TSS.cpp b/ACE/examples/APG/ThreadSafety/TSS.cpp index f895871be75..71c1590a33a 100644 --- a/ACE/examples/APG/ThreadSafety/TSS.cpp +++ b/ACE/examples/APG/ThreadSafety/TSS.cpp @@ -24,7 +24,7 @@ ClientContext::set_attribute (const char *name, void *value) class HA_CommandHandler : public ACE_Task<ACE_MT_SYNCH> { public: - virtual int svc (void) + virtual int svc () { ACE_thread_t tid = this->thr_mgr ()->thr_self (); // Set our identifier in TSS. @@ -36,7 +36,7 @@ public: return 0; } - int handle_requests (void) + int handle_requests () { ACE_thread_t *tid = (ACE_thread_t*)this->tss_ctx_->get_attribute ("thread_id"); diff --git a/ACE/examples/APG/ThreadSafety/Tokens.cpp b/ACE/examples/APG/ThreadSafety/Tokens.cpp index bf17405a8f4..93765c89c1c 100644 --- a/ACE/examples/APG/ThreadSafety/Tokens.cpp +++ b/ACE/examples/APG/ThreadSafety/Tokens.cpp @@ -64,7 +64,7 @@ public: HA_CommandHandler (HA_Device_Repository &rep) : rep_(rep) { } - int svc (void) + int svc () { for (int i = 0; i < HA_Device_Repository::N_DEVICES; i++) rep_.update_device (i, ""); diff --git a/ACE/examples/APG/ThreadSafety/Tokens_Deadlock.cpp b/ACE/examples/APG/ThreadSafety/Tokens_Deadlock.cpp index baa6e9d6fd4..80754f67685 100644 --- a/ACE/examples/APG/ThreadSafety/Tokens_Deadlock.cpp +++ b/ACE/examples/APG/ThreadSafety/Tokens_Deadlock.cpp @@ -8,7 +8,7 @@ class ThreadOne : public ACE_Task_Base { public: - virtual int svc (void) + virtual int svc () { ACE_Local_Mutex mutex1 (ACE_TEXT ("resource1"), 0, // Deadlock detection enabled. @@ -24,7 +24,7 @@ public: class ThreadTwo : public ACE_Task_Base { public: - virtual int svc (void) + virtual int svc () { ACE_Local_Mutex mutex2 (ACE_TEXT ("resource2"), 0, // Deadlock detection enabled. diff --git a/ACE/examples/APG/Threads/Activate.cpp b/ACE/examples/APG/Threads/Activate.cpp index 6f7b8f0c9e7..3b62a6044ad 100644 --- a/ACE/examples/APG/Threads/Activate.cpp +++ b/ACE/examples/APG/Threads/Activate.cpp @@ -5,7 +5,7 @@ class HA_CommandHandler : public ACE_Task_Base { public: - virtual int svc (void) + virtual int svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Handler Thread running\n"))); diff --git a/ACE/examples/APG/Threads/Condition_Variables.cpp b/ACE/examples/APG/Threads/Condition_Variables.cpp index 659cd018d86..dea1e77d04e 100644 --- a/ACE/examples/APG/Threads/Condition_Variables.cpp +++ b/ACE/examples/APG/Threads/Condition_Variables.cpp @@ -12,13 +12,13 @@ public: HA_Device_Repository() : owner_(0) { } - int is_free (void) + int is_free () { return (this->owner_ == 0); } int is_owner (ACE_Task_Base* tb) { return (this->owner_ == tb); } - ACE_Task_Base *get_owner (void) + ACE_Task_Base *get_owner () { return this->owner_; } void set_owner (ACE_Task_Base *owner) @@ -51,7 +51,7 @@ private: }; // Listing 2 code/ch12 int -HA_CommandHandler::svc (void) +HA_CommandHandler::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Handler Thread running\n"))); diff --git a/ACE/examples/APG/Threads/Message_Queue.cpp b/ACE/examples/APG/Threads/Message_Queue.cpp index 6e609033036..9adc32104bd 100644 --- a/ACE/examples/APG/Threads/Message_Queue.cpp +++ b/ACE/examples/APG/Threads/Message_Queue.cpp @@ -7,7 +7,7 @@ // Listing 5 code/ch12 int -HA_CommandHandler::svc (void) +HA_CommandHandler::svc () { while(1) { @@ -43,7 +43,7 @@ HA_CommandHandler::svc (void) // Listing 4 code/ch12 ACE_Message_Block * -Message_Receiver::shut_down_message (void) +Message_Receiver::shut_down_message () { ACE_Message_Block *mb = 0; ACE_NEW_RETURN diff --git a/ACE/examples/APG/Threads/Message_Receiver.h b/ACE/examples/APG/Threads/Message_Receiver.h index 92f1ab61256..395a94d3a60 100644 --- a/ACE/examples/APG/Threads/Message_Receiver.h +++ b/ACE/examples/APG/Threads/Message_Receiver.h @@ -65,7 +65,7 @@ public: Message_Receiver (HA_CommandHandler *ch) : handler_(ch) { } - ACE_Message_Block *shut_down_message (void); + ACE_Message_Block *shut_down_message (); virtual int handle_input (ACE_HANDLE fd); diff --git a/ACE/examples/APG/Threads/Mutexes.cpp b/ACE/examples/APG/Threads/Mutexes.cpp index 032dd159dd1..29f8c195354 100644 --- a/ACE/examples/APG/Threads/Mutexes.cpp +++ b/ACE/examples/APG/Threads/Mutexes.cpp @@ -33,7 +33,7 @@ public: HA_CommandHandler (HA_Device_Repository& rep) : rep_(rep) { } - virtual int svc (void) + virtual int svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Handler Thread running\n"))); diff --git a/ACE/examples/APG/Timers/CB.cpp b/ACE/examples/APG/Timers/CB.cpp index 722ea94b547..69cd122ee3f 100644 --- a/ACE/examples/APG/Timers/CB.cpp +++ b/ACE/examples/APG/Timers/CB.cpp @@ -54,7 +54,7 @@ CB::setID (long timerID) } long -CB::getID (void) +CB::getID () { ACE_TRACE ("CB::getID"); return timerID_; diff --git a/ACE/examples/APG/Timers/CB.h b/ACE/examples/APG/Timers/CB.h index 3cbf44983cd..d05154a876f 100644 --- a/ACE/examples/APG/Timers/CB.h +++ b/ACE/examples/APG/Timers/CB.h @@ -16,7 +16,7 @@ public: void setID (long timerID); // Get the timer id. - long getID (void); + long getID (); // Handle the timeout. virtual int handle_timeout(const ACE_Time_Value &tv, diff --git a/ACE/examples/APG/Timers/PCB.cpp b/ACE/examples/APG/Timers/PCB.cpp index 542ca97946f..abd93721818 100644 --- a/ACE/examples/APG/Timers/PCB.cpp +++ b/ACE/examples/APG/Timers/PCB.cpp @@ -63,14 +63,14 @@ PCB::getID () const } int -PCB::handleClose (void) +PCB::handleClose () { ACE_TRACE ("PCB::handleClose"); return 0; } int -PCB::handleCancel (void) +PCB::handleCancel () { ACE_TRACE ("PCB::handleCancel"); return 0; diff --git a/ACE/examples/APG/Timers/PCB.h b/ACE/examples/APG/Timers/PCB.h index abe953b30c5..97e64f69c59 100644 --- a/ACE/examples/APG/Timers/PCB.h +++ b/ACE/examples/APG/Timers/PCB.h @@ -15,8 +15,8 @@ public: // Handle a timeout event, cancel, and close. virtual int handleEvent (const void *arg); - virtual int handleCancel (void); - virtual int handleClose (void); + virtual int handleCancel (); + virtual int handleClose (); private: long timerID_; diff --git a/ACE/examples/APG/Timers/PTimerDispatcher.cpp b/ACE/examples/APG/Timers/PTimerDispatcher.cpp index 7601e08bbd8..dbb5b6477e3 100644 --- a/ACE/examples/APG/Timers/PTimerDispatcher.cpp +++ b/ACE/examples/APG/Timers/PTimerDispatcher.cpp @@ -1,6 +1,6 @@ #include "PTimerDispatcher.h" -void PTimer_Dispatcher::wait_for_event (void) +void PTimer_Dispatcher::wait_for_event () { ACE_TRACE ("PTimer_Dispatcher::wait_for_event"); diff --git a/ACE/examples/APG/Timers/PTimerDispatcher.h b/ACE/examples/APG/Timers/PTimerDispatcher.h index 43047c67a8a..12c3ccabe03 100644 --- a/ACE/examples/APG/Timers/PTimerDispatcher.h +++ b/ACE/examples/APG/Timers/PTimerDispatcher.h @@ -11,7 +11,7 @@ class PCB; class PTimer_Dispatcher { public: - void wait_for_event (void); + void wait_for_event (); long schedule (PCB *cb, void *arg, diff --git a/ACE/examples/APG/Timers/TimerDispatcher.cpp b/ACE/examples/APG/Timers/TimerDispatcher.cpp index a2b47e2bf39..9ccc18a7b71 100644 --- a/ACE/examples/APG/Timers/TimerDispatcher.cpp +++ b/ACE/examples/APG/Timers/TimerDispatcher.cpp @@ -1,6 +1,6 @@ #include "TimerDispatcher.h" // Listing 1 code/ch20 -void Timer_Dispatcher::wait_for_event (void) +void Timer_Dispatcher::wait_for_event () { ACE_TRACE ("Timer_Dispatcher::wait_for_event"); diff --git a/ACE/examples/APG/Timers/TimerDispatcher.h b/ACE/examples/APG/Timers/TimerDispatcher.h index 06ce42a8d8a..44df8959af2 100644 --- a/ACE/examples/APG/Timers/TimerDispatcher.h +++ b/ACE/examples/APG/Timers/TimerDispatcher.h @@ -11,7 +11,7 @@ class Timer_Dispatcher { public: - void wait_for_event (void); + void wait_for_event (); long schedule (ACE_Event_Handler *cb, void *arg, diff --git a/ACE/examples/ASX/CCM_App/CCM_App.cpp b/ACE/examples/ASX/CCM_App/CCM_App.cpp index 1b59432e963..9c5ebf23b8d 100644 --- a/ACE/examples/ASX/CCM_App/CCM_App.cpp +++ b/ACE/examples/ASX/CCM_App/CCM_App.cpp @@ -20,8 +20,8 @@ public: virtual int init (int, ACE_TCHAR *[]); virtual int fini (); - virtual int suspend (void); - virtual int resume (void); + virtual int suspend (); + virtual int resume (); }; int @@ -43,7 +43,7 @@ Test_Task::close (u_long) } int -Test_Task::suspend (void) +Test_Task::suspend () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("suspending in %s\n"), @@ -52,7 +52,7 @@ Test_Task::suspend (void) } int -Test_Task::resume (void) +Test_Task::resume () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("resuming in %s\n"), @@ -71,7 +71,7 @@ Test_Task::init (int, ACE_TCHAR *[]) } int -Test_Task::fini (void) +Test_Task::fini () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("finalizing %s (%@)\n"), @@ -87,33 +87,33 @@ ACE_SVC_FACTORY_DEFINE (Test_Task) // Dynamically linked functions used to control configuration. -extern "C" ACE_Svc_Export MT_Stream *make_stream (void); -extern "C" ACE_Svc_Export MT_Module *make_da (void); -extern "C" ACE_Svc_Export MT_Module *make_ea (void); -extern "C" ACE_Svc_Export MT_Module *make_mr (void); +extern "C" ACE_Svc_Export MT_Stream *make_stream (); +extern "C" ACE_Svc_Export MT_Module *make_da (); +extern "C" ACE_Svc_Export MT_Module *make_ea (); +extern "C" ACE_Svc_Export MT_Module *make_mr (); MT_Stream * -make_stream (void) +make_stream () { return new MT_Stream; } MT_Module * -make_da (void) +make_da () { return new MT_Module (ACE_TEXT ("Device_Adapter"), new Test_Task, new Test_Task); } MT_Module * -make_ea (void) +make_ea () { return new MT_Module (ACE_TEXT ("Event_Analyzer"), new Test_Task, new Test_Task); } MT_Module * -make_mr (void) +make_mr () { return new MT_Module (ACE_TEXT ("Multicast_Router"), new Test_Task, new Test_Task); diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp index 287fefcf1fc..defe6108f7e 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp @@ -58,7 +58,7 @@ Consumer_Router::close (u_long) // Handle incoming messages in a separate thread. int -Consumer_Router::svc (void) +Consumer_Router::svc () { assert (this->is_writer ()); diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp index d97f61f976c..862b7a78f20 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp @@ -59,7 +59,7 @@ Event_Analyzer::init (int, ACE_TCHAR *[]) } int -Event_Analyzer::fini (void) +Event_Analyzer::fini () { // No-op for now. return 0; diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp index d8ee1bddc3d..0aaff77865f 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp @@ -13,7 +13,7 @@ Options *Options::instance_ = 0; Options * -Options::instance (void) +Options::instance () { if (Options::instance_ == 0) Options::instance_ = new Options; @@ -21,7 +21,7 @@ Options::instance (void) return Options::instance_; } -Options::Options (void) +Options::Options () : thr_count_ (4), t_flags_ (0), high_water_mark_ (8 * 1024), @@ -36,11 +36,11 @@ Options::Options (void) { } -Options::~Options (void) +Options::~Options () { } -void Options::print_results (void) +void Options::print_results () { #if !defined (ACE_WIN32) ACE_Profile_Timer::ACE_Elapsed_Time et; diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Options.h b/ACE/examples/ASX/Event_Server/Event_Server/Options.h index 5d125cb16ee..d9408f42aa8 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Options.h +++ b/ACE/examples/ASX/Event_Server/Event_Server/Options.h @@ -15,65 +15,65 @@ class Options // = TITLE // Option Singleton for Event Server. public: - static Options *instance (void); + static Options *instance (); // Singleton access point. void parse_args (int argc, ACE_TCHAR *argv[]); // Parse the command-line arguments and set the options. // = Timer management. - void stop_timer (void); - void start_timer (void); + void stop_timer (); + void start_timer (); // = Set/get the number of threads. void thr_count (size_t count); - size_t thr_count (void); + size_t thr_count (); // = Set/get the size of the queue. void initial_queue_length (size_t length); - size_t initial_queue_length (void); + size_t initial_queue_length (); // = Set/get the high water mark. void high_water_mark (size_t size); - size_t high_water_mark (void); + size_t high_water_mark (); // = Set/get the high water mark. void low_water_mark (size_t size); - size_t low_water_mark (void); + size_t low_water_mark (); // = Set/get the size of a message. void message_size (size_t size); - size_t message_size (void); + size_t message_size (); // = Set/get the number of iterations. void iterations (size_t n); - size_t iterations (void); + size_t iterations (); // Set/get threading flags. void t_flags (long flag); - long t_flags (void); + long t_flags (); // Set/get supplier port number. void supplier_port (u_short port); - u_short supplier_port (void); + u_short supplier_port (); // Set/get consumer port number. void consumer_port (u_short port); - u_short consumer_port (void); + u_short consumer_port (); // Enabled if we're in debugging mode. - int debug (void); + int debug (); // Enabled if we're in verbose mode. - int verbose (void); + int verbose (); // Print the results to the STDERR. - void print_results (void); + void print_results (); private: // = Ensure we're a Singleton. - Options (void); - ~Options (void); + Options (); + ~Options (); ACE_Profile_Timer itimer_; // Time the process. diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp index c9b98e55bac..61027fd6943 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp @@ -67,13 +67,13 @@ Peer_Router_Context::bind_peer (ROUTING_KEY key, } void -Peer_Router_Context::duplicate (void) +Peer_Router_Context::duplicate () { this->reference_count_++; } void -Peer_Router_Context::release (void) +Peer_Router_Context::release () { ACE_ASSERT (this->reference_count_ > 0); this->reference_count_--; @@ -116,7 +116,7 @@ Peer_Router_Context::Peer_Router_Context (u_short port) } } -Peer_Router_Context::~Peer_Router_Context (void) +Peer_Router_Context::~Peer_Router_Context () { // Free up the handle and close down the listening socket. ACE_DEBUG ((LM_DEBUG, @@ -151,7 +151,7 @@ Peer_Router_Context::~Peer_Router_Context (void) } Peer_Router * -Peer_Router_Context::peer_router (void) +Peer_Router_Context::peer_router () { return this->peer_router_; } @@ -376,7 +376,7 @@ Peer_Router::control (ACE_Message_Block *mb) // Supplier_Router level in order to get the right level of control // for input and output. -Peer_Handler::svc (void) +Peer_Handler::svc () { ACE_Message_Block *db, *hb; diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.h b/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.h index 1e28194917a..f6a18497525 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.h +++ b/ACE/examples/ASX/Event_Server/Event_Server/Peer_Router.h @@ -82,13 +82,13 @@ public: // <ACE_Acceptor>. // = Set/Get Router Task. - Peer_Router *peer_router (void); + Peer_Router *peer_router (); void peer_router (Peer_Router *); - void release (void); + void release (); // Decrement the reference count and delete <this> when count == 0; - void duplicate (void); + void duplicate (); // Increment the reference count. private: @@ -109,7 +109,7 @@ private: int reference_count_; // Keep track of when we can delete ourselves. - ~Peer_Router_Context (void); + ~Peer_Router_Context (); // Private to ensure dynamic allocation. friend class Friend_Of_Peer_Router_Context; diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp index edea2f8968d..2f9184f12b2 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp @@ -9,7 +9,7 @@ // Handle outgoing messages in a separate thread. int -Supplier_Router::svc (void) +Supplier_Router::svc () { assert (this->is_writer ()); diff --git a/ACE/examples/ASX/Event_Server/Event_Server/event_server.cpp b/ACE/examples/ASX/Event_Server/Event_Server/event_server.cpp index 52c090e6800..0480f360987 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/event_server.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/event_server.cpp @@ -34,10 +34,10 @@ class Event_Server : public ACE_Sig_Adapter // shutdown the <ACE_Reactor> cleanly when a SIGINT is // generated. public: - Event_Server (void); + Event_Server (); // Constructor. - int svc (void); + int svc (); // Run the event-loop for the event server. private: @@ -45,13 +45,13 @@ private: // Hook method called back when a user types something into the // STDIN in order to shut down the program. - int configure_stream (void); + int configure_stream (); // Setup the plumbing in the stream. - int set_watermarks (void); + int set_watermarks (); // Set the high and low queue watermarks. - int run_event_loop (void); + int run_event_loop (); // Run the event-loop for the <Event_Server>. MT_Stream event_server_; @@ -59,7 +59,7 @@ private: // <Modules>. }; -Event_Server::Event_Server (void) +Event_Server::Event_Server () : ACE_Sig_Adapter (ACE_Sig_Handler_Ex (ACE_Reactor::end_event_loop)) // Shutdown the <ACE_Reactor>'s event loop when a SIGINT is // received. @@ -106,7 +106,7 @@ Event_Server::handle_input (ACE_HANDLE) } int -Event_Server::configure_stream (void) +Event_Server::configure_stream () { Peer_Router_Context *src; // Create the <Supplier_Router>'s routing context. This contains a @@ -172,7 +172,7 @@ Event_Server::configure_stream (void) } int -Event_Server::set_watermarks (void) +Event_Server::set_watermarks () { // Set the high and low water marks appropriately. The water marks // control how much data can be buffered before the queues are @@ -195,7 +195,7 @@ Event_Server::set_watermarks (void) } int -Event_Server::run_event_loop (void) +Event_Server::run_event_loop () { // Begin the timer. Options::instance ()->start_timer (); @@ -215,7 +215,7 @@ Event_Server::run_event_loop (void) } int -Event_Server::svc (void) +Event_Server::svc () { if (this->configure_stream () == -1) return -1; diff --git a/ACE/examples/ASX/Event_Server/Transceiver/transceiver.cpp b/ACE/examples/ASX/Event_Server/Transceiver/transceiver.cpp index 2e9f25bf598..a4c4173f562 100644 --- a/ACE/examples/ASX/Event_Server/Transceiver/transceiver.cpp +++ b/ACE/examples/ASX/Event_Server/Transceiver/transceiver.cpp @@ -74,7 +74,7 @@ Event_Transceiver::handle_signal (int, siginfo_t *, ucontext_t *) return 0; } -Event_Transceiver::Event_Transceiver (void) +Event_Transceiver::Event_Transceiver () { } @@ -159,7 +159,7 @@ Event_Transceiver::handle_input (ACE_HANDLE handle) } int -Event_Transceiver::transmitter (void) +Event_Transceiver::transmitter () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) entering %s transmitter\n"), @@ -179,7 +179,7 @@ Event_Transceiver::transmitter (void) } int -Event_Transceiver::receiver (void) +Event_Transceiver::receiver () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) entering %s receiver\n"), diff --git a/ACE/examples/ASX/Message_Queue/buffer_stream.cpp b/ACE/examples/ASX/Message_Queue/buffer_stream.cpp index e8f60673ba1..a6ef0d47449 100644 --- a/ACE/examples/ASX/Message_Queue/buffer_stream.cpp +++ b/ACE/examples/ASX/Message_Queue/buffer_stream.cpp @@ -119,7 +119,7 @@ Common_Task::close (u_long exit_status) // know when to exit. int -Producer::svc (void) +Producer::svc () { // Keep reading stdin, until we reach EOF. @@ -180,7 +180,7 @@ Consumer::put (ACE_Message_Block *mb, ACE_Time_Value *tv) // reading and exit. int -Consumer::svc (void) +Consumer::svc () { int result = 0; diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp index 9f756808704..14f92f99282 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp +++ b/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp @@ -65,7 +65,7 @@ Consumer_Router::close (u_long) // Handle incoming messages in a separate thread.. int -Consumer_Router::svc (void) +Consumer_Router::svc () { ACE_Message_Block *mb = 0; diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp index 511ef3e899b..e6364af591b 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp +++ b/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp @@ -51,7 +51,7 @@ Event_Analyzer::init (int, ACE_TCHAR *[]) } int -Event_Analyzer::fini (void) +Event_Analyzer::fini () { return 0; } diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp index 80084147d6e..a12e7ffb415 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp +++ b/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp @@ -11,7 +11,7 @@ #if defined (ACE_HAS_THREADS) -Options::Options (void) +Options::Options () : thr_count_ (4), t_flags_ (THR_DETACHED), high_water_mark_ (8 * 1024), @@ -28,11 +28,11 @@ Options::Options (void) { } -Options::~Options (void) +Options::~Options () { } -void Options::print_results (void) +void Options::print_results () { ACE_Profile_Timer::ACE_Elapsed_Time et; this->itimer_.elapsed_time (et); diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Options.h b/ACE/examples/ASX/UPIPE_Event_Server/Options.h index a835bbf93a9..ac228624f05 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Options.h +++ b/ACE/examples/ASX/UPIPE_Event_Server/Options.h @@ -17,50 +17,50 @@ class Options { public: - Options (void); - ~Options (void); + Options (); + ~Options (); void parse_args (int argc, ACE_TCHAR *argv[]); - void stop_timer (void); - void start_timer (void); + void stop_timer (); + void start_timer (); void thr_count (size_t count); - size_t thr_count (void); + size_t thr_count (); void initial_queue_length (size_t length); - size_t initial_queue_length (void); + size_t initial_queue_length (); void high_water_mark (size_t size); - size_t high_water_mark (void); + size_t high_water_mark (); void low_water_mark (size_t size); - size_t low_water_mark (void); + size_t low_water_mark (); void message_size (size_t size); - size_t message_size (void); + size_t message_size (); void iterations (size_t n); - size_t iterations (void); + size_t iterations (); void t_flags (long flag); - long t_flags (void); + long t_flags (); void supplier_port (const ACE_TCHAR *port); - const ACE_TCHAR *supplier_port (void); + const ACE_TCHAR *supplier_port (); void consumer_port (const ACE_TCHAR *port); - const ACE_TCHAR *consumer_port (void); + const ACE_TCHAR *consumer_port (); void supplier_file (const ACE_TCHAR *file); - const ACE_TCHAR *supplier_file (void); + const ACE_TCHAR *supplier_file (); void consumer_file (const ACE_TCHAR *file); - const ACE_TCHAR *consumer_file (void); + const ACE_TCHAR *consumer_file (); - int debug (void); - int verbose (void); + int debug (); + int verbose (); - void print_results (void); + void print_results (); private: ACE_Profile_Timer itimer_; // Time the process. diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp index 7e8797e5102..4014c96c53d 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp +++ b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp @@ -50,7 +50,7 @@ Acceptor_Factory<PH, PK>::Acceptor_Factory (Peer_Router<PH, PK> *pr) } template <class PH, class PK> Peer_Router<PH, PK> * -Acceptor_Factory<PH, PK>::router (void) +Acceptor_Factory<PH, PK>::router () { return this->pr_; } @@ -62,7 +62,7 @@ Peer_Handler<ROUTER, KEY>::Peer_Handler (ACE_Thread_Manager *tm) } template <class ROUTER, class KEY> int -Peer_Handler<ROUTER, KEY>::svc (void) +Peer_Handler<ROUTER, KEY>::svc () { // Just a try !! we're just reading from our ACE_Message_Queue. ACE_Message_Block *db, *hb; @@ -203,12 +203,12 @@ Peer_Router<PH, PK>::send_peers (ACE_Message_Block *mb) } template <class PH, class PK> -Peer_Router<PH, PK>::~Peer_Router (void) +Peer_Router<PH, PK>::~Peer_Router () { } template <class PH, class PK> int -Peer_Router<PH, PK>::fini (void) +Peer_Router<PH, PK>::fini () { delete this->acceptor_; return 0; diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h index adac931146a..17ae8c06a62 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h +++ b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h @@ -29,7 +29,7 @@ class Acceptor_Factory : public ACE_Acceptor<PEER_HANDLER, ACE_UPIPE_ACCEPTOR> { public: Acceptor_Factory (Peer_Router<PEER_HANDLER, KEY> *pr); - Peer_Router<PEER_HANDLER, KEY> *router (void); + Peer_Router<PEER_HANDLER, KEY> *router (); int init (int argc, ACE_TCHAR *argv[]); // Initialize the acceptor when it's linked dynamically. @@ -74,7 +74,7 @@ class Peer_Router : public ACE_Task<ACE_MT_SYNCH> { public: Peer_Router (ACE_Thread_Manager * = 0); - ~Peer_Router (void); + ~Peer_Router (); typedef Peer_Handler<Peer_Router<PEER_HANDLER, PEER_KEY>, PEER_KEY> HANDLER; diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp index 17cf3dd51f2..24b880893ae 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp +++ b/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp @@ -32,7 +32,7 @@ Supplier_Router::Supplier_Router (ACE_Thread_Manager *tm) // Handle incoming messages in a separate thread.. int -Supplier_Router::svc (void) +Supplier_Router::svc () { ACE_ASSERT (this->is_writer ()); diff --git a/ACE/examples/ASX/UPIPE_Event_Server/event_server.cpp b/ACE/examples/ASX/UPIPE_Event_Server/event_server.cpp index 06319b23c7e..4f3d42bbe87 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/event_server.cpp +++ b/ACE/examples/ASX/UPIPE_Event_Server/event_server.cpp @@ -27,11 +27,11 @@ typedef ACE_Module<ACE_MT_SYNCH> MT_Module; class Quit_Handler : public ACE_Sig_Adapter { public: - Quit_Handler (void); + Quit_Handler (); virtual int handle_input (ACE_HANDLE fd); }; -Quit_Handler::Quit_Handler (void) +Quit_Handler::Quit_Handler () : ACE_Sig_Adapter (ACE_Sig_Handler_Ex (ACE_Reactor::end_event_loop)) { // Register to trap input from the user. diff --git a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.cpp b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.cpp index 9ff1b557d5d..1c19a83e62e 100644 --- a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.cpp +++ b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.cpp @@ -28,7 +28,7 @@ Input_Device_Wrapper_Base::Input_Device_Wrapper_Base (ACE_Thread_Manager *input_ // Destructor. -Input_Device_Wrapper_Base::~Input_Device_Wrapper_Base (void) +Input_Device_Wrapper_Base::~Input_Device_Wrapper_Base () { } @@ -66,7 +66,7 @@ Input_Device_Wrapper_Base::set_send_count (long count) // if it has already done so, or -1 if there is a problem doing so. int -Input_Device_Wrapper_Base::request_stop (void) +Input_Device_Wrapper_Base::request_stop () { if (is_active_) { @@ -80,7 +80,7 @@ Input_Device_Wrapper_Base::request_stop (void) // This method runs the input device loop in the new thread. int -Input_Device_Wrapper_Base::svc (void) +Input_Device_Wrapper_Base::svc () { ACE_Time_Value timeout; ACE_Message_Block *message; @@ -174,7 +174,7 @@ Input_Device_Wrapper_Base::send_input_message (ACE_Message_Block *amb) } } -Output_Device_Wrapper_Base::~Output_Device_Wrapper_Base (void) +Output_Device_Wrapper_Base::~Output_Device_Wrapper_Base () { } @@ -203,7 +203,7 @@ Bounded_Packet_Relay::Bounded_Packet_Relay (ACE_Thread_Manager *input_task_mgr, // Destructor. -Bounded_Packet_Relay::~Bounded_Packet_Relay (void) +Bounded_Packet_Relay::~Bounded_Packet_Relay () { // Reactivate the queue, and then clear it. queue_.activate (); @@ -219,7 +219,7 @@ Bounded_Packet_Relay::~Bounded_Packet_Relay (void) // Requests output be sent to output device. int -Bounded_Packet_Relay::send_input (void) +Bounded_Packet_Relay::send_input () { // Don't block, return immediately if queue is empty. ACE_Message_Block *item; @@ -392,7 +392,7 @@ Bounded_Packet_Relay::end_transmission (Transmission_Status status) // Requests a report of statistics from the last transmission. int -Bounded_Packet_Relay::report_statistics (void) +Bounded_Packet_Relay::report_statistics () { // Serialize access to start and end transmission calls, // statistics reporting calls. @@ -455,7 +455,7 @@ Bounded_Packet_Relay::receive_input (void * arg) // Get high water mark for relay queue. ACE_UINT32 -Bounded_Packet_Relay::queue_hwm (void) +Bounded_Packet_Relay::queue_hwm () { return queue_lwm_; } @@ -472,7 +472,7 @@ Bounded_Packet_Relay::queue_hwm (ACE_UINT32 hwm) // Get low water mark for relay queue. ACE_UINT32 -Bounded_Packet_Relay::queue_lwm (void) +Bounded_Packet_Relay::queue_lwm () { return queue_lwm_; } @@ -489,7 +489,7 @@ Bounded_Packet_Relay::queue_lwm (ACE_UINT32 lwm) // Returns string corresponding to current status. const char * -Bounded_Packet_Relay::status_msg (void) +Bounded_Packet_Relay::status_msg () { const char *status_msg; switch (status_) diff --git a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.h b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.h index 152bfdb8f9d..1a1ac517dbb 100644 --- a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.h +++ b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.h @@ -72,10 +72,10 @@ public: Output_Device_Wrapper_Base *output_wrapper); /// Destructor. - virtual ~Bounded_Packet_Relay (void); + virtual ~Bounded_Packet_Relay (); /// Requests output be sent to output device. - int send_input (void); + int send_input (); /// Requests a transmission be started. int start_transmission (u_long packet_count, @@ -86,7 +86,7 @@ public: int end_transmission (Transmission_Status status); /// Requests a report of statistics from the last transmission. - int report_statistics (void); + int report_statistics (); // = Command accessible entry points. @@ -96,13 +96,13 @@ public: // = Accessors and mutators for relay settings /// Get high water mark for relay queue. - ACE_UINT32 queue_hwm (void); + ACE_UINT32 queue_hwm (); /// Set high water mark for relay queue. void queue_hwm (ACE_UINT32 hwm); /// Get low water mark for relay queue. - ACE_UINT32 queue_lwm (void); + ACE_UINT32 queue_lwm (); /// Set low water mark for relay queue. void queue_lwm (ACE_UINT32 lwm); @@ -138,7 +138,7 @@ private: // = Transmission Statistics /// Returns string corresponding to current status. - const char *status_msg (void); + const char *status_msg (); /// Number of transmissions sent. u_long transmission_number_; @@ -203,7 +203,7 @@ public: * terminate its thread. Should return 1 if it will do so, 0 if it * has already done so, or -1 if there is a problem doing so. */ - int request_stop (void); + int request_stop (); /// This method runs the input device loop in the new thread. virtual int svc (); @@ -262,7 +262,7 @@ protected: class Output_Device_Wrapper_Base { public: - virtual ~Output_Device_Wrapper_Base (void); + virtual ~Output_Device_Wrapper_Base (); /// Writes contents of the passed message block out to the underlying /// output device. diff --git a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.cpp b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.cpp index b58feac6f95..f4daee10850 100644 --- a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.cpp +++ b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.cpp @@ -24,7 +24,7 @@ // Constructor. template <class TQ> -Bounded_Packet_Relay_Driver<TQ>::Bounded_Packet_Relay_Driver (void) +Bounded_Packet_Relay_Driver<TQ>::Bounded_Packet_Relay_Driver () : packet_count_cmd_ (0), arrival_period_cmd_ (0), transmit_period_cmd_ (0), @@ -45,7 +45,7 @@ Bounded_Packet_Relay_Driver<TQ>::Bounded_Packet_Relay_Driver (void) // Destructor. template <class TQ> -Bounded_Packet_Relay_Driver<TQ>::~Bounded_Packet_Relay_Driver (void) +Bounded_Packet_Relay_Driver<TQ>::~Bounded_Packet_Relay_Driver () { // delete all instantiated command objects delete packet_count_cmd_; @@ -186,7 +186,7 @@ Bounded_Packet_Relay_Driver<TQ>::parse_commands (const char *buf) // Runs the test. template <class TQ> int -Bounded_Packet_Relay_Driver<TQ>::run (void) +Bounded_Packet_Relay_Driver<TQ>::run () { this->init (); @@ -202,7 +202,7 @@ Bounded_Packet_Relay_Driver<TQ>::run (void) // Gets the next request from the user input. template <class TQ> int -Bounded_Packet_Relay_Driver<TQ>::get_next_request (void) +Bounded_Packet_Relay_Driver<TQ>::get_next_request () { char buf[BUFSIZ]; @@ -231,7 +231,7 @@ Bounded_Packet_Relay_Driver<TQ>::read_input (char *buf, size_t bufsiz) // Get count of packets to send in a transmission. template <class TQ> u_long -Bounded_Packet_Relay_Driver<TQ>::packet_count (void) +Bounded_Packet_Relay_Driver<TQ>::packet_count () { return packet_count_; } @@ -247,7 +247,7 @@ Bounded_Packet_Relay_Driver<TQ>::packet_count (u_long pc) // Get rate at which input packets are to arrive. template <class TQ> u_long -Bounded_Packet_Relay_Driver<TQ>::arrival_period (void) +Bounded_Packet_Relay_Driver<TQ>::arrival_period () { return arrival_period_; } @@ -263,7 +263,7 @@ Bounded_Packet_Relay_Driver<TQ>::arrival_period (u_long ap) // Get rate at which packets are to be relayed (usec). template <class TQ> u_long -Bounded_Packet_Relay_Driver<TQ>::send_period (void) +Bounded_Packet_Relay_Driver<TQ>::send_period () { return send_period_; } @@ -279,7 +279,7 @@ Bounded_Packet_Relay_Driver<TQ>::send_period (u_long sp) // Get limit on the duration of the transmission (usec). template <class TQ> u_long -Bounded_Packet_Relay_Driver<TQ>::duration_limit (void) +Bounded_Packet_Relay_Driver<TQ>::duration_limit () { return duration_limit_; } @@ -294,7 +294,7 @@ Bounded_Packet_Relay_Driver<TQ>::duration_limit (u_long dl) // Get logging level. template <class TQ> int -Bounded_Packet_Relay_Driver<TQ>::logging_level (void) +Bounded_Packet_Relay_Driver<TQ>::logging_level () { return logging_level_; } diff --git a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h index 1aa942bc38c..14a289ea0c9 100644 --- a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h +++ b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers_T.h @@ -44,10 +44,10 @@ class Bounded_Packet_Relay_Driver { public: /// Constructor. - Bounded_Packet_Relay_Driver (void); + Bounded_Packet_Relay_Driver (); /// Destructor. - virtual ~Bounded_Packet_Relay_Driver (void); + virtual ~Bounded_Packet_Relay_Driver (); /// Breaks up the input string buffer into pieces and executes the /// appropriate method to handle that operation. @@ -58,11 +58,11 @@ public: * class should normally invoke this method. Returns 0 when * successful, or 0 otherwise. */ - virtual int run (void); + virtual int run (); /// This internal method gets the next request from the user. /// Returns -1 when user wants to exit. Returns 0 otherwise. - virtual int get_next_request (void); + virtual int get_next_request (); /** * Reads input from the user into the buffer <buf> with a maximum of @@ -79,31 +79,31 @@ public: virtual int init (void)=0; /// Get count of packets to send in a transmission. - u_long packet_count (void); + u_long packet_count (); /// Set count of packets to send in a transmission. void packet_count (u_long pc); /// Get rate at which input packets are to arrive. - u_long arrival_period (void); + u_long arrival_period (); /// Set rate at which input packets are to arrive. void arrival_period (u_long ap); /// Get rate at which packets are to be relayed (usec). - u_long send_period (void); + u_long send_period (); /// Set rate at which packets are to be relayed (usec). void send_period (u_long sp); /// Get limit on the duration of the transmission (usec). - u_long duration_limit (void); + u_long duration_limit (); /// Set limit on the duration of the transmission (usec). void duration_limit (u_long dl); /// Get logging level. - int logging_level (void); + int logging_level (); /// Set logging level. void logging_level (int ll); diff --git a/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp b/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp index d6250357ecd..3d33608a433 100644 --- a/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp +++ b/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp @@ -40,7 +40,7 @@ Text_Input_Device_Wrapper::Text_Input_Device_Wrapper (ACE_Thread_Manager *input_ // Destructor. -Text_Input_Device_Wrapper::~Text_Input_Device_Wrapper (void) +Text_Input_Device_Wrapper::~Text_Input_Device_Wrapper () { } @@ -66,7 +66,7 @@ Text_Input_Device_Wrapper::modify_device_settings (void *logging) // read from the underlying input device. ACE_Message_Block * -Text_Input_Device_Wrapper::create_input_message (void) +Text_Input_Device_Wrapper::create_input_message () { // Construct a new message block to send. ACE_Message_Block *mb = 0; @@ -171,7 +171,7 @@ User_Input_Task::User_Input_Task (Bounded_Packet_Relay *relay, // Destructor. -User_Input_Task::~User_Input_Task (void) +User_Input_Task::~User_Input_Task () { this->clear_all_timers (); } @@ -179,7 +179,7 @@ User_Input_Task::~User_Input_Task (void) // Runs the main event loop. int -User_Input_Task::svc (void) +User_Input_Task::svc () { for (;;) // Call back to the driver's implementation of how to read and @@ -446,7 +446,7 @@ User_Input_Task::shutdown (void *) // Helper method: clears all timers. int -User_Input_Task::clear_all_timers (void) +User_Input_Task::clear_all_timers () { // loop through the timers in the queue, cancelling each one for (ACE_Timer_Node_T <ACE_Event_Handler *> *node; @@ -468,7 +468,7 @@ BPR_Handler_Base::BPR_Handler_Base (Bounded_Packet_Relay &relay, // Destructor. -BPR_Handler_Base::~BPR_Handler_Base (void) +BPR_Handler_Base::~BPR_Handler_Base () { } @@ -507,7 +507,7 @@ Send_Handler::Send_Handler (u_long send_count, // Destructor. -Send_Handler::~Send_Handler (void) +Send_Handler::~Send_Handler () { } @@ -558,7 +558,7 @@ Send_Handler::handle_timeout (const ACE_Time_Value &, // Cancellation hook. int -Send_Handler::cancelled (void) +Send_Handler::cancelled () { delete this; return 0; @@ -594,7 +594,7 @@ Termination_Handler::Termination_Handler (Bounded_Packet_Relay &relay, // Destructor. -Termination_Handler::~Termination_Handler (void) +Termination_Handler::~Termination_Handler () { } @@ -622,7 +622,7 @@ Termination_Handler::handle_timeout (const ACE_Time_Value &, // Cancellation hook int -Termination_Handler::cancelled (void) +Termination_Handler::cancelled () { delete this; return 0; @@ -637,14 +637,14 @@ Thread_Bounded_Packet_Relay_Driver::Thread_Bounded_Packet_Relay_Driver (Bounded_ // Destructor. -Thread_Bounded_Packet_Relay_Driver::~Thread_Bounded_Packet_Relay_Driver (void) +Thread_Bounded_Packet_Relay_Driver::~Thread_Bounded_Packet_Relay_Driver () { } // Display the user menu. int -Thread_Bounded_Packet_Relay_Driver::display_menu (void) +Thread_Bounded_Packet_Relay_Driver::display_menu () { static char menu[] = "\n\n Options:\n" @@ -688,7 +688,7 @@ Thread_Bounded_Packet_Relay_Driver::display_menu (void) // Initialize the driver. int -Thread_Bounded_Packet_Relay_Driver::init (void) +Thread_Bounded_Packet_Relay_Driver::init () { // Initialize the <Command> objects with their corresponding // methods from <User_Input_Task>. @@ -746,7 +746,7 @@ Thread_Bounded_Packet_Relay_Driver::init (void) // Run the driver int -Thread_Bounded_Packet_Relay_Driver::run (void) +Thread_Bounded_Packet_Relay_Driver::run () { this->init (); return 0; diff --git a/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h b/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h index 691149db411..56bcf87fe1b 100644 --- a/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h +++ b/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h @@ -76,7 +76,7 @@ public: int logging = 0); /// Destructor. - virtual ~Text_Input_Device_Wrapper (void); + virtual ~Text_Input_Device_Wrapper (); /** * Modifies device settings based on passed pointer to a u_long. @@ -88,7 +88,7 @@ public: protected: /// Creates a new message block, carrying data read from the /// underlying input device. - virtual ACE_Message_Block *create_input_message (void); + virtual ACE_Message_Block *create_input_message (); private: /// Length of the buffer into which to "read". @@ -168,7 +168,7 @@ public: Thread_Bounded_Packet_Relay_Driver &timer_queue_driver); /// Destructor. - virtual ~User_Input_Task (void); + virtual ~User_Input_Task (); /// This method runs the event loop in the new thread. virtual int svc (); @@ -207,7 +207,7 @@ public: int shutdown (void *); /// Helper method: clears all timers. - int clear_all_timers (void); + int clear_all_timers (); private: /// How many microseconds are in a second. @@ -245,7 +245,7 @@ public: Thread_Timer_Queue &queue); /// Destructor. - virtual ~BPR_Handler_Base (void); + virtual ~BPR_Handler_Base (); // = Command accessible entry points. @@ -291,14 +291,14 @@ public: Thread_Bounded_Packet_Relay_Driver &driver); /// Destructor. - virtual ~Send_Handler (void); + virtual ~Send_Handler (); /// Call back hook. virtual int handle_timeout (const ACE_Time_Value ¤t_time, const void *arg); /// Cancellation hook. - virtual int cancelled (void); + virtual int cancelled (); // = Command accessible entry points. @@ -336,14 +336,14 @@ public: Thread_Bounded_Packet_Relay_Driver &driver); /// Destructor. - virtual ~Termination_Handler (void); + virtual ~Termination_Handler (); /// Call back hook. virtual int handle_timeout (const ACE_Time_Value ¤t_time, const void *arg); /// Cancellation hook. - virtual int cancelled (void); + virtual int cancelled (); private: /// Reference to the driver that will redisplay the user input menu. @@ -371,16 +371,16 @@ public: Thread_Bounded_Packet_Relay_Driver (Bounded_Packet_Relay *relay); /// Destructor. - virtual ~Thread_Bounded_Packet_Relay_Driver (void); + virtual ~Thread_Bounded_Packet_Relay_Driver (); /// Displays the user menu. - virtual int display_menu (void); + virtual int display_menu (); /// Initializes the driver. - virtual int init (void); + virtual int init (); /// Run the driver. - virtual int run (void); + virtual int run (); private: /// User input task, subclassed from ACE_Task. diff --git a/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp b/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp index 5ccdc05599b..abffe9238a5 100644 --- a/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp +++ b/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp @@ -35,7 +35,7 @@ class AIO_CLD_Acceptor public: //FUZZ: disable check_for_lack_ACE_OS // Cancel accept and close all clients. - void close (void); + void close (); //FUZZ: enable check_for_lack_ACE_OS // Remove handler from client set. @@ -44,7 +44,7 @@ public: protected: // Service handler factory method. - virtual AIO_Input_Handler *make_handler (void); + virtual AIO_Input_Handler *make_handler (); // Set of all connected clients ACE_Unbounded_Set<AIO_Input_Handler *> clients_; diff --git a/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.h b/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.h index 2709285b859..5ab6fbc034b 100644 --- a/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.h +++ b/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.h @@ -116,7 +116,7 @@ protected: (const ACE_Time_Value&, const void *); // Template method to create a new handler - virtual AIO_Output_Handler *make_handler (void) + virtual AIO_Output_Handler *make_handler () { return OUTPUT_HANDLER::instance (); } // Address at which logging server listens for connections. diff --git a/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp b/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp index 310ee23b1b6..c0722d5ebda 100644 --- a/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp +++ b/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp @@ -12,14 +12,14 @@ #if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS) -Svc_Handler::Svc_Handler (void) +Svc_Handler::Svc_Handler () : mb_ (BUFSIZ + 1) { // An extra byte for null termination. this->mb_.size (BUFSIZ); } -Svc_Handler::~Svc_Handler (void) +Svc_Handler::~Svc_Handler () { } @@ -60,14 +60,14 @@ Svc_Handler::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result) ACE_Proactor::end_event_loop (); } -IPC_Server::IPC_Server (void) +IPC_Server::IPC_Server () : n_threads_ (1), shutdown_ (0) { ACE_OS::strcpy (rendezvous_, ACE_TEXT ("acepipe")); } -IPC_Server::~IPC_Server (void) +IPC_Server::~IPC_Server () { } @@ -108,7 +108,7 @@ IPC_Server::init (int argc, ACE_TCHAR *argv[]) } int -IPC_Server::fini (void) +IPC_Server::fini () { return 0; } @@ -159,7 +159,7 @@ run_reactor_event_loop (void *) } int -IPC_Server::svc (void) +IPC_Server::svc () { // Performs the iterative server activities. while (this->shutdown_ == 0) diff --git a/ACE/examples/Connection/blocking/SPIPE-acceptor.h b/ACE/examples/Connection/blocking/SPIPE-acceptor.h index 539fe2dc525..dd57e993055 100644 --- a/ACE/examples/Connection/blocking/SPIPE-acceptor.h +++ b/ACE/examples/Connection/blocking/SPIPE-acceptor.h @@ -24,8 +24,8 @@ class Svc_Handler : public ACE_Svc_Handler <ACE_SPIPE_STREAM, ACE_NULL_SYNCH>, public ACE_Handler { public: - Svc_Handler (void); - ~Svc_Handler (void); + Svc_Handler (); + ~Svc_Handler (); virtual int open (void *); @@ -41,8 +41,8 @@ private: class IPC_Server : public ACE_Oneshot_Acceptor<Svc_Handler, ACE_SPIPE_ACCEPTOR> { public: - IPC_Server (void); - ~IPC_Server (void); + IPC_Server (); + ~IPC_Server (); // = Dynamic linking hooks. virtual int init (int argc, ACE_TCHAR *argv[]); diff --git a/ACE/examples/Connection/blocking/SPIPE-connector.cpp b/ACE/examples/Connection/blocking/SPIPE-connector.cpp index 65f3dd5b859..330defa5d63 100644 --- a/ACE/examples/Connection/blocking/SPIPE-connector.cpp +++ b/ACE/examples/Connection/blocking/SPIPE-connector.cpp @@ -16,7 +16,7 @@ Peer_Handler::Peer_Handler (int iterations) { } -Peer_Handler::~Peer_Handler (void) +Peer_Handler::~Peer_Handler () { } @@ -122,19 +122,19 @@ Peer_Handler::get_handle () const } void -Peer_Handler::display_menu (void) +Peer_Handler::display_menu () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nplease enter input..: "))); } -IPC_Client::IPC_Client (void) +IPC_Client::IPC_Client () : iterations_ (0), done_handler_ (ACE_Sig_Handler_Ex (ACE_Reactor::end_event_loop)) { ACE_OS::strcpy (rendezvous_, ACE_TEXT ("acepipe")); } -IPC_Client::~IPC_Client (void) +IPC_Client::~IPC_Client () { } @@ -176,13 +176,13 @@ IPC_Client::init (int argc, ACE_TCHAR *argv[]) } int -IPC_Client::fini (void) +IPC_Client::fini () { return 0; } int -IPC_Client::svc (void) +IPC_Client::svc () { ACE_Reactor::instance ()->run_reactor_event_loop (); return 0; diff --git a/ACE/examples/Connection/blocking/SPIPE-connector.h b/ACE/examples/Connection/blocking/SPIPE-connector.h index ae11b7e8b62..13954529c8c 100644 --- a/ACE/examples/Connection/blocking/SPIPE-connector.h +++ b/ACE/examples/Connection/blocking/SPIPE-connector.h @@ -23,7 +23,7 @@ public: // <iterations> is the number of buffers to send. If <iterations> // == 0, then read from stdin. - ~Peer_Handler (void); + ~Peer_Handler (); virtual int open (void * = 0); // Activate the handler when connection is established. @@ -36,7 +36,7 @@ public: virtual ACE_HANDLE get_handle () const; private: - void display_menu (void); + void display_menu (); int iterations_; // No. of buffers to send. @@ -46,8 +46,8 @@ class IPC_Client : public ACE_Connector<Peer_Handler, ACE_SPIPE_CONNECTOR> { public: // Initialization - IPC_Client (void); - ~IPC_Client (void); + IPC_Client (); + ~IPC_Client (); // = Dynamic linking hooks. virtual int init (int argc, ACE_TCHAR *argv[]); diff --git a/ACE/examples/Connection/misc/Connection_Handler.cpp b/ACE/examples/Connection/misc/Connection_Handler.cpp index f33407233aa..5a4a3515276 100644 --- a/ACE/examples/Connection/misc/Connection_Handler.cpp +++ b/ACE/examples/Connection/misc/Connection_Handler.cpp @@ -45,7 +45,7 @@ Connection_Handler::close (u_long) } int -Connection_Handler::svc (void) +Connection_Handler::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) in svc()\n"))); diff --git a/ACE/examples/Connection/misc/test_upipe.h b/ACE/examples/Connection/misc/test_upipe.h index 8c1490db127..27770842273 100644 --- a/ACE/examples/Connection/misc/test_upipe.h +++ b/ACE/examples/Connection/misc/test_upipe.h @@ -24,7 +24,7 @@ public: return 0; } - virtual int svc (void) + virtual int svc () { ACE_TRACE ("Server_Service::svc"); @@ -57,7 +57,7 @@ public: return this->activate (THR_DETACHED | THR_NEW_LWP); } - virtual int svc (void) + virtual int svc () { ACE_TRACE ("Client_Service::svc"); char buf[BUFSIZ]; diff --git a/ACE/examples/Connection/non_blocking/CPP-acceptor.cpp b/ACE/examples/Connection/non_blocking/CPP-acceptor.cpp index 51a61de8bd9..8b20bf97cc0 100644 --- a/ACE/examples/Connection/non_blocking/CPP-acceptor.cpp +++ b/ACE/examples/Connection/non_blocking/CPP-acceptor.cpp @@ -145,19 +145,19 @@ IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::init (int argc, ACE_TCHAR *argv[]) } template <typename SVC_HANDLER, typename PEER_ACCEPTOR> -IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::IPC_Server (void) +IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::IPC_Server () : done_handler_ (ACE_Sig_Handler_Ex (ACE_Reactor::end_event_loop)) { } template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int -IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::fini (void) +IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::fini () { return 0; } template <typename SVC_HANDLER, typename PEER_ACCEPTOR> -IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::~IPC_Server (void) +IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::~IPC_Server () { } @@ -176,7 +176,7 @@ IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::handle_close (ACE_HANDLE handle, // Run the interative service. template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int -IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::svc (void) +IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::svc () { ACE_TCHAR buf[BUFSIZ]; diff --git a/ACE/examples/Connection/non_blocking/CPP-acceptor.h b/ACE/examples/Connection/non_blocking/CPP-acceptor.h index 3c38d7c0d70..e01d505a8ec 100644 --- a/ACE/examples/Connection/non_blocking/CPP-acceptor.h +++ b/ACE/examples/Connection/non_blocking/CPP-acceptor.h @@ -43,10 +43,10 @@ class IPC_Server : public ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR> // = TITLE // This class illustrates how the <ACE_Oneshot_Acceptor> works. public: - IPC_Server (void); + IPC_Server (); // Constructor. - ~IPC_Server (void); + ~IPC_Server (); // Destructor. // = Demultiplexing hooks. diff --git a/ACE/examples/Connection/non_blocking/CPP-connector.cpp b/ACE/examples/Connection/non_blocking/CPP-connector.cpp index 5eaea661e4e..06e89429916 100644 --- a/ACE/examples/Connection/non_blocking/CPP-connector.cpp +++ b/ACE/examples/Connection/non_blocking/CPP-connector.cpp @@ -58,14 +58,14 @@ Peer_Handler<PEER_STREAM>::close (u_long) } template <typename PEER_STREAM> int -Peer_Handler<PEER_STREAM>::uninitialized (void) +Peer_Handler<PEER_STREAM>::uninitialized () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("uninitialized!\n"))); return 0; } template <typename PEER_STREAM> int -Peer_Handler<PEER_STREAM>::connected (void) +Peer_Handler<PEER_STREAM>::connected () { char buf[BUFSIZ]; @@ -96,7 +96,7 @@ Peer_Handler<PEER_STREAM>::connected (void) } template <typename PEER_STREAM> int -Peer_Handler<PEER_STREAM>::stdio (void) +Peer_Handler<PEER_STREAM>::stdio () { char buf[BUFSIZ]; @@ -196,7 +196,7 @@ Peer_Handler<PEER_STREAM>::handle_close (ACE_HANDLE h, } template <typename SVC_HANDLER, typename PEER_CONNECTOR> int -IPC_Client<SVC_HANDLER, PEER_CONNECTOR>::svc (void) +IPC_Client<SVC_HANDLER, PEER_CONNECTOR>::svc () { if (this->reactor ()) this->reactor ()->run_reactor_event_loop (); @@ -205,13 +205,13 @@ IPC_Client<SVC_HANDLER, PEER_CONNECTOR>::svc (void) } template <typename SVC_HANDLER, typename PEER_CONNECTOR> int -IPC_Client<SVC_HANDLER, PEER_CONNECTOR>::fini (void) +IPC_Client<SVC_HANDLER, PEER_CONNECTOR>::fini () { return 0; } template <typename SVC_HANDLER, typename PEER_CONNECTOR> -IPC_Client<SVC_HANDLER, PEER_CONNECTOR>::IPC_Client (void) +IPC_Client<SVC_HANDLER, PEER_CONNECTOR>::IPC_Client () : done_handler_ (ACE_Sig_Handler_Ex (ACE_Reactor::end_event_loop)) { } @@ -261,7 +261,7 @@ IPC_Client<SVC_HANDLER, PEER_CONNECTOR>::init (int argc, ACE_TCHAR *argv[]) } template <typename SVC_HANDLER, typename PEER_CONNECTOR> -IPC_Client<SVC_HANDLER, PEER_CONNECTOR>::~IPC_Client (void) +IPC_Client<SVC_HANDLER, PEER_CONNECTOR>::~IPC_Client () { } diff --git a/ACE/examples/Connection/non_blocking/CPP-connector.h b/ACE/examples/Connection/non_blocking/CPP-connector.h index a6c228d0e9a..8bc322a058d 100644 --- a/ACE/examples/Connection/non_blocking/CPP-connector.h +++ b/ACE/examples/Connection/non_blocking/CPP-connector.h @@ -42,11 +42,11 @@ public: const void *); protected: // = These methods implement the State pattern. - int uninitialized (void); - int connected (void); - int stdio (void); + int uninitialized (); + int connected (); + int stdio (); - int (Peer_Handler<PEER_STREAM>::*action_) (void); + int (Peer_Handler<PEER_STREAM>::*action_) (); // Keeps track of which state we are in. }; @@ -56,10 +56,10 @@ class IPC_Client : public ACE_Connector<SVC_HANDLER, PEER_CONNECTOR> // = TITLE // This class illustrates how the <ACE_Connector> works. public: - IPC_Client (void); + IPC_Client (); // Constructor. - ~IPC_Client (void); + ~IPC_Client (); // Destructor. // = Dynamic linking hooks. diff --git a/ACE/examples/DLL/Newsweek.cpp b/ACE/examples/DLL/Newsweek.cpp index 65856fe18c6..a76a56d459e 100644 --- a/ACE/examples/DLL/Newsweek.cpp +++ b/ACE/examples/DLL/Newsweek.cpp @@ -37,10 +37,10 @@ Newsweek::operator delete (void *ptr) // Returns the Newsweek class pointer. // The ACE_BUILD_SVC_DLL and ACE_Svc_Export directives are necessary to // take care of exporting the function for Win32 platforms. -extern "C" ACE_Svc_Export Magazine *create_magazine (void); +extern "C" ACE_Svc_Export Magazine *create_magazine (); Magazine * -create_magazine (void) +create_magazine () { Magazine *mag = 0; ACE_NEW_RETURN (mag, Newsweek, 0); diff --git a/ACE/examples/DLL/Today.cpp b/ACE/examples/DLL/Today.cpp index 2c48b1053b8..66724929970 100644 --- a/ACE/examples/DLL/Today.cpp +++ b/ACE/examples/DLL/Today.cpp @@ -38,9 +38,9 @@ Today::operator delete (void *ptr) // Returns the pointer to the Today class. // The ACE_BUILD_SVC_DLL and ACE_Svc_Export directives are necessary to // take care of exporting the function for Win32 platforms. -extern "C" ACE_Svc_Export Magazine *create_magazine (void); +extern "C" ACE_Svc_Export Magazine *create_magazine (); -Magazine *create_magazine (void) +Magazine *create_magazine () { Magazine *mag = 0; ACE_NEW_RETURN (mag, Today, 0); diff --git a/ACE/examples/DLL/test_dll.cpp b/ACE/examples/DLL/test_dll.cpp index 5eb1276cc80..4f27a2e0261 100644 --- a/ACE/examples/DLL/test_dll.cpp +++ b/ACE/examples/DLL/test_dll.cpp @@ -6,7 +6,7 @@ #include "ace/Log_Msg.h" #include <memory> -typedef Magazine* (*Magazine_Creator) (void); +typedef Magazine* (*Magazine_Creator) (); int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) diff --git a/ACE/examples/IOStream/server/iostream_server.cpp b/ACE/examples/IOStream/server/iostream_server.cpp index f658f703bad..1128b002ae5 100644 --- a/ACE/examples/IOStream/server/iostream_server.cpp +++ b/ACE/examples/IOStream/server/iostream_server.cpp @@ -24,12 +24,12 @@ Handler::open (void *) return 0; } -Handler::Handler (void) +Handler::Handler () { ACE_DEBUG ((LM_DEBUG, "(%P) starting handler %x\n", this)); } -Handler::~Handler (void) +Handler::~Handler () { ACE_DEBUG ((LM_DEBUG, "(%P) shutting down handler %x\n", this)); ACE_Reactor::end_event_loop (); diff --git a/ACE/examples/IOStream/server/iostream_server.h b/ACE/examples/IOStream/server/iostream_server.h index 9145eb72b98..0e3b6bf6267 100644 --- a/ACE/examples/IOStream/server/iostream_server.h +++ b/ACE/examples/IOStream/server/iostream_server.h @@ -28,8 +28,8 @@ class Handler : public ACE_Svc_Handler<ACE_SOCK_IOStream, ACE_NULL_SYNCH> // iostream characteristics of the peer. { public: - Handler (void); - ~Handler (void); + Handler (); + ~Handler (); // = <Svc_Handler> hooks. virtual int open (void *); diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp index 42d5698fc2f..9933b962de1 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp @@ -18,7 +18,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_main.h" -Options::Options (void) +Options::Options () : host_ (ACE_DEFAULT_SERVER_HOST), port_ (ACE_DEFAULT_SERVER_PORT), sleep_time_ (0, 0), // By default, don't sleep between calls. @@ -35,7 +35,7 @@ Options::Options (void) { } -Options::~Options (void) +Options::~Options () { ACE_MT (delete this->barrier_); delete [] this->message_buf_; @@ -45,7 +45,7 @@ Options::~Options (void) typedef ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX> OPTIONS; int -Options::init (void) +Options::init () { ACE_DEBUG((LM_DEBUG,"Options::init, len = %d\n",this->message_len_)); @@ -376,7 +376,7 @@ Options::twoway_client_test (void *) } ACE_THR_FUNC -Options::thr_func (void) +Options::thr_func () { ACE_DEBUG((LM_DEBUG,"(%P|%t) in thread func, mesg len = %d\n",this->message_len())); if (this->oneway_ == 0) @@ -386,7 +386,7 @@ Options::thr_func (void) } static int -run_client (void) +run_client () { // Raise the socket handle limit to the maximum. ACE::set_handle_limit (); diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.h b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.h index e06aaf8268e..77b9e094740 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.h +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inclient.h @@ -13,10 +13,10 @@ class Options // Define the options for this test. { public: - Options (void); + Options (); // Constructor. - ~Options (void); + ~Options (); // Destructor. int parse_args (int argc, ACE_TCHAR *argv[]); @@ -47,12 +47,12 @@ public: const void *message_buf () const; // Returns a pointer to the message. - ACE_THR_FUNC thr_func (void); + ACE_THR_FUNC thr_func (); // Returns a pointer to the entry point into the thread that runs // the client test function. private: - int init (void); + int init (); // Initialize the message we're sending to the user and set up the // barrier. diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp index 1d5453ba7fe..39ee9d5d3b4 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp @@ -22,17 +22,17 @@ class Handler_Factory // = TITLE // Creates the oneway or twoway handlers. public: - Handler_Factory (void); + Handler_Factory (); // Constructor. - ~Handler_Factory (void); + ~Handler_Factory (); // Destructor. - int handle_events (void); + int handle_events (); // Run the main event loop. private: - int init_acceptors (void); + int init_acceptors (); // Initialize the acceptors. int create_handler (ACE_SOCK_Acceptor &acceptor, @@ -88,7 +88,7 @@ protected: virtual int svc (); // Template method entry point into the handler task. - virtual void print_results (void); + virtual void print_results (); // Print the results. size_t total_bytes_; @@ -110,7 +110,7 @@ public: // Constructor. private: - virtual int run (void); + virtual int run (); // Template Method hook called by <svc>. }; @@ -122,10 +122,10 @@ public: // Constructor. private: - virtual int run (void); + virtual int run (); // Template Method hook called by <svc>. - virtual void print_results (void); + virtual void print_results (); // Print the results. }; @@ -147,11 +147,11 @@ Options::reply_message_len () const return this->reply_message_len_; } -Options::~Options (void) +Options::~Options () { } -Options::Options (void) +Options::Options () : verbose_ (0), port_ (ACE_DEFAULT_SERVER_PORT), reply_message_len_ (24) // Default to the approximate size of an @@ -228,7 +228,7 @@ Handler::close (u_long) } int -Handler::svc (void) +Handler::svc () { // Timer logic. this->timer_.start (); @@ -272,7 +272,7 @@ Handler::parse_header_and_allocate_buffer (char *&request, } void -Handler::print_results (void) +Handler::print_results () { } @@ -284,7 +284,7 @@ Twoway_Handler::Twoway_Handler (ACE_HANDLE handle) // Function entry point into the twoway server task. int -Twoway_Handler::run (void) +Twoway_Handler::run () { // Read data from client (terminate on error). @@ -353,7 +353,7 @@ Oneway_Handler::Oneway_Handler (ACE_HANDLE handle) } void -Oneway_Handler::print_results (void) +Oneway_Handler::print_results () { ACE_Profile_Timer::ACE_Elapsed_Time et; this->timer_.elapsed_time (et); @@ -375,7 +375,7 @@ Oneway_Handler::print_results (void) // Function entry point into the oneway server task. int -Oneway_Handler::run (void) +Oneway_Handler::run () { // Read data from client (terminate on error). @@ -441,7 +441,7 @@ Handler_Factory::make_oneway_handler (ACE_HANDLE handle) } int -Handler_Factory::init_acceptors (void) +Handler_Factory::init_acceptors () { // Create the oneway and twoway server addresses. ACE_INET_Addr twoway_server_addr (OPTIONS::instance ()->port ()); @@ -504,11 +504,11 @@ Handler_Factory::create_handler (ACE_SOCK_Acceptor &acceptor, #endif /* ACE_HAS_THREADS */ } -Handler_Factory::Handler_Factory (void) +Handler_Factory::Handler_Factory () { } -Handler_Factory::~Handler_Factory (void) +Handler_Factory::~Handler_Factory () { this->twoway_acceptor_.close (); this->oneway_acceptor_.close (); @@ -517,7 +517,7 @@ Handler_Factory::~Handler_Factory (void) // Run the main event loop. int -Handler_Factory::handle_events (void) +Handler_Factory::handle_events () { if (this->init_acceptors () == -1) return -1; diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.h b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.h index 6d9adcf89fd..24c3b74ce92 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.h +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.h @@ -9,10 +9,10 @@ class Options // Define the options for this test. { public: - Options (void); + Options (); // Constructor. - ~Options (void); + ~Options (); // Destructor. int parse_args (int argc, ACE_TCHAR *argv[]); diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp index b23f99c9b9c..8ba66a8ba24 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp @@ -36,7 +36,7 @@ static struct pollfd poll_array[MAX_HANDLES]; static Buffer_Info buffer_array[MAX_HANDLES]; static void -init_poll_array (void) +init_poll_array () { int i; diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp index 0e8320c08f4..f1df73461ee 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-memclient.cpp @@ -13,7 +13,7 @@ #include "ace/High_Res_Timer.h" static int -run_client (void) +run_client () { ACE_MEM_Connector connector; ACE_MEM_Stream stream; diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp index 4a1b8667898..1107e306fb7 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp @@ -18,7 +18,7 @@ #include "SSL-client-simple.h" -Options::Options (void) +Options::Options () : host_ (ACE_DEFAULT_SERVER_HOST), port_ (ACE_DEFAULT_SERVER_PORT), sleep_time_ (0, 0), // By default, don't sleep between calls. @@ -31,7 +31,7 @@ Options::Options (void) ACE_OS::strcpy (quit_string_, "q"); } -Options::~Options (void) +Options::~Options () { delete [] this->message_buf_; } @@ -40,7 +40,7 @@ Options::~Options (void) typedef ACE_Singleton<Options, ACE_Null_Mutex> OPTIONS; int -Options::init (void) +Options::init () { // Check for default case. if (this->message_len_ == 0) @@ -201,7 +201,7 @@ Options::shared_client_test (u_short port, // Static function entry point to the oneway client service. void -Options::oneway_client_test (void) +Options::oneway_client_test () { ACE_SSL_SOCK_Stream cli_stream; @@ -249,7 +249,7 @@ Options::oneway_client_test (void) // Static function entry point to the twoway client service. void -Options::twoway_client_test (void) +Options::twoway_client_test () { ACE_SSL_SOCK_Stream cli_stream; @@ -331,7 +331,7 @@ Options::twoway_client_test (void) } void -Options::run (void) +Options::run () { if (this->oneway_ == 0) this->twoway_client_test (); @@ -340,7 +340,7 @@ Options::run (void) } static int -run_client (void) +run_client () { // Raise the socket handle limit to the maximum. ACE::set_handle_limit (); diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h index 96f3179ee2c..80456d84a78 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client-simple.h @@ -13,10 +13,10 @@ class Options // Define the options for this test. { public: - Options (void); + Options (); // Constructor. - ~Options (void); + ~Options (); // Destructor. int parse_args (int argc, ACE_TCHAR *argv[]); @@ -44,11 +44,11 @@ public: const void *message_buf () const; // Returns a pointer to the message. - void run (void); + void run (); // Run the test private: - int init (void); + int init (); // Initialize the message we're sending to the user and set up the // barrier. @@ -57,10 +57,10 @@ private: // Performs the shared behavior of the oneway and twoway client // tests. - void twoway_client_test (void); + void twoway_client_test (); // Performs the twoway test. - void oneway_client_test (void); + void oneway_client_test (); // Performs the oneway test. const ACE_TCHAR *host_; diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.cpp index ffbeedbf8eb..cc035647927 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.cpp +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.cpp @@ -17,7 +17,7 @@ #include "SSL-client.h" -Options::Options (void) +Options::Options () : host_ (ACE_DEFAULT_SERVER_HOST), port_ (ACE_DEFAULT_SERVER_PORT), sleep_time_ (0, 0), // By default, don't sleep between calls. @@ -34,7 +34,7 @@ Options::Options (void) ACE_OS::strcpy (quit_string_, "q"); } -Options::~Options (void) +Options::~Options () { ACE_MT (delete this->barrier_); delete [] this->message_buf_; @@ -44,7 +44,7 @@ Options::~Options (void) typedef ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX> OPTIONS; int -Options::init (void) +Options::init () { // Check for default case. if (this->message_len_ == 0) @@ -371,7 +371,7 @@ Options::twoway_client_test (void *) } ACE_THR_FUNC -Options::thr_func (void) +Options::thr_func () { if (this->oneway_ == 0) return ACE_THR_FUNC (&Options::twoway_client_test); @@ -380,7 +380,7 @@ Options::thr_func (void) } static int -run_client (void) +run_client () { // Raise the socket handle limit to the maximum. ACE::set_handle_limit (); diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h index db869ac2b6a..57857970701 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-client.h @@ -15,10 +15,10 @@ class Options { public: // Constructor. - Options (void); + Options (); // Destructor. - ~Options (void); + ~Options (); // Parse the command-line arguments. int parse_args (int argc, ACE_TCHAR *argv[]); @@ -50,12 +50,12 @@ public: // Returns a pointer to the entry point into the thread that runs // the client test function. - ACE_THR_FUNC thr_func (void); + ACE_THR_FUNC thr_func (); private: // Initialize the message we're sending to the user and set up the // barrier. - int init (void); + int init (); // Performs the shared behavior of the oneway and twoway client // tests. diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp index 1e1a552154d..8ff0fde8a55 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp @@ -22,17 +22,17 @@ class Handler_Factory // = TITLE // Creates the oneway or twoway handlers. public: - Handler_Factory (void); + Handler_Factory (); // Constructor. - ~Handler_Factory (void); + ~Handler_Factory (); // Destructor. - int handle_events (void); + int handle_events (); // Run the main event loop. private: - int init_acceptors (void); + int init_acceptors (); // Initialize the acceptors. int create_handler (ACE_SSL_SOCK_Acceptor &acceptor, @@ -89,7 +89,7 @@ protected: virtual int svc (); // Template method entry point into the handler task. - virtual void print_results (void); + virtual void print_results (); // Print the results. size_t total_bytes_; @@ -114,7 +114,7 @@ public: // Constructor. private: - virtual int run (void); + virtual int run (); // Template Method hook called by <svc>. }; @@ -126,10 +126,10 @@ public: // Constructor. private: - virtual int run (void); + virtual int run (); // Template Method hook called by <svc>. - virtual void print_results (void); + virtual void print_results (); // Print the results. }; @@ -151,11 +151,11 @@ Options::reply_message_len () const return ACE_Utils::truncate_cast<int> (this->reply_message_len_); } -Options::~Options (void) +Options::~Options () { } -Options::Options (void) +Options::Options () : verbose_ (0), port_ (ACE_DEFAULT_SERVER_PORT), reply_message_len_ (24) // Default to the approximate size of an @@ -236,7 +236,7 @@ Handler::close (u_long) } int -Handler::svc (void) +Handler::svc () { // Timer logic. this->timer_.start (); @@ -280,7 +280,7 @@ Handler::parse_header_and_allocate_buffer (char *&request, } void -Handler::print_results (void) +Handler::print_results () { } @@ -292,7 +292,7 @@ Twoway_Handler::Twoway_Handler (ACE_SSL_SOCK_Stream* ssl_stream) // Function entry point into the twoway server task. int -Twoway_Handler::run (void) +Twoway_Handler::run () { // Read data from client (terminate on error). @@ -364,7 +364,7 @@ Oneway_Handler::Oneway_Handler (ACE_SSL_SOCK_Stream *ssl_stream) } void -Oneway_Handler::print_results (void) +Oneway_Handler::print_results () { ACE_Profile_Timer::ACE_Elapsed_Time et; this->timer_.elapsed_time (et); @@ -386,7 +386,7 @@ Oneway_Handler::print_results (void) // Function entry point into the oneway server task. int -Oneway_Handler::run (void) +Oneway_Handler::run () { // Read data from client (terminate on error). @@ -455,7 +455,7 @@ Handler_Factory::make_oneway_handler (ACE_SSL_SOCK_Stream *ssl_stream) } int -Handler_Factory::init_acceptors (void) +Handler_Factory::init_acceptors () { // Create the oneway and twoway server addresses. ACE_INET_Addr twoway_server_addr (OPTIONS::instance ()->port ()); @@ -521,11 +521,11 @@ Handler_Factory::create_handler ( #endif /* ACE_HAS_THREADS */ } -Handler_Factory::Handler_Factory (void) +Handler_Factory::Handler_Factory () { } -Handler_Factory::~Handler_Factory (void) +Handler_Factory::~Handler_Factory () { this->twoway_acceptor_.close (); this->oneway_acceptor_.close (); @@ -534,7 +534,7 @@ Handler_Factory::~Handler_Factory (void) // Run the main event loop. int -Handler_Factory::handle_events (void) +Handler_Factory::handle_events () { if (this->init_acceptors () == -1) return -1; diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.h b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.h index 3fb64a1c7eb..974dc63ccdc 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.h +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.h @@ -10,10 +10,10 @@ class Options // Define the options for this test. { public: - Options (void); + Options (); // Constructor. - ~Options (void); + ~Options (); // Destructor. int parse_args (int argc, ACE_TCHAR *argv[]); diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp index 74cf402d4d4..f4094eaf5cd 100644 --- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp +++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp @@ -40,7 +40,7 @@ static struct pollfd poll_array[MAX_HANDLES]; static Buffer_Info buffer_array[MAX_HANDLES]; static void -init_poll_array (void) +init_poll_array () { int i; diff --git a/ACE/examples/Log_Msg/test_log_msg.cpp b/ACE/examples/Log_Msg/test_log_msg.cpp index 4da36aaddd4..5eb33e13d29 100644 --- a/ACE/examples/Log_Msg/test_log_msg.cpp +++ b/ACE/examples/Log_Msg/test_log_msg.cpp @@ -22,14 +22,14 @@ static void -cleanup (void) +cleanup () { ACE_DEBUG ((LM_INFO, "leaving (%P)!\n")); } static void -cause_error (void) +cause_error () { errno = EWOULDBLOCK; ACE_ERROR ((LM_DEBUG, diff --git a/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp b/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp index 10b599142a9..ba53e2b3af6 100644 --- a/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp +++ b/ACE/examples/Logger/Acceptor-server/server_loggerd.cpp @@ -29,7 +29,7 @@ // Return the port number. u_short -Options::port (void) +Options::port () { return this->port_; } @@ -76,7 +76,7 @@ Logging_Acceptor; // Default constructor. -Logging_Handler::Logging_Handler (void) +Logging_Handler::Logging_Handler () { } diff --git a/ACE/examples/Logger/Acceptor-server/server_loggerd.h b/ACE/examples/Logger/Acceptor-server/server_loggerd.h index 4a20bba2cb8..46820b903ee 100644 --- a/ACE/examples/Logger/Acceptor-server/server_loggerd.h +++ b/ACE/examples/Logger/Acceptor-server/server_loggerd.h @@ -13,7 +13,7 @@ class Options // Keeps track of the options. public: void parse_args (int argc, ACE_TCHAR *argv[]); - u_short port (void); + u_short port (); private: u_short port_; @@ -32,7 +32,7 @@ class Logging_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> // utilize the <ACE_Reactor> timer mechanisms, as well. { public: - Logging_Handler (void); + Logging_Handler (); // = Hooks for opening and closing handlers. virtual int open (void *); diff --git a/ACE/examples/Logger/simple-server/Logging_Handler.cpp b/ACE/examples/Logger/simple-server/Logging_Handler.cpp index df4ec12799e..8b58ade2c5c 100644 --- a/ACE/examples/Logger/simple-server/Logging_Handler.cpp +++ b/ACE/examples/Logger/simple-server/Logging_Handler.cpp @@ -19,7 +19,7 @@ Logging_Handler::~Logging_Handler () // Extract the underlying ACE_SOCK_Stream (e.g., for purposes of // accept()). ACE_SOCK_Stream & -Logging_Handler::peer (void) +Logging_Handler::peer () { return this->cli_stream_; } @@ -140,7 +140,7 @@ Logging_Handler::get_handle () const } int -Logging_Handler::open (void) +Logging_Handler::open () { ACE_INET_Addr addr; @@ -183,7 +183,7 @@ Logging_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask) // Perform termination activities when close fails. int -Logging_Handler::close (void) +Logging_Handler::close () { return this->handle_close (); } diff --git a/ACE/examples/Mem_Map/IO-tests/IO_Test.cpp b/ACE/examples/Mem_Map/IO-tests/IO_Test.cpp index 3401fb675a1..1d1167cf673 100644 --- a/ACE/examples/Mem_Map/IO-tests/IO_Test.cpp +++ b/ACE/examples/Mem_Map/IO-tests/IO_Test.cpp @@ -14,12 +14,12 @@ IO_Test::IO_Test (const char *name, { } -IO_Test::~IO_Test (void) +IO_Test::~IO_Test () { } const char * -IO_Test::name (void) +IO_Test::name () { return this->name_; } diff --git a/ACE/examples/Mem_Map/IO-tests/IO_Test.h b/ACE/examples/Mem_Map/IO-tests/IO_Test.h index 5098a992656..58c541e5baf 100644 --- a/ACE/examples/Mem_Map/IO-tests/IO_Test.h +++ b/ACE/examples/Mem_Map/IO-tests/IO_Test.h @@ -17,10 +17,10 @@ public: ACE_Profile_Timer &tm); // Destructor. - virtual ~IO_Test (void); + virtual ~IO_Test (); // Return the name of the test - const char *name (void); + const char *name (); // Execute the IO test (note this is a pure virtual function...) virtual int run_test (int iterations, diff --git a/ACE/examples/Mem_Map/IO-tests/test_io.cpp b/ACE/examples/Mem_Map/IO-tests/test_io.cpp index 65a48a0d65b..4ddbe0931e4 100644 --- a/ACE/examples/Mem_Map/IO-tests/test_io.cpp +++ b/ACE/examples/Mem_Map/IO-tests/test_io.cpp @@ -32,7 +32,7 @@ static ACE_Profile_Timer profile_timer; // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_OS::fprintf (stderr, "usage: %s" " [-i input_file] [-o output_file] [-n iteration_count] [-r]\n", diff --git a/ACE/examples/Misc/test_trace.cpp b/ACE/examples/Misc/test_trace.cpp index 13770d82a1c..c2d6a5caaa0 100644 --- a/ACE/examples/Misc/test_trace.cpp +++ b/ACE/examples/Misc/test_trace.cpp @@ -47,7 +47,7 @@ public: int recursive (size_t depth); - virtual int svc (void) + virtual int svc () { return this->recursive (this->depth_); } @@ -71,7 +71,7 @@ My_Task::recursive (size_t depth) extern "C" void -exithook (void) +exithook () { ACE_TRACE ("void exithook (void)"); diff --git a/ACE/examples/Monitor/Bytes_Sent/bytes_sent.cpp b/ACE/examples/Monitor/Bytes_Sent/bytes_sent.cpp index d26d2418051..60e7eca8ba5 100644 --- a/ACE/examples/Monitor/Bytes_Sent/bytes_sent.cpp +++ b/ACE/examples/Monitor/Bytes_Sent/bytes_sent.cpp @@ -14,7 +14,7 @@ using namespace ACE_VERSIONED_NAMESPACE_NAME::ACE::Monitor_Control; class Monitor_Checker : public ACE_Task_Base { public: - int svc (void) + int svc () { /// Get an instance of the MC service singleton. MC_ADMINMANAGER* mgr = diff --git a/ACE/examples/Monitor/CPU_Load/cpu_load.cpp b/ACE/examples/Monitor/CPU_Load/cpu_load.cpp index 5df97778106..4fe244f651d 100644 --- a/ACE/examples/Monitor/CPU_Load/cpu_load.cpp +++ b/ACE/examples/Monitor/CPU_Load/cpu_load.cpp @@ -12,7 +12,7 @@ class Monitor_Checker : public ACE_Task_Base { public: - int svc (void) + int svc () { /// Get an instance of the MC service singleton. MC_ADMINMANAGER* mgr = diff --git a/ACE/examples/Monitor/Constraint/constraint.cpp b/ACE/examples/Monitor/Constraint/constraint.cpp index ae05c8b852a..a85aa9c70cd 100644 --- a/ACE/examples/Monitor/Constraint/constraint.cpp +++ b/ACE/examples/Monitor/Constraint/constraint.cpp @@ -34,7 +34,7 @@ class Trigger16k : public Control_Action class Monitor_Checker : public ACE_Task_Base { public: - int svc (void) + int svc () { /// Get an instance of the MC service singleton. MC_ADMINMANAGER* mgr = diff --git a/ACE/examples/Monitor/Group/group.cpp b/ACE/examples/Monitor/Group/group.cpp index 6de5850b054..30e6c309d25 100644 --- a/ACE/examples/Monitor/Group/group.cpp +++ b/ACE/examples/Monitor/Group/group.cpp @@ -17,7 +17,7 @@ using namespace ACE_VERSIONED_NAMESPACE_NAME::ACE::Monitor_Control; class Monitor_Checker : public ACE_Task_Base { public: - int svc (void) + int svc () { /// Get an instance of the MC service singleton. MC_ADMINMANAGER* mgr = diff --git a/ACE/examples/Monitor/Memory_Usage/memory_usage.cpp b/ACE/examples/Monitor/Memory_Usage/memory_usage.cpp index 7d335a38631..c46b7d77b9a 100644 --- a/ACE/examples/Monitor/Memory_Usage/memory_usage.cpp +++ b/ACE/examples/Monitor/Memory_Usage/memory_usage.cpp @@ -12,7 +12,7 @@ class Monitor_Checker : public ACE_Task_Base { public: - int svc (void) + int svc () { /// Get an instance of the MC service singleton. MC_ADMINMANAGER* mgr = diff --git a/ACE/examples/Monitor/Message_Queue_Size/message_queue_size.cpp b/ACE/examples/Monitor/Message_Queue_Size/message_queue_size.cpp index de57420f0b7..7f4606c2256 100644 --- a/ACE/examples/Monitor/Message_Queue_Size/message_queue_size.cpp +++ b/ACE/examples/Monitor/Message_Queue_Size/message_queue_size.cpp @@ -20,7 +20,7 @@ public: { } - int svc (void) + int svc () { /// Reconstruct the monitor's unique name using the queue's hex address. const int nibbles = 2 * sizeof (ptrdiff_t); diff --git a/ACE/examples/Monitor/Num_Threads/num_threads.cpp b/ACE/examples/Monitor/Num_Threads/num_threads.cpp index 5bc46daec4f..a9b829de9bc 100644 --- a/ACE/examples/Monitor/Num_Threads/num_threads.cpp +++ b/ACE/examples/Monitor/Num_Threads/num_threads.cpp @@ -9,7 +9,7 @@ class Worker : public ACE_Task_Base { public: - int svc (void) + int svc () { ACE_OS::sleep (5); return 0; @@ -22,7 +22,7 @@ public: class Monitor_Checker : public ACE_Task_Base { public: - int svc (void) + int svc () { /// Get an instance of the MC service singleton. MC_ADMINMANAGER* mgr = diff --git a/ACE/examples/NT_Service/main.cpp b/ACE/examples/NT_Service/main.cpp index b895d94c888..fd3a982bc68 100644 --- a/ACE/examples/NT_Service/main.cpp +++ b/ACE/examples/NT_Service/main.cpp @@ -27,15 +27,15 @@ class Process { public: - Process (void); - ~Process (void); + Process (); + ~Process (); int run(int argc, ACE_TCHAR* argv[]); private: void parse_args (int argc, ACE_TCHAR* argv[]); - void print_usage_and_die (void); + void print_usage_and_die (); private: char progname[128]; @@ -52,7 +52,7 @@ private: typedef ACE_Singleton<Process, ACE_Mutex> PROCESS; -Process::Process (void) +Process::Process () : opt_install (0), opt_remove (0), opt_start (0), @@ -66,13 +66,13 @@ Process::Process (void) ACE::init (); } -Process::~Process (void) +Process::~Process () { ACE::fini (); } void -Process::print_usage_and_die (void) +Process::print_usage_and_die () { ACE_DEBUG ((LM_INFO, "Usage: %s" diff --git a/ACE/examples/NT_Service/ntsvc.cpp b/ACE/examples/NT_Service/ntsvc.cpp index 2f1b2245798..451bf5e303f 100644 --- a/ACE/examples/NT_Service/ntsvc.cpp +++ b/ACE/examples/NT_Service/ntsvc.cpp @@ -16,13 +16,13 @@ #if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES) -Service::Service (void) +Service::Service () { // Remember the Reactor instance. reactor (ACE_Reactor::instance ()); } -Service::~Service (void) +Service::~Service () { if (ACE_Reactor::instance ()->cancel_timer(this) == -1) ACE_ERROR ((LM_ERROR, @@ -78,7 +78,7 @@ Service::handle_timeout (const ACE_Time_Value &tv, // request is received. int -Service::svc (void) +Service::svc () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Service::svc\n"))); diff --git a/ACE/examples/NT_Service/ntsvc.h b/ACE/examples/NT_Service/ntsvc.h index 02d212adbd3..a7826d301ec 100644 --- a/ACE/examples/NT_Service/ntsvc.h +++ b/ACE/examples/NT_Service/ntsvc.h @@ -27,9 +27,9 @@ class Service : public ACE_NT_Service { public: - Service (void); + Service (); - ~Service (void); + ~Service (); /// We override <handle_control> because it handles stop requests /// privately. diff --git a/ACE/examples/OS/Process/imore.cpp b/ACE/examples/OS/Process/imore.cpp index 9a191a84b1c..46233c6f975 100644 --- a/ACE/examples/OS/Process/imore.cpp +++ b/ACE/examples/OS/Process/imore.cpp @@ -41,7 +41,7 @@ static ACE_TCHAR *fname = 0; // File you want to view. static int use_named_pipe = 0; // Do we want to use named pipe? static void -usage (void) +usage () { ACE_ERROR ((LM_ERROR, "Usage: imore [-n|-u] <filename>\n" "\t-n Use named pipe.\n" diff --git a/ACE/examples/OS/Process/process.cpp b/ACE/examples/OS/Process/process.cpp index 75eab28aecb..87e8e53f29e 100644 --- a/ACE/examples/OS/Process/process.cpp +++ b/ACE/examples/OS/Process/process.cpp @@ -112,7 +112,7 @@ parse_args (int argc, ACE_TCHAR **argv) // This shows how to set handles. static void -test_more (void) +test_more () { ACE_HANDLE infile = ACE_OS::open (print_file, O_RDONLY); @@ -150,7 +150,7 @@ test_more (void) // This is a simple usage of ACE_Process. static void -test_date (void) +test_date () { ACE_Process_Options options; options.command_line (DATE_PATH); @@ -177,7 +177,7 @@ test_date (void) } static void -test_ls (void) +test_ls () { ACE_Process_Options options; options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs ACE_TEXT (" -al"), LS_PATH); @@ -199,7 +199,7 @@ test_ls (void) } static void -test_wait (void) +test_wait () { ACE_Process_Options options; options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs ACE_TEXT (" 10"), SLEEP_PATH); @@ -275,7 +275,7 @@ test_wait (void) // This is just to test the direct usage of CreateProcess. I use this // occasionally as a sanity check when ACE_Process breaks. static void -win32_test_ls (void) +win32_test_ls () { PROCESS_INFORMATION process_info; ACE_TEXT_STARTUPINFO startup_info; @@ -338,7 +338,7 @@ win32_test_ls (void) // environment variables. static void -win32_spawn_environment_process (void) +win32_spawn_environment_process () { PROCESS_INFORMATION process_info; ACE_TEXT_STARTUPINFO startup_info; diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp index 9802af0b8ab..09b2ac53256 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.cpp @@ -4,7 +4,7 @@ const iovec Fill_ACE_QoS::iov_ = {0,0}; -Fill_ACE_QoS::Fill_ACE_QoS (void) +Fill_ACE_QoS::Fill_ACE_QoS () { ACE_NEW (this->default_traffic_, ACE_Flow_Spec (ACE_QOS_NOT_SPECIFIED, @@ -20,7 +20,7 @@ Fill_ACE_QoS::Fill_ACE_QoS (void) } // destructor. -Fill_ACE_QoS::~Fill_ACE_QoS (void) +Fill_ACE_QoS::~Fill_ACE_QoS () {} int @@ -89,7 +89,7 @@ Fill_ACE_QoS::fill_duplex_qos (ACE_QoS &ace_qos, } Fill_ACE_QoS::FLOW_SPEC_HASH_MAP& -Fill_ACE_QoS::map (void) +Fill_ACE_QoS::map () { return this->flow_spec_map_; } diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h b/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h index 30097a33960..a454c049153 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Fill_ACE_QoS.h @@ -33,10 +33,10 @@ public: //Initialization and termination methods. /// constructor. - Fill_ACE_QoS (void); + Fill_ACE_QoS (); /// destructor. - ~Fill_ACE_QoS (void); + ~Fill_ACE_QoS (); /// To be used by receivers. Fills the receiver qos and sets the /// sender qos to NO_TRAFFIC. @@ -55,7 +55,7 @@ public: const ACE_CString &send_flow_name); /// Returns the hash map of flowspecs indexed by flowspec name. - FLOW_SPEC_HASH_MAP& map (void); + FLOW_SPEC_HASH_MAP& map (); private: // The Service Provider is currently set to NULL for all ACE_QoS. diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp index 424fa4b09ac..551e3fe380c 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.cpp @@ -24,14 +24,14 @@ QoS_Util::QoS_Util (int argc, } // destructor. -QoS_Util::~QoS_Util (void) +QoS_Util::~QoS_Util () { delete this->mult_session_addr_; delete this->dest_addr_; } int -QoS_Util::parse_args (void) +QoS_Util::parse_args () { ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c")); int c = 0; diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h index b3dccdb02e6..4c69c80de3f 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/QoS_Util.h @@ -28,10 +28,10 @@ public: QoS_Util (int argc, ACE_TCHAR *argv[]); // destructor. - ~QoS_Util (void); + ~QoS_Util (); // Parse command-line arguments. - int parse_args (void); + int parse_args (); // GET methods. ACE_INET_Addr *mult_session_addr () const; diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.cpp index f20d0937f87..95cfd81bafa 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.cpp +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.cpp @@ -15,7 +15,7 @@ #include "Fill_ACE_QoS.h" // Constructor. -Receiver_QoS_Event_Handler::Receiver_QoS_Event_Handler (void) +Receiver_QoS_Event_Handler::Receiver_QoS_Event_Handler () { } @@ -28,7 +28,7 @@ Receiver_QoS_Event_Handler::Receiver_QoS_Event_Handler (const ACE_SOCK_Dgram_Mca } // Destructor. -Receiver_QoS_Event_Handler::~Receiver_QoS_Event_Handler (void) +Receiver_QoS_Event_Handler::~Receiver_QoS_Event_Handler () { } diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h b/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h index 003c171ad22..7bb5f8301e2 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h @@ -22,14 +22,14 @@ class Receiver_QoS_Event_Handler : public ACE_Event_Handler { public: /// Constructor. - Receiver_QoS_Event_Handler (void); + Receiver_QoS_Event_Handler (); /// Constructor. Receiver_QoS_Event_Handler (const ACE_SOCK_Dgram_Mcast_QoS &dgram_mcast_qos, ACE_QoS_Session *qos_session); /// Destructor. - ~Receiver_QoS_Event_Handler (void); + ~Receiver_QoS_Event_Handler (); /// Override this to return the handle of the Dgram_Mcast /// that we are using. diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp index 1eab340fd82..af8eab0cc77 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp @@ -15,7 +15,7 @@ #include "Fill_ACE_QoS.h" // Constructor. -Sender_QoS_Event_Handler::Sender_QoS_Event_Handler (void) +Sender_QoS_Event_Handler::Sender_QoS_Event_Handler () { } @@ -29,7 +29,7 @@ Sender_QoS_Event_Handler::Sender_QoS_Event_Handler (const ACE_SOCK_Dgram_Mcast_Q } // Destructor. -Sender_QoS_Event_Handler::~Sender_QoS_Event_Handler (void) +Sender_QoS_Event_Handler::~Sender_QoS_Event_Handler () { } diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h b/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h index 316e7710122..55896d2c54a 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h @@ -25,14 +25,14 @@ class Sender_QoS_Event_Handler : public ACE_Event_Handler { public: /// Constructor. - Sender_QoS_Event_Handler (void); + Sender_QoS_Event_Handler (); /// Constructor. Sender_QoS_Event_Handler (const ACE_SOCK_Dgram_Mcast_QoS &dgram_mcast_qos, ACE_QoS_Session *qos_session); /// Destructor. - ~Sender_QoS_Event_Handler (void); + ~Sender_QoS_Event_Handler (); /// Override this to return the handle of the Dgram_Mcast /// that we are using. diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp b/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp index 9802af0b8ab..09b2ac53256 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.cpp @@ -4,7 +4,7 @@ const iovec Fill_ACE_QoS::iov_ = {0,0}; -Fill_ACE_QoS::Fill_ACE_QoS (void) +Fill_ACE_QoS::Fill_ACE_QoS () { ACE_NEW (this->default_traffic_, ACE_Flow_Spec (ACE_QOS_NOT_SPECIFIED, @@ -20,7 +20,7 @@ Fill_ACE_QoS::Fill_ACE_QoS (void) } // destructor. -Fill_ACE_QoS::~Fill_ACE_QoS (void) +Fill_ACE_QoS::~Fill_ACE_QoS () {} int @@ -89,7 +89,7 @@ Fill_ACE_QoS::fill_duplex_qos (ACE_QoS &ace_qos, } Fill_ACE_QoS::FLOW_SPEC_HASH_MAP& -Fill_ACE_QoS::map (void) +Fill_ACE_QoS::map () { return this->flow_spec_map_; } diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h b/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h index 090eb11d9b7..e47fba10de0 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h +++ b/ACE/examples/QOS/Change_Sender_TSpec/Fill_ACE_QoS.h @@ -32,10 +32,10 @@ public: //Initialization and termination methods. /// constructor. - Fill_ACE_QoS (void); + Fill_ACE_QoS (); /// destructor. - ~Fill_ACE_QoS (void); + ~Fill_ACE_QoS (); /// To be used by receivers. Fills the receiver qos and sets the /// sender qos to NO_TRAFFIC. @@ -54,7 +54,7 @@ public: const ACE_CString &send_flow_name); /// Returns the hash map of flowspecs indexed by flowspec name. - FLOW_SPEC_HASH_MAP& map (void); + FLOW_SPEC_HASH_MAP& map (); private: // The Service Provider is currently set to NULL for all ACE_QoS. diff --git a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp index 424fa4b09ac..551e3fe380c 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.cpp @@ -24,14 +24,14 @@ QoS_Util::QoS_Util (int argc, } // destructor. -QoS_Util::~QoS_Util (void) +QoS_Util::~QoS_Util () { delete this->mult_session_addr_; delete this->dest_addr_; } int -QoS_Util::parse_args (void) +QoS_Util::parse_args () { ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c")); int c = 0; diff --git a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.h b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.h index b3dccdb02e6..4c69c80de3f 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.h +++ b/ACE/examples/QOS/Change_Sender_TSpec/QoS_Util.h @@ -28,10 +28,10 @@ public: QoS_Util (int argc, ACE_TCHAR *argv[]); // destructor. - ~QoS_Util (void); + ~QoS_Util (); // Parse command-line arguments. - int parse_args (void); + int parse_args (); // GET methods. ACE_INET_Addr *mult_session_addr () const; diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp b/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp index 39f75176ab4..37443f87ea5 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.cpp @@ -15,7 +15,7 @@ #include "Fill_ACE_QoS.h" // Constructor. -Receiver_QoS_Event_Handler::Receiver_QoS_Event_Handler (void) +Receiver_QoS_Event_Handler::Receiver_QoS_Event_Handler () { } @@ -28,7 +28,7 @@ Receiver_QoS_Event_Handler::Receiver_QoS_Event_Handler (const ACE_SOCK_Dgram_Mca } // Destructor. -Receiver_QoS_Event_Handler::~Receiver_QoS_Event_Handler (void) +Receiver_QoS_Event_Handler::~Receiver_QoS_Event_Handler () { } diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h b/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h index 003c171ad22..7bb5f8301e2 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h +++ b/ACE/examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h @@ -22,14 +22,14 @@ class Receiver_QoS_Event_Handler : public ACE_Event_Handler { public: /// Constructor. - Receiver_QoS_Event_Handler (void); + Receiver_QoS_Event_Handler (); /// Constructor. Receiver_QoS_Event_Handler (const ACE_SOCK_Dgram_Mcast_QoS &dgram_mcast_qos, ACE_QoS_Session *qos_session); /// Destructor. - ~Receiver_QoS_Event_Handler (void); + ~Receiver_QoS_Event_Handler (); /// Override this to return the handle of the Dgram_Mcast /// that we are using. diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp b/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp index f98eed6ab35..cc6f03acf2d 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp @@ -15,7 +15,7 @@ #include "Fill_ACE_QoS.h" // Constructor. -Sender_QoS_Event_Handler::Sender_QoS_Event_Handler (void) +Sender_QoS_Event_Handler::Sender_QoS_Event_Handler () { } @@ -29,7 +29,7 @@ Sender_QoS_Event_Handler::Sender_QoS_Event_Handler (const ACE_SOCK_Dgram_Mcast_Q } // Destructor. -Sender_QoS_Event_Handler::~Sender_QoS_Event_Handler (void) +Sender_QoS_Event_Handler::~Sender_QoS_Event_Handler () { } diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h b/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h index 316e7710122..55896d2c54a 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h +++ b/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h @@ -25,14 +25,14 @@ class Sender_QoS_Event_Handler : public ACE_Event_Handler { public: /// Constructor. - Sender_QoS_Event_Handler (void); + Sender_QoS_Event_Handler (); /// Constructor. Sender_QoS_Event_Handler (const ACE_SOCK_Dgram_Mcast_QoS &dgram_mcast_qos, ACE_QoS_Session *qos_session); /// Destructor. - ~Sender_QoS_Event_Handler (void); + ~Sender_QoS_Event_Handler (); /// Override this to return the handle of the Dgram_Mcast /// that we are using. diff --git a/ACE/examples/QOS/Simple/Fill_ACE_QoS.cpp b/ACE/examples/QOS/Simple/Fill_ACE_QoS.cpp index 9802af0b8ab..09b2ac53256 100644 --- a/ACE/examples/QOS/Simple/Fill_ACE_QoS.cpp +++ b/ACE/examples/QOS/Simple/Fill_ACE_QoS.cpp @@ -4,7 +4,7 @@ const iovec Fill_ACE_QoS::iov_ = {0,0}; -Fill_ACE_QoS::Fill_ACE_QoS (void) +Fill_ACE_QoS::Fill_ACE_QoS () { ACE_NEW (this->default_traffic_, ACE_Flow_Spec (ACE_QOS_NOT_SPECIFIED, @@ -20,7 +20,7 @@ Fill_ACE_QoS::Fill_ACE_QoS (void) } // destructor. -Fill_ACE_QoS::~Fill_ACE_QoS (void) +Fill_ACE_QoS::~Fill_ACE_QoS () {} int @@ -89,7 +89,7 @@ Fill_ACE_QoS::fill_duplex_qos (ACE_QoS &ace_qos, } Fill_ACE_QoS::FLOW_SPEC_HASH_MAP& -Fill_ACE_QoS::map (void) +Fill_ACE_QoS::map () { return this->flow_spec_map_; } diff --git a/ACE/examples/QOS/Simple/Fill_ACE_QoS.h b/ACE/examples/QOS/Simple/Fill_ACE_QoS.h index f52309cf9c1..0dcb1a16a43 100644 --- a/ACE/examples/QOS/Simple/Fill_ACE_QoS.h +++ b/ACE/examples/QOS/Simple/Fill_ACE_QoS.h @@ -32,10 +32,10 @@ public: //Initialization and termination methods. /// constructor. - Fill_ACE_QoS (void); + Fill_ACE_QoS (); /// destructor. - ~Fill_ACE_QoS (void); + ~Fill_ACE_QoS (); /// To be used by receivers. Fills the receiver qos and sets the /// sender qos to NO_TRAFFIC. @@ -54,7 +54,7 @@ public: const ACE_CString &send_flow_name); /// Returns the hash map of flowspecs indexed by flowspec name. - FLOW_SPEC_HASH_MAP& map (void); + FLOW_SPEC_HASH_MAP& map (); private: // The Service Provider is currently set to NULL for all ACE_QoS. diff --git a/ACE/examples/QOS/Simple/QoS_Util.cpp b/ACE/examples/QOS/Simple/QoS_Util.cpp index 424fa4b09ac..551e3fe380c 100644 --- a/ACE/examples/QOS/Simple/QoS_Util.cpp +++ b/ACE/examples/QOS/Simple/QoS_Util.cpp @@ -24,14 +24,14 @@ QoS_Util::QoS_Util (int argc, } // destructor. -QoS_Util::~QoS_Util (void) +QoS_Util::~QoS_Util () { delete this->mult_session_addr_; delete this->dest_addr_; } int -QoS_Util::parse_args (void) +QoS_Util::parse_args () { ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("m:n:p:P:c")); int c = 0; diff --git a/ACE/examples/QOS/Simple/QoS_Util.h b/ACE/examples/QOS/Simple/QoS_Util.h index b3dccdb02e6..4c69c80de3f 100644 --- a/ACE/examples/QOS/Simple/QoS_Util.h +++ b/ACE/examples/QOS/Simple/QoS_Util.h @@ -28,10 +28,10 @@ public: QoS_Util (int argc, ACE_TCHAR *argv[]); // destructor. - ~QoS_Util (void); + ~QoS_Util (); // Parse command-line arguments. - int parse_args (void); + int parse_args (); // GET methods. ACE_INET_Addr *mult_session_addr () const; diff --git a/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp b/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp index 5d97ebbbf6c..0b93ac300c3 100644 --- a/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp +++ b/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.cpp @@ -14,7 +14,7 @@ #include "ace/OS_NS_string.h" // Constructor. -Receiver_QoS_Event_Handler::Receiver_QoS_Event_Handler (void) +Receiver_QoS_Event_Handler::Receiver_QoS_Event_Handler () { } @@ -27,7 +27,7 @@ Receiver_QoS_Event_Handler::Receiver_QoS_Event_Handler (const ACE_SOCK_Dgram_Mca } // Destructor. -Receiver_QoS_Event_Handler::~Receiver_QoS_Event_Handler (void) +Receiver_QoS_Event_Handler::~Receiver_QoS_Event_Handler () { } diff --git a/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.h b/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.h index 003c171ad22..7bb5f8301e2 100644 --- a/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.h +++ b/ACE/examples/QOS/Simple/Receiver_QoS_Event_Handler.h @@ -22,14 +22,14 @@ class Receiver_QoS_Event_Handler : public ACE_Event_Handler { public: /// Constructor. - Receiver_QoS_Event_Handler (void); + Receiver_QoS_Event_Handler (); /// Constructor. Receiver_QoS_Event_Handler (const ACE_SOCK_Dgram_Mcast_QoS &dgram_mcast_qos, ACE_QoS_Session *qos_session); /// Destructor. - ~Receiver_QoS_Event_Handler (void); + ~Receiver_QoS_Event_Handler (); /// Override this to return the handle of the Dgram_Mcast /// that we are using. diff --git a/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.cpp b/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.cpp index a259a2a04e0..f220353364f 100644 --- a/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.cpp +++ b/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.cpp @@ -15,7 +15,7 @@ #include "ace/OS_NS_string.h" // Constructor. -Sender_QoS_Event_Handler::Sender_QoS_Event_Handler (void) +Sender_QoS_Event_Handler::Sender_QoS_Event_Handler () { } @@ -29,7 +29,7 @@ Sender_QoS_Event_Handler::Sender_QoS_Event_Handler (const ACE_SOCK_Dgram_Mcast_Q } // Destructor. -Sender_QoS_Event_Handler::~Sender_QoS_Event_Handler (void) +Sender_QoS_Event_Handler::~Sender_QoS_Event_Handler () { } diff --git a/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.h b/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.h index 316e7710122..55896d2c54a 100644 --- a/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.h +++ b/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.h @@ -25,14 +25,14 @@ class Sender_QoS_Event_Handler : public ACE_Event_Handler { public: /// Constructor. - Sender_QoS_Event_Handler (void); + Sender_QoS_Event_Handler (); /// Constructor. Sender_QoS_Event_Handler (const ACE_SOCK_Dgram_Mcast_QoS &dgram_mcast_qos, ACE_QoS_Session *qos_session); /// Destructor. - ~Sender_QoS_Event_Handler (void); + ~Sender_QoS_Event_Handler (); /// Override this to return the handle of the Dgram_Mcast /// that we are using. diff --git a/ACE/examples/Reactor/FIFO/server.cpp b/ACE/examples/Reactor/FIFO/server.cpp index 4b47f830ff9..eedf91e9e2c 100644 --- a/ACE/examples/Reactor/FIFO/server.cpp +++ b/ACE/examples/Reactor/FIFO/server.cpp @@ -10,8 +10,8 @@ class FIFO_Recv_Handler : public ACE_Event_Handler { public: - FIFO_Recv_Handler (void); - ~FIFO_Recv_Handler (void); + FIFO_Recv_Handler (); + ~FIFO_Recv_Handler (); virtual ACE_HANDLE get_handle () const; virtual int handle_input (ACE_HANDLE fd); @@ -20,7 +20,7 @@ private: ACE_FIFO_Recv_Msg fifo_reader_; }; -FIFO_Recv_Handler::FIFO_Recv_Handler (void) +FIFO_Recv_Handler::FIFO_Recv_Handler () { ACE_OS::unlink (ACE_DEFAULT_RENDEZVOUS); @@ -41,7 +41,7 @@ FIFO_Recv_Handler::get_handle () const return this->fifo_reader_.get_handle (); } -FIFO_Recv_Handler::~FIFO_Recv_Handler (void) +FIFO_Recv_Handler::~FIFO_Recv_Handler () { this->fifo_reader_.close (); this->fifo_reader_.remove (); diff --git a/ACE/examples/Reactor/Misc/notification.cpp b/ACE/examples/Reactor/Misc/notification.cpp index e05f48db7fb..6e36d138132 100644 --- a/ACE/examples/Reactor/Misc/notification.cpp +++ b/ACE/examples/Reactor/Misc/notification.cpp @@ -31,7 +31,7 @@ public: Thread_Handler (size_t id, size_t max_iterations); - ~Thread_Handler (void); + ~Thread_Handler (); // Destructor. virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); @@ -92,7 +92,7 @@ Thread_Handler::Thread_Handler (size_t id, { } -Thread_Handler::~Thread_Handler (void) +Thread_Handler::~Thread_Handler () { // Cleanup resources so that we don't crash and burn when shutdown. ACE_Event_Handler::remove_stdin_handler (ACE_Reactor::instance (), @@ -225,7 +225,7 @@ Thread_Handler::handle_input (ACE_HANDLE handle) // capabilities in separate threads. int -Thread_Handler::svc (void) +Thread_Handler::svc () { ACE_Time_Value sleep_timeout (Thread_Handler::interval_.sec () / 2); diff --git a/ACE/examples/Reactor/Misc/test_demuxing.cpp b/ACE/examples/Reactor/Misc/test_demuxing.cpp index c952c8a00a7..1dc03bbd4a2 100644 --- a/ACE/examples/Reactor/Misc/test_demuxing.cpp +++ b/ACE/examples/Reactor/Misc/test_demuxing.cpp @@ -163,14 +163,14 @@ class STDIN_Handler : public ACE_Event_Handler // This class illustrates that the ACE_Reactor can handle signals, // STDIO, and timeouts using the same mechanisms. public: - STDIN_Handler (void); - ~STDIN_Handler (void); + STDIN_Handler (); + ~STDIN_Handler (); virtual int handle_input (ACE_HANDLE); virtual int handle_timeout (const ACE_Time_Value &, const void *arg); }; -STDIN_Handler::STDIN_Handler (void) +STDIN_Handler::STDIN_Handler () { if (ACE_Event_Handler::register_stdin_handler (this, ACE_Reactor::instance (), @@ -194,7 +194,7 @@ STDIN_Handler::STDIN_Handler (void) 1)); } -STDIN_Handler::~STDIN_Handler (void) +STDIN_Handler::~STDIN_Handler () { if (ACE_Event_Handler::remove_stdin_handler (ACE_Reactor::instance (), ACE_Thread_Manager::instance ()) == -1) @@ -259,7 +259,7 @@ STDIN_Handler::handle_input (ACE_HANDLE handle) class Message_Handler : public ACE_Task <ACE_SYNCH> { public: - Message_Handler (void); + Message_Handler (); virtual int handle_input (ACE_HANDLE); // Called back within the context of the <ACE_Reactor> Singleton to @@ -275,7 +275,7 @@ private: // message is enqueued. }; -Message_Handler::Message_Handler (void) +Message_Handler::Message_Handler () : notification_strategy_ (ACE_Reactor::instance (), this, ACE_Event_Handler::READ_MASK) @@ -290,7 +290,7 @@ Message_Handler::Message_Handler (void) } int -Message_Handler::svc (void) +Message_Handler::svc () { for (int i = 0;; i++) { diff --git a/ACE/examples/Reactor/Misc/test_reactors.cpp b/ACE/examples/Reactor/Misc/test_reactors.cpp index 1afa4f40229..194adbc3e3c 100644 --- a/ACE/examples/Reactor/Misc/test_reactors.cpp +++ b/ACE/examples/Reactor/Misc/test_reactors.cpp @@ -17,8 +17,8 @@ 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 virtual int open (void *args = 0); @@ -43,7 +43,7 @@ static ACE_Atomic_Op<ACE_Thread_Mutex, int> done_count = MAX_TASKS * 2; static ACE_Recursive_Thread_Mutex reclock_; -Test_Task::Test_Task (void) +Test_Task::Test_Task () : handled_ (0) { ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, reclock_); @@ -54,7 +54,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, reclock_); @@ -83,7 +83,7 @@ Test_Task::close (u_long) } int -Test_Task::svc (void) +Test_Task::svc () { for (int i = 0; i < NUM_INVOCATIONS; i++) { diff --git a/ACE/examples/Reactor/Misc/test_timer_queue.cpp b/ACE/examples/Reactor/Misc/test_timer_queue.cpp index c53bda87e77..098128e9172 100644 --- a/ACE/examples/Reactor/Misc/test_timer_queue.cpp +++ b/ACE/examples/Reactor/Misc/test_timer_queue.cpp @@ -10,7 +10,7 @@ class Example_Handler : public ACE_Event_Handler { public: - Example_Handler (void) + Example_Handler () : count_ (1) {} diff --git a/ACE/examples/Reactor/Multicast/Log_Wrapper.cpp b/ACE/examples/Reactor/Multicast/Log_Wrapper.cpp index 72f407c4ca8..108463c42d6 100644 --- a/ACE/examples/Reactor/Multicast/Log_Wrapper.cpp +++ b/ACE/examples/Reactor/Multicast/Log_Wrapper.cpp @@ -11,13 +11,13 @@ #include "ace/OS_NS_stdlib.h" -Log_Wrapper::Log_Wrapper (void) +Log_Wrapper::Log_Wrapper () { sequence_number_ = 0; this->log_msg_.app_id = ACE_OS::getpid (); } -Log_Wrapper::~Log_Wrapper (void) +Log_Wrapper::~Log_Wrapper () { } diff --git a/ACE/examples/Reactor/Multicast/Log_Wrapper.h b/ACE/examples/Reactor/Multicast/Log_Wrapper.h index 4de674e3ce4..13982529bce 100644 --- a/ACE/examples/Reactor/Multicast/Log_Wrapper.h +++ b/ACE/examples/Reactor/Multicast/Log_Wrapper.h @@ -19,8 +19,8 @@ class Log_Wrapper // multicast. { public: - Log_Wrapper (void); - ~Log_Wrapper (void); + Log_Wrapper (); + ~Log_Wrapper (); // = Types of logging messages. enum Log_Priority diff --git a/ACE/examples/Reactor/Multicast/server.cpp b/ACE/examples/Reactor/Multicast/server.cpp index d2d329a895d..93d5f4fa900 100644 --- a/ACE/examples/Reactor/Multicast/server.cpp +++ b/ACE/examples/Reactor/Multicast/server.cpp @@ -22,7 +22,7 @@ public: Server_Events (u_short port, const char *mcast_addr, long time_interval = 0); - ~Server_Events (void); + ~Server_Events (); virtual int handle_input (ACE_HANDLE fd); virtual int handle_timeout (const ACE_Time_Value &tv, @@ -30,7 +30,7 @@ public: virtual ACE_HANDLE get_handle () const; - ACE_Time_Value *wait_time (void); + ACE_Time_Value *wait_time (); private: char *message_; @@ -66,7 +66,7 @@ Server_Events::get_handle () const } ACE_Time_Value * -Server_Events::wait_time (void) +Server_Events::wait_time () { return this->how_long_; } @@ -104,7 +104,7 @@ Server_Events::Server_Events (u_short port, // A destructor that emacs refuses to color blue ;-) -Server_Events::~Server_Events (void) +Server_Events::~Server_Events () { this->mcast_dgram_.leave (this->mcast_addr_); diff --git a/ACE/examples/Reactor/Ntalker/ntalker.cpp b/ACE/examples/Reactor/Ntalker/ntalker.cpp index 119b07df744..dfa1295f229 100644 --- a/ACE/examples/Reactor/Ntalker/ntalker.cpp +++ b/ACE/examples/Reactor/Ntalker/ntalker.cpp @@ -29,7 +29,7 @@ public: ACE_Reactor & ); // Constructor. - ~Handler (void); + ~Handler (); // Destructor. // Event demuxer hooks. @@ -130,7 +130,7 @@ Handler::handle_close (ACE_HANDLE h, ACE_Reactor_Mask) return 0; } -Handler::~Handler (void) +Handler::~Handler () { if (this->mcast_.leave (sockmc_addr_) == -1) ACE_ERROR ((LM_ERROR, diff --git a/ACE/examples/Reactor/Proactor/Aio_Platform_Test_C.cpp b/ACE/examples/Reactor/Proactor/Aio_Platform_Test_C.cpp index 5354cd4ab60..95fc16e8a33 100644 --- a/ACE/examples/Reactor/Proactor/Aio_Platform_Test_C.cpp +++ b/ACE/examples/Reactor/Proactor/Aio_Platform_Test_C.cpp @@ -24,8 +24,8 @@ #include <aio.h> -int do_sysconf (void); -int have_asynchio (void); +int do_sysconf (); +int have_asynchio (); static int file_handle = -1; char mb1 [BUFSIZ + 1]; @@ -34,15 +34,15 @@ aiocb aiocb1, aiocb2; sigset_t completion_signal; // For testing the <aio> stuff. -int test_aio_calls (void); -int issue_aio_calls (void); -int query_aio_completions (void); -int setup_signal_delivery (void); -int do_sysconf (void); -int have_asynchio (void); +int test_aio_calls (); +int issue_aio_calls (); +int query_aio_completions (); +int setup_signal_delivery (); +int do_sysconf (); +int have_asynchio (); int -do_sysconf (void) +do_sysconf () { // Call sysconf to find out runtime values. errno = 0; @@ -84,7 +84,7 @@ do_sysconf (void) } int -have_asynchio (void) +have_asynchio () { #if defined (_POSIX_ASYNCHRONOUS_IO) // POSIX Asynch IO is present in this system. diff --git a/ACE/examples/Reactor/Proactor/post_completions.cpp b/ACE/examples/Reactor/Proactor/post_completions.cpp index 4b0f49ac0b8..5c92b416e25 100644 --- a/ACE/examples/Reactor/Proactor/post_completions.cpp +++ b/ACE/examples/Reactor/Proactor/post_completions.cpp @@ -70,7 +70,7 @@ public: {} // Constructor. - virtual ~My_Result (void) + virtual ~My_Result () {} // Destructor. @@ -151,7 +151,7 @@ public: return 0; } - int svc (void) + int svc () { // Handle events for 13 seconds. ACE_Time_Value run_time (13); diff --git a/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp b/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp index 08d0e2c996c..4a1e4d41506 100644 --- a/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp +++ b/ACE/examples/Reactor/Proactor/simple_test_proactor.cpp @@ -38,14 +38,14 @@ class Simple_Tester : public ACE_Handler { public: /// Constructor. - Simple_Tester (void); + Simple_Tester (); - ~Simple_Tester (void); + ~Simple_Tester (); //FUZZ: disable check_for_lack_ACE_OS /// Open the operations and initiate read from the file. ///FUZZ: enble check_for_lack_ACE_OS - int open (void); + int open (); protected: // = These methods are called by the freamwork. @@ -57,7 +57,7 @@ protected: virtual void handle_write_file (const ACE_Asynch_Write_File::Result &result); private: - int initiate_read_file (void); + int initiate_read_file (); /// rf (read file): for writing from the file. ACE_Asynch_Read_File rf_; @@ -79,13 +79,13 @@ private: }; -Simple_Tester::Simple_Tester (void) +Simple_Tester::Simple_Tester () : input_file_ (ACE_INVALID_HANDLE), dump_file_ (ACE_INVALID_HANDLE) { } -Simple_Tester::~Simple_Tester (void) +Simple_Tester::~Simple_Tester () { ACE_OS::close (this->input_file_); ACE_OS::close (this->dump_file_); @@ -93,7 +93,7 @@ Simple_Tester::~Simple_Tester (void) int -Simple_Tester::open (void) +Simple_Tester::open () { // Initialize stuff @@ -131,7 +131,7 @@ Simple_Tester::open (void) int -Simple_Tester::initiate_read_file (void) +Simple_Tester::initiate_read_file () { // Create Message_Block ACE_Message_Block *mb = 0; diff --git a/ACE/examples/Reactor/Proactor/test_aiocb.cpp b/ACE/examples/Reactor/Proactor/test_aiocb.cpp index 88a48951f36..deb1085a773 100644 --- a/ACE/examples/Reactor/Proactor/test_aiocb.cpp +++ b/ACE/examples/Reactor/Proactor/test_aiocb.cpp @@ -34,16 +34,16 @@ class Test_Aio { public: /// Default constructor. - Test_Aio (void); + Test_Aio (); /// Initting the output file and the buffer. - int init (void); + int init (); /// Doing the testing stuff. - int do_aio (void); + int do_aio (); /// Destructor. - ~Test_Aio (void); + ~Test_Aio (); private: /// Output file descriptor. int out_fd_; @@ -61,7 +61,7 @@ private: char *buffer_read_; }; -Test_Aio::Test_Aio (void) +Test_Aio::Test_Aio () : aiocb_write_ (new struct aiocb), aiocb_read_ (new struct aiocb), buffer_write_ (0), @@ -69,7 +69,7 @@ Test_Aio::Test_Aio (void) { } -Test_Aio::~Test_Aio (void) +Test_Aio::~Test_Aio () { delete aiocb_write_; delete aiocb_read_; @@ -79,7 +79,7 @@ Test_Aio::~Test_Aio (void) // Init the output file and init the buffer. int -Test_Aio::init (void) +Test_Aio::init () { // Open the output file. this->out_fd_ = open ("test_aio.log", O_RDWR | O_CREAT | O_TRUNC, 0666); @@ -101,7 +101,7 @@ Test_Aio::init (void) // Go on aio_suspend. Wait for completion. // Print out the result. int -Test_Aio::do_aio (void) +Test_Aio::do_aio () { // = Write to the file. diff --git a/ACE/examples/Reactor/Proactor/test_aiocb_ace.cpp b/ACE/examples/Reactor/Proactor/test_aiocb_ace.cpp index 13a6c0ab11b..1d9ab41ea23 100644 --- a/ACE/examples/Reactor/Proactor/test_aiocb_ace.cpp +++ b/ACE/examples/Reactor/Proactor/test_aiocb_ace.cpp @@ -35,16 +35,16 @@ class Test_Aio { public: /// Default constructor. - Test_Aio (void); + Test_Aio (); /// Initting the output file and the buffer. - int init (void); + int init (); /// Doing the testing stuff. - int do_aio (void); + int do_aio (); /// Destructor. - ~Test_Aio (void); + ~Test_Aio (); private: /// Output file descriptor. int out_fd_; @@ -62,7 +62,7 @@ private: char *buffer_read_; }; -Test_Aio::Test_Aio (void) +Test_Aio::Test_Aio () : aiocb_write_ (0), aiocb_read_ (0), buffer_write_ (0), @@ -74,7 +74,7 @@ Test_Aio::Test_Aio (void) struct aiocb); } -Test_Aio::~Test_Aio (void) +Test_Aio::~Test_Aio () { delete aiocb_write_; delete aiocb_read_; @@ -84,7 +84,7 @@ Test_Aio::~Test_Aio (void) // Init the output file and init the buffer. int -Test_Aio::init (void) +Test_Aio::init () { // Open the output file. this->out_fd_ = ACE_OS::open ("test_aio.log", @@ -114,7 +114,7 @@ Test_Aio::init (void) // Go on aio_suspend. Wait for completion. // Print out the result. int -Test_Aio::do_aio (void) +Test_Aio::do_aio () { // = Write to the file. diff --git a/ACE/examples/Reactor/Proactor/test_aiosig.cpp b/ACE/examples/Reactor/Proactor/test_aiosig.cpp index 0dee9cdc9fd..bea369ad140 100644 --- a/ACE/examples/Reactor/Proactor/test_aiosig.cpp +++ b/ACE/examples/Reactor/Proactor/test_aiosig.cpp @@ -36,15 +36,15 @@ aiocb aiocb1, aiocb2; sigset_t completion_signal; // Function prototypes. -int setup_signal_delivery (void); -int issue_aio_calls (void); -int query_aio_completions (void); -int test_aio_calls (void); -int setup_signal_handler (void); +int setup_signal_delivery (); +int issue_aio_calls (); +int query_aio_completions (); +int test_aio_calls (); +int setup_signal_handler (); int setup_signal_handler (int signal_number); int -setup_signal_delivery (void) +setup_signal_delivery () { // Make the sigset_t consisting of the completion signal. if (sigemptyset (&completion_signal) == -1) @@ -70,7 +70,7 @@ setup_signal_delivery (void) } int -issue_aio_calls (void) +issue_aio_calls () { // Setup AIOCB. aiocb1.aio_fildes = file_handle; @@ -111,7 +111,7 @@ issue_aio_calls (void) } int -query_aio_completions (void) +query_aio_completions () { size_t number_of_compleions = 0; for (number_of_compleions = 0; @@ -220,7 +220,7 @@ query_aio_completions (void) } int -test_aio_calls (void) +test_aio_calls () { // Set up the input file. // Open file (in SEQUENTIAL_SCAN mode) diff --git a/ACE/examples/Reactor/Proactor/test_aiosig_ace.cpp b/ACE/examples/Reactor/Proactor/test_aiosig_ace.cpp index 3da506a1125..4e530b6abf7 100644 --- a/ACE/examples/Reactor/Proactor/test_aiosig_ace.cpp +++ b/ACE/examples/Reactor/Proactor/test_aiosig_ace.cpp @@ -44,15 +44,15 @@ static aiocb aiocb3; static sigset_t completion_signal; // Function prototypes. -static int setup_signal_delivery (void); -static int issue_aio_calls (void); -static int query_aio_completions (void); -static int test_aio_calls (void); +static int setup_signal_delivery (); +static int issue_aio_calls (); +static int query_aio_completions (); +static int test_aio_calls (); static void null_handler (int signal_number, siginfo_t *info, void *context); static int setup_signal_handler (int signal_number); static int -setup_signal_delivery (void) +setup_signal_delivery () { // = Mask all the signals. @@ -116,7 +116,7 @@ setup_signal_handler (int signal_number) static int -issue_aio_calls (void) +issue_aio_calls () { // Setup AIOCB. aiocb1.aio_fildes = file_handle; @@ -174,7 +174,7 @@ issue_aio_calls (void) } static int -query_aio_completions (void) +query_aio_completions () { for (size_t number_of_compleions = 0; number_of_compleions < 3; @@ -298,7 +298,7 @@ query_aio_completions (void) } static int -test_aio_calls (void) +test_aio_calls () { // Set up the input file. // Open file (in SEQUENTIAL_SCAN mode) diff --git a/ACE/examples/Reactor/Proactor/test_cancel.cpp b/ACE/examples/Reactor/Proactor/test_cancel.cpp index 04df3895080..3ee661d9b30 100644 --- a/ACE/examples/Reactor/Proactor/test_cancel.cpp +++ b/ACE/examples/Reactor/Proactor/test_cancel.cpp @@ -56,13 +56,13 @@ static int done = 0; static int read_size = 2; -Receiver::Receiver (void) +Receiver::Receiver () : mb_ (read_size + 1), handle_ (ACE_INVALID_HANDLE) { } -Receiver::~Receiver (void) +Receiver::~Receiver () { ACE_DEBUG ((LM_DEBUG, "Receiver: Closing down Remote connection:%d\n", diff --git a/ACE/examples/Reactor/Proactor/test_cancel.h b/ACE/examples/Reactor/Proactor/test_cancel.h index 4ab7daca364..7b2dc6f9dfc 100644 --- a/ACE/examples/Reactor/Proactor/test_cancel.h +++ b/ACE/examples/Reactor/Proactor/test_cancel.h @@ -20,8 +20,8 @@ class Receiver : public ACE_Service_Handler // the network connection and dump it to a file. public: - Receiver (void); - ~Receiver (void); + Receiver (); + ~Receiver (); virtual void open (ACE_HANDLE handle, ACE_Message_Block &message_block); diff --git a/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp b/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp index 44c67d7e6fb..87cef5d5197 100644 --- a/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp +++ b/ACE/examples/Reactor/Proactor/test_end_event_loop.cpp @@ -37,7 +37,7 @@ class My_Task: public ACE_Task <ACE_NULL_SYNCH> { public: // Constructor. - My_Task (void) + My_Task () : time_flag_ (0) {} @@ -68,7 +68,7 @@ public: } // Thread function. - int svc (void) + int svc () { ACE_DEBUG ((LM_DEBUG, "(%P|%t):Starting svc routine\n")); diff --git a/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp b/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp index 54a459d613c..f22cc5d6b57 100644 --- a/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp +++ b/ACE/examples/Reactor/Proactor/test_multiple_loops.cpp @@ -29,7 +29,7 @@ class Timeout_Handler : public ACE_Handler, public ACE_Event_Handler { public: - Timeout_Handler (void) + Timeout_Handler () { } @@ -67,7 +67,7 @@ class Worker : public ACE_Task <ACE_NULL_SYNCH> { public: // Thread fuction. - int svc (void) + int svc () { ACE_DEBUG ((LM_DEBUG, "(%t) Worker started\n")); diff --git a/ACE/examples/Reactor/Proactor/test_proactor.cpp b/ACE/examples/Reactor/Proactor/test_proactor.cpp index 241024aa3c3..52c8a271105 100644 --- a/ACE/examples/Reactor/Proactor/test_proactor.cpp +++ b/ACE/examples/Reactor/Proactor/test_proactor.cpp @@ -59,13 +59,13 @@ static int done = 0; static int initial_read_size = BUFSIZ; -Receiver::Receiver (void) +Receiver::Receiver () : dump_file_ (ACE_INVALID_HANDLE), handle_ (ACE_INVALID_HANDLE) { } -Receiver::~Receiver (void) +Receiver::~Receiver () { ACE_OS::close (this->dump_file_); ACE_OS::closesocket (this->handle_); @@ -158,7 +158,7 @@ Receiver::open (ACE_HANDLE handle, } int -Receiver::initiate_read_stream (void) +Receiver::initiate_read_stream () { // Create a new <Message_Block>. Note that this message block will // be used both to <read> data asynchronously from the socket and to @@ -275,8 +275,8 @@ Receiver::handle_write_file (const ACE_Asynch_Write_File::Result &result) class Sender : public ACE_Handler { public: - Sender (void); - ~Sender (void); + Sender (); + ~Sender (); //FUZZ: disable check_for_lack_ACE_OS ///FUZZ: enable check_for_lack_ACE_OS @@ -300,10 +300,10 @@ protected: private: /// Transmit the entire file in one fell swoop. - int transmit_file (void); + int transmit_file (); /// Initiate an asynchronous file read. - int initiate_read_file (void); + int initiate_read_file (); /// Network I/O handle ACE_SOCK_Stream stream_; @@ -337,7 +337,7 @@ private: int transmit_file_done_; }; -Sender::Sender (void) +Sender::Sender () : input_file_ (ACE_INVALID_HANDLE), file_offset_ (0), file_size_ (0), @@ -351,7 +351,7 @@ Sender::Sender (void) this->welcome_message_.wr_ptr (ACE_OS::strlen (data)); } -Sender::~Sender (void) +Sender::~Sender () { this->stream_.close (); } @@ -422,7 +422,7 @@ Sender::open (const ACE_TCHAR *host, } int -Sender::transmit_file (void) +Sender::transmit_file () { // Open file (in SEQUENTIAL_SCAN mode) ACE_HANDLE file_handle = @@ -486,7 +486,7 @@ Sender::handle_transmit_file (const ACE_Asynch_Transmit_File::Result &result) } int -Sender::initiate_read_file (void) +Sender::initiate_read_file () { // Create a new <Message_Block>. Note that this message block will // be used both to <read> data asynchronously from the file and to diff --git a/ACE/examples/Reactor/Proactor/test_proactor.h b/ACE/examples/Reactor/Proactor/test_proactor.h index 3efad0222bd..1dc7b45448e 100644 --- a/ACE/examples/Reactor/Proactor/test_proactor.h +++ b/ACE/examples/Reactor/Proactor/test_proactor.h @@ -14,8 +14,8 @@ class Receiver : public ACE_Service_Handler // connections arrive. This class will then receive data from // the network connection and dump it to a file. public: - Receiver (void); - ~Receiver (void); + Receiver (); + ~Receiver (); virtual void open (ACE_HANDLE handle, ACE_Message_Block &message_block); @@ -33,7 +33,7 @@ protected: // completes. private: - int initiate_read_stream (void); + int initiate_read_stream (); // Initiate an asynchronous <read> operation on the socket. ACE_Asynch_Read_Stream rs_; diff --git a/ACE/examples/Reactor/Proactor/test_proactor2.cpp b/ACE/examples/Reactor/Proactor/test_proactor2.cpp index e15a15c77b6..d0c7da1fe4c 100644 --- a/ACE/examples/Reactor/Proactor/test_proactor2.cpp +++ b/ACE/examples/Reactor/Proactor/test_proactor2.cpp @@ -105,8 +105,8 @@ int MyTask::svc () class Receiver : public ACE_Service_Handler { public: - Receiver (void); - ~Receiver (void); + Receiver (); + ~Receiver (); //FUZZ: disable check_for_lack_ACE_OS /// This is called after the new connection has been accepted. @@ -128,7 +128,7 @@ protected: &result); private: - int initiate_read_stream (void); + int initiate_read_stream (); int initiate_write_stream (ACE_Message_Block & mb, int nBytes ); bool check_destroy () ; @@ -143,7 +143,7 @@ private: long Receiver::nSessions = 0 ; -Receiver::Receiver (void) +Receiver::Receiver () : handle_ (ACE_INVALID_HANDLE), nIOCount ( 0 ) { @@ -152,7 +152,7 @@ Receiver::Receiver (void) ACE_DEBUG ((LM_DEBUG, "Receiver Ctor nSessions=%d\n", nSessions )); } -Receiver::~Receiver (void) +Receiver::~Receiver () { ACE_GUARD (MyMutex, locker, m_Mtx); nSessions -- ; @@ -210,7 +210,7 @@ void Receiver::open (ACE_HANDLE handle, check_destroy (); } -int Receiver::initiate_read_stream (void) +int Receiver::initiate_read_stream () { ACE_GUARD_RETURN (MyMutex, locker, m_Mtx, -1); @@ -359,8 +359,8 @@ Receiver::handle_write_stream (const ACE_Asynch_Write_Stream::Result class Sender : public ACE_Handler { public: - Sender (void); - ~Sender (void); + Sender (); + ~Sender (); //FUZZ: disable check_for_lack_ACE_OS ///FUZZ: enable check_for_lack_ACE_OS @@ -382,8 +382,8 @@ virtual void handle_write_stream (const ACE_Asynch_Write_Stream::Result &result); private: -int initiate_read_stream (void); -int initiate_write_stream (void); +int initiate_read_stream (); +int initiate_write_stream (); /// Network I/O handle ACE_SOCK_Stream stream_; @@ -403,14 +403,14 @@ long nIOCount ; static const char *data = "Welcome to Irfan World! Irfan RULES here !!\n"; -Sender::Sender (void) +Sender::Sender () :nIOCount ( 0 ) { // Moment of inspiration... :-) this->welcome_message_.init (data, ACE_OS::strlen (data)); } -Sender::~Sender (void) +Sender::~Sender () { this->close (); } @@ -474,7 +474,7 @@ int Sender::open (const ACE_TCHAR *host, u_short port) return 0; } -int Sender::initiate_write_stream (void) +int Sender::initiate_write_stream () { ACE_GUARD_RETURN (MyMutex, locker, m_Mtx, -1); @@ -496,7 +496,7 @@ int Sender::initiate_write_stream (void) return 0; } -int Sender::initiate_read_stream (void) +int Sender::initiate_read_stream () { ACE_GUARD_RETURN (MyMutex, locker, m_Mtx, -1); diff --git a/ACE/examples/Reactor/Proactor/test_proactor3.cpp b/ACE/examples/Reactor/Proactor/test_proactor3.cpp index 7e5ea77f349..293d64a64e7 100644 --- a/ACE/examples/Reactor/Proactor/test_proactor3.cpp +++ b/ACE/examples/Reactor/Proactor/test_proactor3.cpp @@ -51,7 +51,7 @@ // Some debug helper functions static int disable_signal (int sigmin, int sigmax); #if 0 -static int print_sigmask (void); +static int print_sigmask (); #endif #define COUT(X) cout << X; cout.flush (); @@ -90,7 +90,7 @@ class MyTask: public ACE_Task<ACE_MT_SYNCH> public: MyTask (void) : threads_ (0), proactor_ (0) {} - int svc (void); + int svc (); void waitready (void) { event_.wait (); } private: @@ -99,12 +99,12 @@ private: ACE_Proactor *proactor_; ACE_Manual_Event event_; - void create_proactor (void); - void delete_proactor (void); + void create_proactor (); + void delete_proactor (); }; void -MyTask::create_proactor (void) +MyTask::create_proactor () { ACE_GUARD (ACE_Recursive_Thread_Mutex, locker, mutex_); @@ -151,7 +151,7 @@ MyTask::create_proactor (void) } void -MyTask::delete_proactor (void) +MyTask::delete_proactor () { ACE_GUARD (ACE_Recursive_Thread_Mutex, locker, mutex_); if (--threads_ == 0) @@ -164,7 +164,7 @@ MyTask::delete_proactor (void) } int -MyTask::svc (void) +MyTask::svc () { ACE_DEBUG ((LM_DEBUG, "(%t) MyTask started\n")); @@ -183,8 +183,8 @@ MyTask::svc (void) class Receiver : public ACE_Service_Handler { public: - Receiver (void); - ~Receiver (void); + Receiver (); + ~Receiver (); //FUZZ: disable check_for_lack_ACE_OS /// This is called after the new connection has been accepted. @@ -206,9 +206,9 @@ protected: virtual void handle_write_stream (const ACE_Asynch_Write_Stream::Result &result); private: - int initiate_read_stream (void); + int initiate_read_stream (); int initiate_write_stream (ACE_Message_Block & mb, int nBytes); - int check_destroy (void); + int check_destroy (); ACE_Asynch_Read_Stream rs_; ACE_Asynch_Write_Stream ws_; @@ -220,7 +220,7 @@ private: long Receiver::sessions_ = 0; -Receiver::Receiver (void) +Receiver::Receiver () : handle_ (ACE_INVALID_HANDLE), io_count_ (0) { @@ -229,7 +229,7 @@ Receiver::Receiver (void) ACE_DEBUG ((LM_DEBUG, "Receiver Ctor sessions_=%d\n", sessions_)); } -Receiver::~Receiver (void) +Receiver::~Receiver () { ACE_GUARD (ACE_Recursive_Thread_Mutex, locker, mutex_); sessions_--; @@ -239,7 +239,7 @@ Receiver::~Receiver (void) // return true if we alive, false we commited suicide int -Receiver::check_destroy (void) +Receiver::check_destroy () { { ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, locker, mutex_, -1); @@ -276,7 +276,7 @@ Receiver::open (ACE_HANDLE handle, } int -Receiver::initiate_read_stream (void) +Receiver::initiate_read_stream () { ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, locker, mutex_, -1); @@ -420,13 +420,13 @@ Receiver::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result) class Sender : public ACE_Handler { public: - Sender (void); - ~Sender (void); + Sender (); + ~Sender (); //FUZZ: disable check_for_lack_ACE_OS ///FUZZ: enable check_for_lack_ACE_OS int open (const ACE_TCHAR *host, u_short port); - void close (void); + void close (); ACE_HANDLE handle () const; virtual void handle (ACE_HANDLE); @@ -441,8 +441,8 @@ protected: virtual void handle_write_stream (const ACE_Asynch_Write_Stream::Result &result); private: - int initiate_read_stream (void); - int initiate_write_stream (void); + int initiate_read_stream (); + int initiate_write_stream (); /// Network I/O handle ACE_SOCK_Stream stream_; @@ -462,19 +462,19 @@ private: static const char *data = "Welcome to Irfan World! Irfan RULES here !!\n"; -Sender::Sender (void) +Sender::Sender () : io_count_ (0) { // Moment of inspiration... :-) this->welcome_message_.init (data, ACE_OS::strlen (data)); } -Sender::~Sender (void) +Sender::~Sender () { this->close (); } -void Sender::close (void) +void Sender::close () { this->stream_.close (); } @@ -531,7 +531,7 @@ int Sender::open (const ACE_TCHAR *host, u_short port) } int -Sender::initiate_write_stream (void) +Sender::initiate_write_stream () { ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, locker, mutex_, -1); @@ -550,7 +550,7 @@ Sender::initiate_write_stream (void) } int -Sender::initiate_read_stream (void) +Sender::initiate_read_stream () { ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, locker, mutex_, -1); @@ -845,7 +845,7 @@ disable_signal (int sigmin, int sigmax) #if 0 static int -print_sigmask (void) +print_sigmask () { #ifndef ACE_WIN32 sigset_t mask; diff --git a/ACE/examples/Reactor/Proactor/test_timeout.cpp b/ACE/examples/Reactor/Proactor/test_timeout.cpp index 5ac1c9fe36e..1d511a34c06 100644 --- a/ACE/examples/Reactor/Proactor/test_timeout.cpp +++ b/ACE/examples/Reactor/Proactor/test_timeout.cpp @@ -32,7 +32,7 @@ class Timeout_Handler : public ACE_Handler { public: - Timeout_Handler (void) + Timeout_Handler () : start_time_ (ACE_OS::gettimeofday ()) { } @@ -61,7 +61,7 @@ private: class Worker : public ACE_Task <ACE_NULL_SYNCH> { public: - int svc (void) + int svc () { // Handle events for 13 seconds. ACE_Time_Value run_time (13); diff --git a/ACE/examples/Reactor/Proactor/test_timeout_st.cpp b/ACE/examples/Reactor/Proactor/test_timeout_st.cpp index 3dffa7bb76f..af43be19501 100644 --- a/ACE/examples/Reactor/Proactor/test_timeout_st.cpp +++ b/ACE/examples/Reactor/Proactor/test_timeout_st.cpp @@ -28,7 +28,7 @@ class Timeout_Handler : public ACE_Handler { public: - Timeout_Handler (void) + Timeout_Handler () : count_ (0), start_time_ (ACE_OS::gettimeofday ()) { diff --git a/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp b/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp index 35be6c6d568..46805f29b2e 100644 --- a/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp +++ b/ACE/examples/Reactor/Proactor/test_udp_proactor.cpp @@ -44,8 +44,8 @@ static int done = 0; class Receiver : public ACE_Service_Handler { public: - Receiver (void); - ~Receiver (void); + Receiver (); + ~Receiver (); int open_addr (const ACE_INET_Addr &localAddr); @@ -65,13 +65,13 @@ private: const char* act_; }; -Receiver::Receiver (void) +Receiver::Receiver () : completion_key_ ("Receiver Completion Key"), act_ ("Receiver ACT") { } -Receiver::~Receiver (void) +Receiver::~Receiver () { sock_dgram_.close (); } @@ -218,8 +218,8 @@ Receiver::handle_read_dgram (const ACE_Asynch_Read_Dgram::Result &result) class Sender : public ACE_Handler { public: - Sender (void); - ~Sender (void); + Sender (); + ~Sender (); //FUZZ: disable check_for_lack_ACE_OS ///FUZZ: enable check_for_lack_ACE_OS @@ -243,13 +243,13 @@ private: const char* act_; }; -Sender::Sender (void) +Sender::Sender () : completion_key_ ("Sender completion key"), act_ ("Sender ACT") { } -Sender::~Sender (void) +Sender::~Sender () { this->sock_dgram_.close (); } diff --git a/ACE/examples/Reactor/TP_Reactor/AcceptHandler.h b/ACE/examples/Reactor/TP_Reactor/AcceptHandler.h index 9116f1280ab..0a0fd089e76 100644 --- a/ACE/examples/Reactor/TP_Reactor/AcceptHandler.h +++ b/ACE/examples/Reactor/TP_Reactor/AcceptHandler.h @@ -42,7 +42,7 @@ class AcceptHandler : public ACE_Event_Handler { * * @return 0 on success, -1 on failure */ - int open(void); + int open(); /** * @name Overridden methods from the ACE_Event_Handler diff --git a/ACE/examples/Reactor/TP_Reactor/ReadHandler.h b/ACE/examples/Reactor/TP_Reactor/ReadHandler.h index 4c5100b46ea..b3445ee6433 100644 --- a/ACE/examples/Reactor/TP_Reactor/ReadHandler.h +++ b/ACE/examples/Reactor/TP_Reactor/ReadHandler.h @@ -48,7 +48,7 @@ class ReadHandler : public ACE_Event_Handler { /** * Initialization. */ - ReadHandler(void); + ReadHandler(); /** * Clean up data. @@ -58,7 +58,7 @@ class ReadHandler : public ACE_Event_Handler { /** * Provide access to the internal stream socket. */ - ACE_SOCK_Stream &getStream(void); + ACE_SOCK_Stream &getStream(); /** * @name Overridden methods from the ACE_Event_Handler diff --git a/ACE/examples/Reactor/WFMO_Reactor/APC.cpp b/ACE/examples/Reactor/WFMO_Reactor/APC.cpp index 5f9792a7166..49775b0ef68 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/APC.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/APC.cpp @@ -41,7 +41,7 @@ apc_callback (DWORD) } void -queue_apc (void) +queue_apc () { DWORD result = ::QueueUserAPC (reinterpret_cast<PAPCFUNC> (&apc_callback), // pointer to APC function diff --git a/ACE/examples/Reactor/WFMO_Reactor/Directory_Changes.cpp b/ACE/examples/Reactor/WFMO_Reactor/Directory_Changes.cpp index 83df6afa6b4..44b1076feb7 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Directory_Changes.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Directory_Changes.cpp @@ -26,7 +26,7 @@ class Event_Handler : public ACE_Event_Handler { public: Event_Handler (ACE_Reactor &reactor); - ~Event_Handler (void); + ~Event_Handler (); int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); int handle_close (ACE_HANDLE handle, ACE_Reactor_Mask close_mask); @@ -54,7 +54,7 @@ Event_Handler::Event_Handler (ACE_Reactor &reactor) ACE_ERROR ((LM_ERROR, "Registration with Reactor could not be done\n")); } -Event_Handler::~Event_Handler (void) +Event_Handler::~Event_Handler () { } @@ -77,7 +77,7 @@ Event_Handler::handle_close (ACE_HANDLE, } void -worker (void) +worker () { ACE_DEBUG ((LM_DEBUG, "(%t) Thread creation\n")); ACE_DEBUG ((LM_DEBUG, "(%t) Thread creating temporary file\n")); diff --git a/ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp b/ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp index 18e0373eccc..b33b0027522 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Exceptions.cpp @@ -24,14 +24,14 @@ class Event_Handler : public ACE_Event_Handler { public: - Event_Handler (void) + Event_Handler () : event_ (1) { ACE_DEBUG ((LM_DEBUG, "Event_Handler created\n")); } - ~Event_Handler (void) + ~Event_Handler () { ACE_DEBUG ((LM_DEBUG, "Event_Handler destroyed\n")); diff --git a/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp b/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp index 5d8fe687f6e..78035c00323 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Handle_Close.cpp @@ -56,7 +56,7 @@ public: { } - ~Handler (void) + ~Handler () { this->reactor (0); } @@ -116,7 +116,7 @@ public: { } - ~Different_Handler (void) + ~Different_Handler () { this->reactor (0); } @@ -203,7 +203,7 @@ protected: // Selection of which reactor should get created // ACE_Reactor * -create_reactor (void) +create_reactor () { ACE_Reactor_Impl *impl = 0; diff --git a/ACE/examples/Reactor/WFMO_Reactor/Multithreading.cpp b/ACE/examples/Reactor/WFMO_Reactor/Multithreading.cpp index af9f81725dd..ded3e193cb8 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Multithreading.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Multithreading.cpp @@ -33,7 +33,7 @@ static int iterations = 10; // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, "usage: \n\t" @@ -84,7 +84,7 @@ public: size_t concurrent_threads); /// Destructor. - ~Task_Handler (void); + ~Task_Handler (); /// Called when object is removed from the ACE_Reactor virtual int handle_close (ACE_HANDLE handle, @@ -98,7 +98,7 @@ public: const void *arg = 0); /// Task event loop. - int svc (void); + int svc (); //FUZZ: disable check_for_lack_ACE_OS /// Signal an event. @@ -111,7 +111,7 @@ private: // All threads do reactor->handle_events () int -Task_Handler::svc (void) +Task_Handler::svc () { // Try to become the owner ACE_Reactor::instance ()->owner (ACE_Thread::self ()); @@ -139,7 +139,7 @@ Task_Handler::Task_Handler (size_t number_of_handles, "activate")); } -Task_Handler::~Task_Handler (void) +Task_Handler::~Task_Handler () { this->reactor (0); delete [] this->events_; diff --git a/ACE/examples/Reactor/WFMO_Reactor/Network_Events.cpp b/ACE/examples/Reactor/WFMO_Reactor/Network_Events.cpp index 685cfaf11a3..87145b96e00 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Network_Events.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Network_Events.cpp @@ -110,8 +110,8 @@ class Network_Listener : public ACE_Event_Handler public: /// Default constructor /// Default constructor - Network_Listener (void); - ~Network_Listener (void); + Network_Listener (); + ~Network_Listener (); virtual int handle_input (ACE_HANDLE handle); virtual int handle_close (ACE_HANDLE handle, @@ -122,7 +122,7 @@ public: ACE_SOCK_Acceptor acceptor_; }; -Network_Listener::Network_Listener (void) +Network_Listener::Network_Listener () : local_address_ (ACE_DEFAULT_SERVER_PORT), acceptor_ (local_address_, 1) { @@ -132,7 +132,7 @@ Network_Listener::Network_Listener (void) ACE_TEST_ASSERT (result == 0); } -Network_Listener::~Network_Listener (void) +Network_Listener::~Network_Listener () { } diff --git a/ACE/examples/Reactor/WFMO_Reactor/Registration.cpp b/ACE/examples/Reactor/WFMO_Reactor/Registration.cpp index d3d069885ea..b6816aada54 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Registration.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Registration.cpp @@ -44,7 +44,7 @@ class Simple_Handler : public ACE_Event_Handler { public: /// Default constructor - Simple_Handler (void); + Simple_Handler (); virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); virtual int handle_close (ACE_HANDLE handle, @@ -56,7 +56,7 @@ public: int handle_close_count_; }; -Simple_Handler::Simple_Handler (void) +Simple_Handler::Simple_Handler () : handle_signal_count_ (0), handle_close_count_ (0) { @@ -106,7 +106,7 @@ Simple_Handler::handle_close (ACE_HANDLE handle, Simple_Handler simple_handler; void -worker (void) +worker () { ACE_DEBUG ((LM_DEBUG, "(%t) Thread creation\n")); ACE_DEBUG ((LM_DEBUG, "(%t) Thread sleeping\n")); diff --git a/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp b/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp index c5b166217a4..7a16cab0692 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp @@ -26,11 +26,11 @@ class Event_Handler : public ACE_Event_Handler { public: Event_Handler (ACE_Reactor &reactor); - ~Event_Handler (void); + ~Event_Handler (); int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); int handle_close (ACE_HANDLE handle, ACE_Reactor_Mask close_mask); - ACE_Registry::Naming_Context &context (void); + ACE_Registry::Naming_Context &context (); private: ACE_Auto_Event event_; @@ -55,7 +55,7 @@ Event_Handler::Event_Handler (ACE_Reactor &reactor) ACE_ERROR ((LM_ERROR, "Registration with Reactor could not be done\n")); } -Event_Handler::~Event_Handler (void) +Event_Handler::~Event_Handler () { } @@ -84,7 +84,7 @@ Event_Handler::handle_close (ACE_HANDLE, } ACE_Registry::Naming_Context & -Event_Handler::context (void) +Event_Handler::context () { return this->context_; } diff --git a/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp b/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp index df47a665049..44a93e339a7 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp @@ -151,7 +151,7 @@ class Peer_Handler : public MT_TASK, public ACE_Handler { public: Peer_Handler (int argc, ACE_TCHAR *argv[]); - ~Peer_Handler (void); + ~Peer_Handler (); //FUZZ: disable check_for_lack_ACE_OS /** @@ -243,7 +243,7 @@ public: virtual int close (u_long = 0); /// Thread runs here as an active object. - int svc (void); + int svc (); int handle_close (ACE_HANDLE, ACE_Reactor_Mask); @@ -254,7 +254,7 @@ private: static void handler (int signum); /// Helper function to register with the Reactor for thread exit. - void register_thread_exit_hook (void); + void register_thread_exit_hook (); /// The STDIN thread has exited. This means the user hit ^C. We can /// end the event loop. @@ -297,7 +297,7 @@ Peer_Handler::Peer_Handler (int argc, ACE_TCHAR *argv[]) } } -Peer_Handler::~Peer_Handler (void) +Peer_Handler::~Peer_Handler () { } @@ -471,7 +471,7 @@ STDIN_Handler::close (u_long) // Thread runs here. int -STDIN_Handler::svc (void) +STDIN_Handler::svc () { this->register_thread_exit_hook (); @@ -512,7 +512,7 @@ STDIN_Handler::svc (void) // Register an exit hook with the reactor. void -STDIN_Handler::register_thread_exit_hook (void) +STDIN_Handler::register_thread_exit_hook () { // Get a real handle to our thread. ACE_Thread_Manager::instance ()->thr_self (this->thr_handle_); diff --git a/ACE/examples/Reactor/WFMO_Reactor/Timeouts.cpp b/ACE/examples/Reactor/WFMO_Reactor/Timeouts.cpp index bc7b068ebde..e346a8bec6f 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Timeouts.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Timeouts.cpp @@ -28,7 +28,7 @@ class Timeout_Handler : public ACE_Event_Handler { public: - Timeout_Handler (void) + Timeout_Handler () : count_ (0) {} /// Print out when timeouts occur. diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp index 1999c84271d..0575e55fa0f 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/client/broadcast_client_test.cpp @@ -17,7 +17,7 @@ static ACE_TCHAR *program_name; static unsigned short broadcast_port_number = ACE_DEFAULT_BROADCAST_PORT; static void -print_usage_and_die (void) +print_usage_and_die () { ACE_OS::fprintf (stderr, "usage: %s [-p broadcast portnum]\n", ACE_TEXT_ALWAYS_CHAR (program_name)); diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp index b40cfa5c237..85b5b343f5b 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp @@ -24,7 +24,7 @@ static const ACE_TCHAR *rendezvous_dgram = ACE_TEXT ("/tmp/foo_dgram"); static const ACE_TCHAR *file_name = ACE_TEXT ("local_data"); static void -print_usage_and_die (void) +print_usage_and_die () { ACE_ERROR ((LM_ERROR, ACE_TEXT ("usage: %s [-r rendezvous_dgram] ") diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp index f962221ca77..c9ef86849e7 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/client/local_fifo_client_test.cpp @@ -21,7 +21,7 @@ static const ACE_TCHAR *rendezvous_fifo = ACE_TEXT("/tmp/foo_fifo"); static const ACE_TCHAR *file_name = ACE_TEXT("./local_data"); static void -print_usage_and_die (void) +print_usage_and_die () { ACE_ERROR ((LM_ERROR, "usage: %s [-d] [-f rendezvous_fifo]\n", diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp index 79f193c1fb8..829522f94f0 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/client/local_pipe_client_test.cpp @@ -21,7 +21,7 @@ static const ACE_TCHAR *rendezvous = ACE_TEXT ("/tmp/foo_pipe"); static const ACE_TCHAR *file_name = ACE_TEXT ("local_data"); static void -print_usage_and_die (void) +print_usage_and_die () { ACE_ERROR ((LM_ERROR, ACE_TEXT ("usage: %s [-r rendezvous] [-f file]\n"), diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp index c571ab1c927..18109c9cb0d 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/client/local_spipe_client_test.cpp @@ -20,7 +20,7 @@ static const ACE_TCHAR *rendezvous_spipe = ACE_TEXT ("/tmp/foo_spipe"); static const ACE_TCHAR *file_name = ACE_TEXT ("./local_data"); static void -print_usage_and_die (void) +print_usage_and_die () { ACE_ERROR ((LM_ERROR, ACE_TEXT ("usage: %s [-d] [-r rendezvous_spipe]\n"), diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp index 5151f99c8c1..1b33350b3de 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/client/local_stream_client_test.cpp @@ -19,7 +19,7 @@ static const ACE_TCHAR *rendezvous = ACE_TEXT ("/tmp/foo_stream"); static const ACE_TCHAR *file_name = ACE_TEXT ("local_data"); static void -print_usage_and_die (void) +print_usage_and_die () { ACE_ERROR ((LM_ERROR, ACE_TEXT ("usage: %s [-r rendezvous] [-f file]\n"), diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp index af3067efbca..37efd678c32 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/client/remote_dgram_client_test.cpp @@ -20,7 +20,7 @@ static const ACE_TCHAR *host_name = ACE_DEFAULT_SERVER_HOST; // Name of file to send. static const ACE_TCHAR *file_name = ACE_TEXT("./remote_data"); -static void print_usage_and_die (void) +static void print_usage_and_die () { ACE_ERROR ((LM_ERROR, "usage: %s [-p portnum] [-h host_name] [-f file]\n", diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp index 1dfed4b7de6..66aa05734a2 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/client/remote_service_directory_test.cpp @@ -19,7 +19,7 @@ static const ACE_TCHAR *host_name = ACE_DEFAULT_SERVER_HOST; static int remote_reconfigure = 0; static void -print_usage_and_die (void) +print_usage_and_die () { ACE_ERROR ((LM_ERROR, "usage: %n [-p portnum] [-h host_name] [-r]\n")); diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp index 297b9bba245..62f09757075 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/client/remote_stream_client_test.cpp @@ -25,7 +25,7 @@ static const ACE_TCHAR *host_name = ACE_DEFAULT_SERVER_HOST; static const ACE_TCHAR *file_name = ACE_TEXT("./remote_data"); static void -print_usage_and_die (void) +print_usage_and_die () { ACE_ERROR ((LM_ERROR, "usage: %s [-p portnum] [-h host_name] [-f file]\n", diff --git a/ACE/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp b/ACE/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp index 086cb64c964..edd852437d0 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp @@ -23,7 +23,7 @@ static const ACE_TCHAR *host_name = ACE_DEFAULT_SERVER_HOST; // Name of file to send. static const ACE_TCHAR *file_name = ACE_TEXT ("./remote_data"); -static void print_usage_and_die (void) +static void print_usage_and_die () { ACE_ERROR ((LM_ERROR, ACE_TEXT ("usage: %s [-p portnum] [-h host_name] [-f file]\n"), diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp index ee07d34fa2f..9bd499624d4 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.cpp @@ -3,21 +3,21 @@ #if defined (SunOS4) extern "C" { - int init (void); - int fini (void); + int init (); + int fini (); void __sti__Handle_Broadcast_C_init_(); void __std__Handle_Broadcast_C_init_(); } int -init (void) +init () { __sti__Handle_Broadcast_C_init_(); return 0; } int -fini (void) +fini () { __std__Handle_Broadcast_C_init_(); return 0; diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h index dac570674eb..52c04194130 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h @@ -20,8 +20,8 @@ class ACE_Svc_Export Handle_Broadcast : public ACE_Service_Object, public ACE_SOCK_Dgram { public: - Handle_Broadcast (void); - ~Handle_Broadcast (void); + Handle_Broadcast (); + ~Handle_Broadcast (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int info (ACE_TCHAR **, size_t) const; virtual int fini (); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h index d7e54b2e4c8..6ceb2201985 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h @@ -21,7 +21,7 @@ class ACE_Svc_Export Handle_L_CODgram : public ACE_Service_Object, public ACE_LSOCK_CODgram { public: - Handle_L_CODgram (void); + Handle_L_CODgram (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int info (ACE_TCHAR **, size_t) const; virtual int fini (); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h index 53059e67004..323b4b5e1b7 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h @@ -21,7 +21,7 @@ class ACE_Svc_Export Handle_L_Dgram : public ACE_Service_Object, public ACE_LSOCK_Dgram { public: - Handle_L_Dgram (void); + Handle_L_Dgram (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int info (ACE_TCHAR **, size_t) const; virtual int fini (); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp index e38bab25073..7eff9d9db0c 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.cpp @@ -4,21 +4,21 @@ #if defined (SunOS4) extern "C" { - int init (void); - int fini (void); + int init (); + int fini (); void __sti__Handle_L_FIFO_C_init_(); void __std__Handle_L_FIFO_C_init_(); } int -init (void) +init () { __sti__Handle_L_FIFO_C_init_(); return 0; } int -fini (void) +fini () { __std__Handle_L_FIFO_C_init_(); return 0; diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h index 989dd102f91..2268c92f2b9 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h @@ -20,7 +20,7 @@ class ACE_Svc_Export Handle_L_FIFO : public ACE_Service_Object, public ACE_FIFO_Recv_Msg { public: - Handle_L_FIFO (void); + Handle_L_FIFO (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int info (ACE_TCHAR **, size_t) const; virtual int fini (); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h index 3e944acc5e2..5e34a65347f 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h @@ -22,8 +22,8 @@ class ACE_Svc_Export Handle_L_Pipe : public ACE_Service_Object, public ACE_LSOCK_Acceptor { public: - Handle_L_Pipe (void); - ~Handle_L_Pipe (void); + Handle_L_Pipe (); + ~Handle_L_Pipe (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int info (ACE_TCHAR **, size_t) const; virtual int fini (); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h index 79fa31707c8..5a247db7e0c 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h @@ -21,7 +21,7 @@ class ACE_Svc_Export Handle_L_SPIPE : public ACE_Service_Object, public ACE_SPIPE_Acceptor { public: - Handle_L_SPIPE (void); + Handle_L_SPIPE (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int info (ACE_TCHAR **, size_t) const; virtual int fini (); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h index a56631f61e6..54e34be7be9 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h @@ -21,8 +21,8 @@ class ACE_Svc_Export Handle_L_Stream : public ACE_Service_Object, public ACE_LSOCK_Acceptor { public: - Handle_L_Stream (void); - ~Handle_L_Stream (void); + Handle_L_Stream (); + ~Handle_L_Stream (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int info (ACE_TCHAR **, size_t) const; virtual int fini (); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp index 4600d5840d1..a21a39e6fe1 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.cpp @@ -3,21 +3,21 @@ #if defined (SunOS4) extern "C" { - int init (void); - int fini (void); + int init (); + int fini (); void __sti__Handle_R_Dgram_C_init_(); void __std__Handle_R_Dgram_C_init_(); } int -init (void) +init () { __sti__Handle_R_Dgram_C_init_(); return 0; } int -fini (void) +fini () { __std__Handle_R_Dgram_C_init_(); return 0; diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h index 6c0be72cb70..c2181e86b55 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h @@ -19,7 +19,7 @@ class ACE_Svc_Export Handle_R_Dgram : public ACE_Service_Object, public ACE_SOCK_Dgram { public: - Handle_R_Dgram (void); + Handle_R_Dgram (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int info (ACE_TCHAR **, size_t) const; virtual int fini (); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp index f478d26dcc3..8ce2a3214a2 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.cpp @@ -3,21 +3,21 @@ #if defined (SunOS4) extern "C" { - int init (void); - int fini (void); + int init (); + int fini (); void __sti__Handle_R_Stream_C_recv_n_(); void __std__Handle_R_Stream_C_recv_n_(); } int -init (void) +init () { __sti__Handle_R_Stream_C_recv_n_(); return 0; } int -fini (void) +fini () { __std__Handle_R_Stream_C_recv_n_(); return 0; diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h index e192ccab1c6..3b551e2550c 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h @@ -21,7 +21,7 @@ class ACE_Svc_Export Handle_R_Stream : public ACE_Service_Object, public ACE_SOCK_Acceptor { public: - Handle_R_Stream (void); + Handle_R_Stream (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int info (ACE_TCHAR **, size_t) const; virtual int fini (); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp index 41a5d36c25c..172fefacc57 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp @@ -21,12 +21,12 @@ #define PR_ST_2 ACE_PEER_STREAM_2 template <class SVH, PR_AC_1> -Handle_Thr_Acceptor<SVH, PR_AC_2>::~Handle_Thr_Acceptor (void) +Handle_Thr_Acceptor<SVH, PR_AC_2>::~Handle_Thr_Acceptor () { } template <class SVH, PR_AC_1> -Handle_Thr_Acceptor<SVH, PR_AC_2>::Handle_Thr_Acceptor (void) +Handle_Thr_Acceptor<SVH, PR_AC_2>::Handle_Thr_Acceptor () : thr_flags_ (THR_DETACHED | THR_NEW_LWP) { } @@ -98,7 +98,7 @@ Handle_Thr_Acceptor<SVH, PR_AC_2>::init (int argc, ACE_TCHAR *argv[]) } template <class SVH, PR_AC_1> int -Handle_Thr_Acceptor<SVH, PR_AC_2>::fini (void) +Handle_Thr_Acceptor<SVH, PR_AC_2>::fini () { return ACE_Reactor::instance ()->remove_handler (this, ACE_Event_Handler::ACCEPT_MASK); @@ -141,7 +141,7 @@ CLI_Stream<PR_ST_2>::open (void *) } template <PR_ST_1> int -CLI_Stream<PR_ST_2>::svc (void) +CLI_Stream<PR_ST_2>::svc () { char buf[BUFSIZ]; char login_name[ACE_MAX_USERID]; diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h index 8db8172dca3..13e5b419445 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h @@ -20,8 +20,8 @@ class Handle_Thr_Acceptor : public ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_A // configured <ACE_Thread_Strategy>. { public: - Handle_Thr_Acceptor (void); - ~Handle_Thr_Acceptor (void); + Handle_Thr_Acceptor (); + ~Handle_Thr_Acceptor (); // = Dynamic linking hooks. virtual int init (int argc, ACE_TCHAR *argv[]); diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp index a7eb8b74cb8..445dc1c05dd 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.cpp @@ -3,21 +3,21 @@ #if defined (SunOS4) extern "C" { - int init (void); - int fini (void); + int init (); + int fini (); void __sti__Handle_Timeout_C_init_(); void __std__Handle_Timeout_C_init_(); } int -init (void) +init () { __sti__Handle_Timeout_C_init_(); return 0; } int -fini (void) +fini () { __std__Handle_Timeout_C_init_(); return 0; diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h index 5e3ddd628d2..6f56eef2d3f 100644 --- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h +++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h @@ -18,7 +18,7 @@ class ACE_Svc_Export Handle_Timeout : public ACE_Service_Object { public: - Handle_Timeout (void); + Handle_Timeout (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int info (ACE_TCHAR **, size_t) const; virtual int fini (); diff --git a/ACE/examples/Service_Configurator/Misc/Timer_Service.cpp b/ACE/examples/Service_Configurator/Misc/Timer_Service.cpp index 6ce12e216f0..6415f164d97 100644 --- a/ACE/examples/Service_Configurator/Misc/Timer_Service.cpp +++ b/ACE/examples/Service_Configurator/Misc/Timer_Service.cpp @@ -3,7 +3,7 @@ #include "ace/Log_Msg.h" -Timer_Service_1::Timer_Service_1 (void) +Timer_Service_1::Timer_Service_1 () { ACE_OS::strcpy (this->name_, ACE_TEXT ("Timer_Service_1")); @@ -104,13 +104,13 @@ Timer_Service_1::handle_close (ACE_HANDLE, return 0; } -Timer_Service_2::Timer_Service_2 (void) +Timer_Service_2::Timer_Service_2 () { ACE_OS::strcpy (this->name_, ACE_TEXT ("Timer_Service_2")); } -Timer_Service_3::Timer_Service_3 (void) +Timer_Service_3::Timer_Service_3 () { ACE_OS::strcpy (this->name_, ACE_TEXT ("Timer_Service_3")); diff --git a/ACE/examples/Service_Configurator/Misc/Timer_Service.h b/ACE/examples/Service_Configurator/Misc/Timer_Service.h index 148278f396d..e886818cf96 100644 --- a/ACE/examples/Service_Configurator/Misc/Timer_Service.h +++ b/ACE/examples/Service_Configurator/Misc/Timer_Service.h @@ -16,7 +16,7 @@ class ACE_Svc_Export Timer_Service_1 : public ACE_Service_Object // Demonstrates a simple timer service that can be configured // statically. public: - Timer_Service_1 (void); + Timer_Service_1 (); // Default constructor. virtual int init (int argc, ACE_TCHAR *argv[]); @@ -50,14 +50,14 @@ private: class ACE_Svc_Export Timer_Service_2 : public Timer_Service_1 { public: - Timer_Service_2 (void); + Timer_Service_2 (); // Default constructor. }; class ACE_Svc_Export Timer_Service_3 : public Timer_Service_1 { public: - Timer_Service_3 (void); + Timer_Service_3 (); // Default constructor. }; diff --git a/ACE/examples/Shared_Malloc/Malloc.cpp b/ACE/examples/Shared_Malloc/Malloc.cpp index 1115e9d1e88..d4a8e0b0fa9 100644 --- a/ACE/examples/Shared_Malloc/Malloc.cpp +++ b/ACE/examples/Shared_Malloc/Malloc.cpp @@ -40,7 +40,7 @@ ACE_Allocator *Malloc::instance_ = 0; // This is a factory that decides what type of allocator to create. ACE_Allocator * -Malloc::instance (void) +Malloc::instance () { if (Malloc::instance_ == 0) { diff --git a/ACE/examples/Shared_Malloc/Malloc.h b/ACE/examples/Shared_Malloc/Malloc.h index 2cce26fb98e..facf80c8236 100644 --- a/ACE/examples/Shared_Malloc/Malloc.h +++ b/ACE/examples/Shared_Malloc/Malloc.h @@ -17,11 +17,11 @@ class Malloc // Allocator Singleton. { public: - static ACE_Allocator *instance (void); + static ACE_Allocator *instance (); // Returns static instance. private: - Malloc (void); + Malloc (); // Ensure Singleton. static ACE_Allocator *instance_; diff --git a/ACE/examples/Shared_Malloc/Options.cpp b/ACE/examples/Shared_Malloc/Options.cpp index 4e4a8c300ba..0c8fc3710d2 100644 --- a/ACE/examples/Shared_Malloc/Options.cpp +++ b/ACE/examples/Shared_Malloc/Options.cpp @@ -8,7 +8,7 @@ Options *Options::instance_ = 0; Options * -Options::instance (void) +Options::instance () { if (Options::instance_ == 0) Options::instance_ = new Options (); @@ -17,73 +17,73 @@ Options::instance (void) } const char * -Options::program_name (void) +Options::program_name () { return this->program_name_; } const char * -Options::slave_name (void) +Options::slave_name () { return this->slave_name_; } int -Options::debug (void) +Options::debug () { return this->debug_; } int -Options::exec_slave (void) +Options::exec_slave () { return this->exec_slave_; } size_t -Options::iteration_count (void) +Options::iteration_count () { return this->iteration_count_; } int -Options::use_sbrk (void) +Options::use_sbrk () { return this->use_sbrk_; } size_t -Options::max_msg_size (void) +Options::max_msg_size () { return this->max_msg_size_; } size_t -Options::spawn_count (void) +Options::spawn_count () { return this->spawn_count_; } int -Options::spawn_threads (void) +Options::spawn_threads () { return this->spawn_threads_; } int -Options::use_mmap (void) +Options::use_mmap () { return this->use_mmap_; } int -Options::use_shmem (void) +Options::use_shmem () { return this->use_shmem_; } int -Options::child (void) +Options::child () { return this->child_; } @@ -91,7 +91,7 @@ Options::child (void) // Explain usage and exit. void -Options::print_usage_and_die (void) +Options::print_usage_and_die () { //FUZZ: disable check_for_lack_ACE_OS ACE_ERROR ((LM_ERROR, @@ -112,7 +112,7 @@ Options::print_usage_and_die (void) /* NOTREACHED */ } -Options::Options (void) +Options::Options () : debug_ (0), exec_slave_ (0), iteration_count_ (100), diff --git a/ACE/examples/Shared_Malloc/Options.h b/ACE/examples/Shared_Malloc/Options.h index 0c23fd3d894..1fd71fde574 100644 --- a/ACE/examples/Shared_Malloc/Options.h +++ b/ACE/examples/Shared_Malloc/Options.h @@ -14,34 +14,34 @@ class Options // Options Singleton. { public: - static Options *instance (void); + static Options *instance (); // Return Singleton. void parse_args (int argc, ACE_TCHAR *argv[]); // Parse the arguments. // = Accessor methods. - const char *program_name (void); - const char *slave_name (void); - int debug (void); - int exec_slave (void); - size_t iteration_count (void); - int use_sbrk (void); - int use_shmem (void); - size_t max_msg_size (void); - size_t spawn_count (void); - int spawn_threads (void); - int use_mmap (void); - int child (void); + const char *program_name (); + const char *slave_name (); + int debug (); + int exec_slave (); + size_t iteration_count (); + int use_sbrk (); + int use_shmem (); + size_t max_msg_size (); + size_t spawn_count (); + int spawn_threads (); + int use_mmap (); + int child (); private: - Options (void); + Options (); // Ensure Singleton. static Options *instance_; // Singleton. - void print_usage_and_die (void); + void print_usage_and_die (); // Explain usage and exit. char program_name_[MAXPATHLEN]; diff --git a/ACE/examples/Shared_Malloc/test_malloc.cpp b/ACE/examples/Shared_Malloc/test_malloc.cpp index fb2fa936954..d0a1bf279f9 100644 --- a/ACE/examples/Shared_Malloc/test_malloc.cpp +++ b/ACE/examples/Shared_Malloc/test_malloc.cpp @@ -15,7 +15,7 @@ static int -gen_size (void) +gen_size () { #if defined (ACE_HAS_THREADS) unsigned int seed = @@ -97,7 +97,7 @@ worker (void *arg) // Create the appropriate type of process/thread. static void -spawn (void) +spawn () { if (Options::instance ()->spawn_threads ()) { @@ -168,7 +168,7 @@ spawn (void) // Wait for all the child processes/threads to exit. static void -wait_for_children (void) +wait_for_children () { if (Options::instance ()->spawn_threads ()) { diff --git a/ACE/examples/Shared_Malloc/test_persistence.cpp b/ACE/examples/Shared_Malloc/test_persistence.cpp index 5635297da03..661d37abb30 100644 --- a/ACE/examples/Shared_Malloc/test_persistence.cpp +++ b/ACE/examples/Shared_Malloc/test_persistence.cpp @@ -86,14 +86,14 @@ class GUI_Handler public: GUI_Handler (void) { menu (); } - ~GUI_Handler (void) + ~GUI_Handler () { TEST_MALLOC::MEMORY_POOL &pool = shmem_allocator->memory_pool (); pool.sync (); } - int service(void) + int service() { char option[BUFSIZ]; char buf1[BUFSIZ]; @@ -149,7 +149,7 @@ public: return 0; } - void menu(void) + void menu() { cout << endl; cout << "\t************************** " << endl; @@ -169,7 +169,7 @@ private: int insert_employee (const char *name, u_long id); int find_employee (const char *name); - int list_employees (void); + int list_employees (); int delete_employee (const char *name); }; @@ -219,7 +219,7 @@ GUI_Handler::find_employee (const char *name) } int -GUI_Handler::list_employees (void) +GUI_Handler::list_employees () { ACE_DEBUG ((LM_DEBUG, "The following employees were found.......\n\n")); diff --git a/ACE/examples/Shared_Memory/test_MM.cpp b/ACE/examples/Shared_Memory/test_MM.cpp index a589bde588c..03be6b7363a 100644 --- a/ACE/examples/Shared_Memory/test_MM.cpp +++ b/ACE/examples/Shared_Memory/test_MM.cpp @@ -8,7 +8,7 @@ ACE_TCHAR shm_key[] = ACE_TEXT ("/tmp/fooXXXXXX"); static void -client (void) +client () { ACE_Shared_Memory *shm_client = new ACE_Shared_Memory_MM (shm_key); char *shm = (char *) shm_client->malloc (); @@ -21,7 +21,7 @@ client (void) } static void -server (void) +server () { ACE_Shared_Memory *shm_server = new ACE_Shared_Memory_MM (shm_key, SHMSZ); char *shm = (char *) shm_server->malloc (); diff --git a/ACE/examples/Shared_Memory/test_SV.cpp b/ACE/examples/Shared_Memory/test_SV.cpp index 217acf068fc..ac20d33e93a 100644 --- a/ACE/examples/Shared_Memory/test_SV.cpp +++ b/ACE/examples/Shared_Memory/test_SV.cpp @@ -6,7 +6,7 @@ #define SHM_KEY (key_t) 5678 static void -client (void) +client () { ACE_Shared_Memory_SV shm_client (SHM_KEY, SHMSZ); char *shm = (char *) shm_client.malloc (); @@ -19,7 +19,7 @@ client (void) } static void -server (void) +server () { ACE_Shared_Memory_SV shm_server (SHM_KEY, SHMSZ, diff --git a/ACE/examples/Smart_Pointers/Gadget.cpp b/ACE/examples/Smart_Pointers/Gadget.cpp index 3ecbe663e2a..f0dc39b0f6d 100644 --- a/ACE/examples/Smart_Pointers/Gadget.cpp +++ b/ACE/examples/Smart_Pointers/Gadget.cpp @@ -9,6 +9,6 @@ #include "Gadget.h" -Gadget::~Gadget (void) +Gadget::~Gadget () { } diff --git a/ACE/examples/Smart_Pointers/Gadget.h b/ACE/examples/Smart_Pointers/Gadget.h index 9455faa05ef..9fca7c5c22c 100644 --- a/ACE/examples/Smart_Pointers/Gadget.h +++ b/ACE/examples/Smart_Pointers/Gadget.h @@ -22,7 +22,7 @@ class Gadget { public: /// Destructor. - virtual ~Gadget (void); + virtual ~Gadget (); /// Add a new part to the gadget. The gadget automatically takes shared /// responsibility for the ownership of the part object since we are passing diff --git a/ACE/examples/Smart_Pointers/Gadget_Factory.cpp b/ACE/examples/Smart_Pointers/Gadget_Factory.cpp index 503e2edce68..5461f7190c6 100644 --- a/ACE/examples/Smart_Pointers/Gadget_Factory.cpp +++ b/ACE/examples/Smart_Pointers/Gadget_Factory.cpp @@ -10,7 +10,7 @@ #include "Gadget_Factory.h" #include "Gadget_Impl.h" -Gadget_var Gadget_Factory::create_gadget (void) +Gadget_var Gadget_Factory::create_gadget () { return Gadget_var (new Gadget_Impl); } diff --git a/ACE/examples/Smart_Pointers/Gadget_Factory.h b/ACE/examples/Smart_Pointers/Gadget_Factory.h index adead6f2d00..42bfce567d3 100644 --- a/ACE/examples/Smart_Pointers/Gadget_Factory.h +++ b/ACE/examples/Smart_Pointers/Gadget_Factory.h @@ -24,7 +24,7 @@ public: /// transferred to the caller since we return a Gadget_var. This also means /// that the object will be deleted automatically if the caller "forgets" to /// collect the return value. - static Gadget_var create_gadget (void); + static Gadget_var create_gadget (); }; #endif /* GADGET_FACTORY_H */ diff --git a/ACE/examples/Smart_Pointers/Gadget_Impl.cpp b/ACE/examples/Smart_Pointers/Gadget_Impl.cpp index 32b7d1167df..d7227c94614 100644 --- a/ACE/examples/Smart_Pointers/Gadget_Impl.cpp +++ b/ACE/examples/Smart_Pointers/Gadget_Impl.cpp @@ -10,12 +10,12 @@ #include "Gadget_Impl.h" #include "ace/Log_Msg.h" -Gadget_Impl::Gadget_Impl (void) +Gadget_Impl::Gadget_Impl () { ACE_DEBUG ((LM_DEBUG, "Gadget_Impl constructor\n")); } -Gadget_Impl::~Gadget_Impl (void) +Gadget_Impl::~Gadget_Impl () { ACE_DEBUG ((LM_DEBUG, "Gadget_Impl destructor\n")); } @@ -25,7 +25,7 @@ void Gadget_Impl::add_part (Gadget_Part_var part) parts_.enqueue_tail (part); } -Gadget_Part_var Gadget_Impl::remove_part (void) +Gadget_Part_var Gadget_Impl::remove_part () { Gadget_Part_var removed_part; if (parts_.dequeue_head (removed_part) == -1) @@ -33,7 +33,7 @@ Gadget_Part_var Gadget_Impl::remove_part (void) return removed_part; } -void Gadget_Impl::list_parts (void) +void Gadget_Impl::list_parts () { ACE_Unbounded_Queue_Iterator<Gadget_Part_var> iter (parts_); Gadget_Part_var *current_part; diff --git a/ACE/examples/Smart_Pointers/Gadget_Impl.h b/ACE/examples/Smart_Pointers/Gadget_Impl.h index b52663fa2ec..d0731c31b22 100644 --- a/ACE/examples/Smart_Pointers/Gadget_Impl.h +++ b/ACE/examples/Smart_Pointers/Gadget_Impl.h @@ -23,10 +23,10 @@ class Gadget_Impl : public Gadget { public: /// Constructor. - Gadget_Impl (void); + Gadget_Impl (); /// Destructor. - virtual ~Gadget_Impl (void); + virtual ~Gadget_Impl (); /// Add a new part to the gadget. The gadget takes ownership of the part /// object. @@ -34,10 +34,10 @@ public: /// Remove a random part from the gadget. Ownership of the part is returned /// to the caller. - virtual Gadget_Part_var remove_part (void); + virtual Gadget_Part_var remove_part (); /// Ask the gadget to print information about the parts that it contains. - virtual void list_parts (void); + virtual void list_parts (); private: /// The parts which make up this gadget. The set actually contains instances diff --git a/ACE/examples/Smart_Pointers/Gadget_Part.cpp b/ACE/examples/Smart_Pointers/Gadget_Part.cpp index b70887f57fb..6aebdecb45d 100644 --- a/ACE/examples/Smart_Pointers/Gadget_Part.cpp +++ b/ACE/examples/Smart_Pointers/Gadget_Part.cpp @@ -9,6 +9,6 @@ #include "Gadget_Part.h" -Gadget_Part::~Gadget_Part (void) +Gadget_Part::~Gadget_Part () { } diff --git a/ACE/examples/Smart_Pointers/Gadget_Part.h b/ACE/examples/Smart_Pointers/Gadget_Part.h index 5132dfffcff..c2ff23b0df2 100644 --- a/ACE/examples/Smart_Pointers/Gadget_Part.h +++ b/ACE/examples/Smart_Pointers/Gadget_Part.h @@ -23,7 +23,7 @@ class Gadget_Part { public: /// Destructor. - virtual ~Gadget_Part (void); + virtual ~Gadget_Part (); /// Ask the part to print information about itself. virtual void print_info (void) = 0; diff --git a/ACE/examples/Smart_Pointers/Gadget_Part_Impl.cpp b/ACE/examples/Smart_Pointers/Gadget_Part_Impl.cpp index 30c1b0dc831..cee3b09e548 100644 --- a/ACE/examples/Smart_Pointers/Gadget_Part_Impl.cpp +++ b/ACE/examples/Smart_Pointers/Gadget_Part_Impl.cpp @@ -22,19 +22,19 @@ Gadget_Part_Impl::Gadget_Part_Impl (Gadget_ptr owner, ACE_DEBUG ((LM_DEBUG, "Gadget_Part_Impl constructor\n")); } -Gadget_Part_Impl::~Gadget_Part_Impl (void) +Gadget_Part_Impl::~Gadget_Part_Impl () { ACE_DEBUG ((LM_DEBUG, "Gadget_Part_Impl destructor\n")); delete [] name_; } -void Gadget_Part_Impl::print_info (void) +void Gadget_Part_Impl::print_info () { ACE_DEBUG ((LM_INFO, "Gadget part: name=%s size=%d\n", name_, size_)); } -void Gadget_Part_Impl::remove_from_owner (void) +void Gadget_Part_Impl::remove_from_owner () { // Need to guarantee the existence of the owner for the duration of this call. Gadget_var owner = owner_; diff --git a/ACE/examples/Smart_Pointers/Gadget_Part_Impl.h b/ACE/examples/Smart_Pointers/Gadget_Part_Impl.h index 0b63e139a59..7acd3e631d1 100644 --- a/ACE/examples/Smart_Pointers/Gadget_Part_Impl.h +++ b/ACE/examples/Smart_Pointers/Gadget_Part_Impl.h @@ -25,13 +25,13 @@ public: Gadget_Part_Impl (Gadget_ptr owner, const char* name, int size); /// Destructor. - virtual ~Gadget_Part_Impl (void); + virtual ~Gadget_Part_Impl (); /// Ask the part to print information about itself. - virtual void print_info (void); + virtual void print_info (); /// Ask the part to remove itself from the gadget that contains it. - virtual void remove_from_owner (void); + virtual void remove_from_owner (); private: /// The gadget that contains this part. diff --git a/ACE/examples/Smart_Pointers/Widget.cpp b/ACE/examples/Smart_Pointers/Widget.cpp index de56e871a72..92ee6266166 100644 --- a/ACE/examples/Smart_Pointers/Widget.cpp +++ b/ACE/examples/Smart_Pointers/Widget.cpp @@ -9,6 +9,6 @@ #include "Widget.h" -Widget::~Widget (void) +Widget::~Widget () { } diff --git a/ACE/examples/Smart_Pointers/Widget.h b/ACE/examples/Smart_Pointers/Widget.h index 7c1d1ad85c9..b838fa35877 100644 --- a/ACE/examples/Smart_Pointers/Widget.h +++ b/ACE/examples/Smart_Pointers/Widget.h @@ -21,7 +21,7 @@ class Widget { public: /// Destructor. - virtual ~Widget (void); + virtual ~Widget (); /// Add a new part to the widget. The widget takes ownership of the part /// object. diff --git a/ACE/examples/Smart_Pointers/Widget_Factory.cpp b/ACE/examples/Smart_Pointers/Widget_Factory.cpp index e35119d3d51..52921fa0d1f 100644 --- a/ACE/examples/Smart_Pointers/Widget_Factory.cpp +++ b/ACE/examples/Smart_Pointers/Widget_Factory.cpp @@ -10,7 +10,7 @@ #include "Widget_Factory.h" #include "Widget_Impl.h" -Widget *Widget_Factory::create_widget (void) +Widget *Widget_Factory::create_widget () { return new Widget_Impl; } diff --git a/ACE/examples/Smart_Pointers/Widget_Factory.h b/ACE/examples/Smart_Pointers/Widget_Factory.h index e78c05e805a..792da334295 100644 --- a/ACE/examples/Smart_Pointers/Widget_Factory.h +++ b/ACE/examples/Smart_Pointers/Widget_Factory.h @@ -22,7 +22,7 @@ class Widget_Factory public: /// Create an instance of a widget. Ownership of the newly created object is /// transferred to the caller. - static Widget *create_widget (void); + static Widget *create_widget (); }; #endif /* WIDGET_FACTORY_H */ diff --git a/ACE/examples/Smart_Pointers/Widget_Impl.cpp b/ACE/examples/Smart_Pointers/Widget_Impl.cpp index 504fc050892..e62f3ccdd1c 100644 --- a/ACE/examples/Smart_Pointers/Widget_Impl.cpp +++ b/ACE/examples/Smart_Pointers/Widget_Impl.cpp @@ -10,12 +10,12 @@ #include "Widget_Impl.h" #include "ace/Log_Msg.h" -Widget_Impl::Widget_Impl (void) +Widget_Impl::Widget_Impl () { ACE_DEBUG ((LM_DEBUG, "Widget_Impl constructor\n")); } -Widget_Impl::~Widget_Impl (void) +Widget_Impl::~Widget_Impl () { ACE_DEBUG ((LM_DEBUG, "Widget_Impl destructor\n")); } @@ -28,7 +28,7 @@ void Widget_Impl::add_part (Widget_Part *part) parts_.enqueue_tail (new_part); } -Widget_Part *Widget_Impl::remove_part (void) +Widget_Part *Widget_Impl::remove_part () { ACE_Refcounted_Auto_Ptr<Widget_Part, ACE_SYNCH_MUTEX> removed_part; if (parts_.dequeue_head (removed_part) == -1) @@ -38,7 +38,7 @@ Widget_Part *Widget_Impl::remove_part (void) return removed_part.release(); } -void Widget_Impl::list_parts (void) +void Widget_Impl::list_parts () { ACE_Unbounded_Queue_Iterator<ACE_Refcounted_Auto_Ptr<Widget_Part, ACE_SYNCH_MUTEX> > iter (parts_); ACE_Refcounted_Auto_Ptr<Widget_Part, ACE_SYNCH_MUTEX> *current_part; diff --git a/ACE/examples/Smart_Pointers/Widget_Impl.h b/ACE/examples/Smart_Pointers/Widget_Impl.h index a8982e77dd5..220c5f752fc 100644 --- a/ACE/examples/Smart_Pointers/Widget_Impl.h +++ b/ACE/examples/Smart_Pointers/Widget_Impl.h @@ -28,10 +28,10 @@ class Widget_Impl : public Widget { public: /// Constructor. - Widget_Impl (void); + Widget_Impl (); /// Destructor. - virtual ~Widget_Impl (void); + virtual ~Widget_Impl (); /// Add a new part to the widget. The widget takes ownership of the part /// object. @@ -39,10 +39,10 @@ public: /// Remove a random part from the widget. Ownership of the part is returned /// to the caller. - virtual Widget_Part *remove_part (void); + virtual Widget_Part *remove_part (); /// Ask the widget to print information about the parts that it contains. - virtual void list_parts (void); + virtual void list_parts (); private: /// The parts which make up this widget. The set actually contains instances diff --git a/ACE/examples/Smart_Pointers/Widget_Part.cpp b/ACE/examples/Smart_Pointers/Widget_Part.cpp index cea74f60aae..7f0f81b6fb5 100644 --- a/ACE/examples/Smart_Pointers/Widget_Part.cpp +++ b/ACE/examples/Smart_Pointers/Widget_Part.cpp @@ -9,6 +9,6 @@ #include "Widget_Part.h" -Widget_Part::~Widget_Part (void) +Widget_Part::~Widget_Part () { } diff --git a/ACE/examples/Smart_Pointers/Widget_Part.h b/ACE/examples/Smart_Pointers/Widget_Part.h index 2b251ec6e6f..818ebe7685a 100644 --- a/ACE/examples/Smart_Pointers/Widget_Part.h +++ b/ACE/examples/Smart_Pointers/Widget_Part.h @@ -19,7 +19,7 @@ class Widget_Part { public: /// Destructor. - virtual ~Widget_Part (void); + virtual ~Widget_Part (); /// Ask the part to print information about itself. virtual void print_info (void) = 0; diff --git a/ACE/examples/Smart_Pointers/Widget_Part_Impl.cpp b/ACE/examples/Smart_Pointers/Widget_Part_Impl.cpp index b0433a99746..bc55b76be7f 100644 --- a/ACE/examples/Smart_Pointers/Widget_Part_Impl.cpp +++ b/ACE/examples/Smart_Pointers/Widget_Part_Impl.cpp @@ -22,19 +22,19 @@ Widget_Part_Impl::Widget_Part_Impl (Widget *owner, const char* name, int size) ACE_DEBUG ((LM_DEBUG, "Widget_Part_Impl constructor\n")); } -Widget_Part_Impl::~Widget_Part_Impl (void) +Widget_Part_Impl::~Widget_Part_Impl () { ACE_DEBUG ((LM_DEBUG, "Widget_Part_Impl destructor\n")); delete [] name_; } -void Widget_Part_Impl::print_info (void) +void Widget_Part_Impl::print_info () { ACE_DEBUG ((LM_INFO, "Widget part: name=%s size=%d\n", name_, size_)); } -void Widget_Part_Impl::remove_from_owner (void) +void Widget_Part_Impl::remove_from_owner () { // Since we only have a raw pointer to refer to the owner, we have no way of // checking whether the owner still exists, and if it does guaranteeing that diff --git a/ACE/examples/Smart_Pointers/Widget_Part_Impl.h b/ACE/examples/Smart_Pointers/Widget_Part_Impl.h index 28adb326fb3..01df1b593d4 100644 --- a/ACE/examples/Smart_Pointers/Widget_Part_Impl.h +++ b/ACE/examples/Smart_Pointers/Widget_Part_Impl.h @@ -25,13 +25,13 @@ public: Widget_Part_Impl (Widget *owner, const char* name, int size); /// Destructor. - virtual ~Widget_Part_Impl (void); + virtual ~Widget_Part_Impl (); /// Ask the part to print information about itself. - virtual void print_info (void); + virtual void print_info (); /// Ask the part to remove itself from the widget that contains it. - virtual void remove_from_owner (void); + virtual void remove_from_owner (); private: /// The widget that contains this part. diff --git a/ACE/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp b/ACE/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp index 0bbbc7eea4f..aa0ef26866c 100644 --- a/ACE/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp +++ b/ACE/examples/System_V_IPC/SV_Shared_Memory/SV_Shared_Memory_Test.cpp @@ -9,7 +9,7 @@ #if defined (ACE_HAS_SYSV_IPC) && !defined(ACE_LACKS_SYSV_SHMEM) static void -client (void) +client () { ACE_SV_Shared_Memory shm_client; @@ -25,7 +25,7 @@ client (void) } static void -server (void) +server () { ACE_SV_Shared_Memory shm_server; diff --git a/ACE/examples/Threads/TSS_Obj.h b/ACE/examples/Threads/TSS_Obj.h index 07ba7a6a5fd..0940110cab7 100644 --- a/ACE/examples/Threads/TSS_Obj.h +++ b/ACE/examples/Threads/TSS_Obj.h @@ -26,8 +26,8 @@ class TSS_Obj { public: - TSS_Obj (void); - ~TSS_Obj (void); + TSS_Obj (); + ~TSS_Obj (); private: static ACE_Atomic_Op<ACE_SYNCH_MUTEX, int> count_; diff --git a/ACE/examples/Threads/TSS_Task.h b/ACE/examples/Threads/TSS_Task.h index 2fe503f2e1c..0804e8f9b82 100644 --- a/ACE/examples/Threads/TSS_Task.h +++ b/ACE/examples/Threads/TSS_Task.h @@ -22,8 +22,8 @@ class Test_Task { public: - Test_Task (void); - ~Test_Task (void); + Test_Task (); + ~Test_Task (); int open (void *arg); diff --git a/ACE/examples/Threads/barrier2.cpp b/ACE/examples/Threads/barrier2.cpp index 2c5866aa306..112590a6392 100644 --- a/ACE/examples/Threads/barrier2.cpp +++ b/ACE/examples/Threads/barrier2.cpp @@ -28,7 +28,7 @@ public: int n_threads, int inp_serialize = 1); - virtual int producer (void); + virtual int producer (); // produce input for workers virtual int input (ACE_Message_Block *mb); @@ -139,7 +139,7 @@ Worker_Task<BARRIER>::service (ACE_Message_Block *mb, // for all other threads to complete this iteration. template <class BARRIER> int -Worker_Task<BARRIER>::svc (void) +Worker_Task<BARRIER>::svc () { // Note that the <ACE_Task::svc_run> method automatically adds us to // the Thread_Manager when the thread begins. @@ -187,7 +187,7 @@ Worker_Task<BARRIER>::svc (void) } template <class BARRIER> int -Worker_Task<BARRIER>::producer (void) +Worker_Task<BARRIER>::producer () { // Keep reading stdin, until we reach EOF. diff --git a/ACE/examples/Threads/future1.cpp b/ACE/examples/Threads/future1.cpp index f1e57c6f7c3..92f8387a135 100644 --- a/ACE/examples/Threads/future1.cpp +++ b/ACE/examples/Threads/future1.cpp @@ -53,7 +53,7 @@ class Scheduler : public ACE_Task_Base friend class Method_RequestWork; public: Scheduler (const char *, Scheduler * = 0); - virtual ~Scheduler (void); + virtual ~Scheduler (); //FUZZ: disable check_for_lack_ACE_OS ///FUZZ: enable check_for_lack_ACE_OS @@ -63,11 +63,11 @@ public: virtual int svc (); ACE_Future<u_long> work (u_long param, int count = 1); - ACE_Future<const char*> name (void); - void end (void); + ACE_Future<const char*> name (); + void end (); u_long work_i (u_long, int); - const char *name_i (void); + const char *name_i (); private: char *name_; @@ -84,8 +84,8 @@ class Method_Request_work : public ACE_Method_Request { public: Method_Request_work (Scheduler *, u_long, int, ACE_Future<u_long> &); - virtual ~Method_Request_work (void); - virtual int call (void); + virtual ~Method_Request_work (); + virtual int call (); private: Scheduler *scheduler_; @@ -107,14 +107,14 @@ Method_Request_work::Method_Request_work (Scheduler* new_Scheduler, "(%t) Method_Request_work created\n")); } -Method_Request_work::~Method_Request_work (void) +Method_Request_work::~Method_Request_work () { ACE_DEBUG ((LM_DEBUG, "(%t) Method_Request_work will be deleted.\n")); } int -Method_Request_work::call (void) +Method_Request_work::call () { return this->future_result_.set (this->scheduler_->work_i (this->param_, this->count_)); } @@ -128,8 +128,8 @@ class Method_Request_name : public ACE_Method_Request { public: Method_Request_name (Scheduler *, ACE_Future<const char*> &); - virtual ~Method_Request_name (void); - virtual int call (void); + virtual ~Method_Request_name (); + virtual int call (); private: Scheduler *scheduler_; @@ -145,14 +145,14 @@ Method_Request_name::Method_Request_name (Scheduler *new_scheduler, "(%t) Method_Request_name created\n")); } -Method_Request_name::~Method_Request_name (void) +Method_Request_name::~Method_Request_name () { ACE_DEBUG ((LM_DEBUG, "(%t) Method_Request_name will be deleted.\n")); } int -Method_Request_name::call (void) +Method_Request_name::call () { return future_result_.set (scheduler_->name_i ()); } @@ -185,7 +185,7 @@ Scheduler::Scheduler (const char *newname, } // Destructor -Scheduler::~Scheduler (void) +Scheduler::~Scheduler () { ACE_DEBUG ((LM_DEBUG, "(%t) Scheduler %s will be destroyed\n", this->name_)); delete [] this->name_; @@ -211,7 +211,7 @@ Scheduler::close (u_long) // service.. int -Scheduler::svc (void) +Scheduler::svc () { for (;;) { @@ -231,7 +231,7 @@ Scheduler::svc (void) } void -Scheduler::end (void) +Scheduler::end () { this->activation_queue_.enqueue (new Method_Request_end (this)); } @@ -248,7 +248,7 @@ Scheduler::work_i (u_long param, } const char * -Scheduler::name_i (void) +Scheduler::name_i () { char *the_name; @@ -259,7 +259,7 @@ Scheduler::name_i (void) } ACE_Future<const char *> -Scheduler::name (void) +Scheduler::name () { if (this->scheduler_) // Delegate to the Scheduler. diff --git a/ACE/examples/Threads/future2.cpp b/ACE/examples/Threads/future2.cpp index a136de35ff5..f90f14b2382 100644 --- a/ACE/examples/Threads/future2.cpp +++ b/ACE/examples/Threads/future2.cpp @@ -48,7 +48,7 @@ class Scheduler : public ACE_Task_Base friend class Method_Request_end; public: Scheduler (const char *, Scheduler * = 0); - virtual ~Scheduler (void); + virtual ~Scheduler (); //FUZZ: disable check_for_lack_ACE_OS /// The method that is used to start the active object. @@ -58,8 +58,8 @@ public: // = Here are the methods exported by the class. They return an // <ACE_Future>. ACE_Future<u_long> work (u_long param, int count = 1); - ACE_Future<char*> name (void); - void end (void); + ACE_Future<char*> name (); + void end (); private: //FUZZ: disable check_for_lack_ACE_OS @@ -72,7 +72,7 @@ private: // = Implementation methods. u_long work_i (u_long, int); - char *name_i (void); + char *name_i (); char *name_; ACE_Activation_Queue activation_queue_; @@ -88,8 +88,8 @@ class Method_Request_work : public ACE_Method_Request { public: Method_Request_work (Scheduler *, u_long, int, ACE_Future<u_long> &); - virtual ~Method_Request_work (void); - virtual int call (void); + virtual ~Method_Request_work (); + virtual int call (); private: Scheduler *scheduler_; @@ -109,12 +109,12 @@ Method_Request_work::Method_Request_work (Scheduler* new_Scheduler, { } -Method_Request_work::~Method_Request_work (void) +Method_Request_work::~Method_Request_work () { } int -Method_Request_work::call (void) +Method_Request_work::call () { return this->future_result_.set (this->scheduler_->work_i (this->param_, this->count_)); } @@ -128,8 +128,8 @@ class Method_Request_name : public ACE_Method_Request { public: Method_Request_name (Scheduler *, ACE_Future<char*> &); - virtual ~Method_Request_name (void); - virtual int call (void); + virtual ~Method_Request_name (); + virtual int call (); private: Scheduler *scheduler_; @@ -146,14 +146,14 @@ Method_Request_name::Method_Request_name (Scheduler *new_scheduler, " (%t) Method_Request_name created\n")); } -Method_Request_name::~Method_Request_name (void) +Method_Request_name::~Method_Request_name () { ACE_DEBUG ((LM_DEBUG, " (%t) Method_Request_name will be deleted.\n")); } int -Method_Request_name::call (void) +Method_Request_name::call () { return future_result_.set (scheduler_->name_i ()); } @@ -185,7 +185,7 @@ Scheduler::Scheduler (const char *newname, Scheduler *new_Scheduler) } // Destructor -Scheduler::~Scheduler (void) +Scheduler::~Scheduler () { ACE_DEBUG ((LM_DEBUG, " (%t) Scheduler %s will be destroyed\n", this->name_)); } @@ -207,7 +207,7 @@ Scheduler::close (u_long) } int -Scheduler::svc (void) +Scheduler::svc () { // Main event loop for this active object. for (;;) @@ -228,7 +228,7 @@ Scheduler::svc (void) } void -Scheduler::end (void) +Scheduler::end () { this->activation_queue_.enqueue (new Method_Request_end (this)); } @@ -244,7 +244,7 @@ Scheduler::work_i (u_long param, } char * -Scheduler::name_i (void) +Scheduler::name_i () { char *the_name; @@ -255,7 +255,7 @@ Scheduler::name_i (void) } ACE_Future<char *> -Scheduler::name (void) +Scheduler::name () { if (this->scheduler_) // Delegate to the other scheduler @@ -307,7 +307,7 @@ Scheduler::work (u_long newparam, int newcount) } static int -determine_iterations (void) +determine_iterations () { int n_iterations; diff --git a/ACE/examples/Threads/manual_event.cpp b/ACE/examples/Threads/manual_event.cpp index a3647c2351e..8642d6da3ad 100644 --- a/ACE/examples/Threads/manual_event.cpp +++ b/ACE/examples/Threads/manual_event.cpp @@ -36,7 +36,7 @@ public: Pseudo_Barrier (u_long count); //FUZZ: disable check_for_lack_ACE_OS - int wait (void); + int wait (); //FUZZ: enable check_for_lack_ACE_OS private: @@ -50,7 +50,7 @@ Pseudo_Barrier::Pseudo_Barrier (u_long count) } int -Pseudo_Barrier::wait (void) +Pseudo_Barrier::wait () { if (--this->counter_ == 0) return this->event_.signal (); diff --git a/ACE/examples/Threads/process_manager.cpp b/ACE/examples/Threads/process_manager.cpp index c7cbc2f36d1..4e9ebe88d10 100644 --- a/ACE/examples/Threads/process_manager.cpp +++ b/ACE/examples/Threads/process_manager.cpp @@ -32,7 +32,7 @@ public: ExitHandler (const char *name); /// Called when object is removed from the <ACE_Reactor>. - virtual ~ExitHandler (void); + virtual ~ExitHandler (); virtual int handle_exit (ACE_Process *proc); virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg = 0); @@ -48,7 +48,7 @@ ExitHandler::ExitHandler (const char *name) { } -ExitHandler::~ExitHandler (void) +ExitHandler::~ExitHandler () { ACE_DEBUG ((LM_DEBUG, "(%P|%t@%T) ExitHandler \"%s\" destroyed\n", diff --git a/ACE/examples/Threads/reader_writer.cpp b/ACE/examples/Threads/reader_writer.cpp index 8f403319d32..b9677035feb 100644 --- a/ACE/examples/Threads/reader_writer.cpp +++ b/ACE/examples/Threads/reader_writer.cpp @@ -39,7 +39,7 @@ static ACE_Thread_Manager thr_mgr; // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, "usage: %n [-r n_readers] [-w n_writers] [-n iteration_count]\n")); diff --git a/ACE/examples/Threads/recursive_mutex.cpp b/ACE/examples/Threads/recursive_mutex.cpp index 55d4c057ac6..522a4ce7bfa 100644 --- a/ACE/examples/Threads/recursive_mutex.cpp +++ b/ACE/examples/Threads/recursive_mutex.cpp @@ -18,7 +18,7 @@ static size_t n_threads = 4; // Explain usage and exit. static void -print_usage_and_die (void) +print_usage_and_die () { ACE_DEBUG ((LM_DEBUG, "usage: %n [-t n_threads] [-n iteration_count]\n")); diff --git a/ACE/examples/Threads/task_five.cpp b/ACE/examples/Threads/task_five.cpp index 5d8d686a215..9122a3e060a 100644 --- a/ACE/examples/Threads/task_five.cpp +++ b/ACE/examples/Threads/task_five.cpp @@ -37,13 +37,13 @@ public: //FUZZ: disable check_for_lack_ACE_OS int open (void * = 0); - int svc (void); + int svc (); int close (u_long); ///FUZZ: enable check_for_lack_ACE_OS - int shutdown (void); + int shutdown (); - int synch (void); + int synch (); }; Test_Task::Test_Task (ACE_Thread_Manager *thrmgr) @@ -66,7 +66,7 @@ Test_Task::open (void *) } int -Test_Task::svc (void) +Test_Task::svc () { while (thr_mgr_->testcancel (ACE_OS::thr_self ()) == 0) // Sleep for 350 msecs. @@ -83,13 +83,13 @@ Test_Task::close (u_long) } int -Test_Task::shutdown (void) +Test_Task::shutdown () { return thr_mgr_->cancel_grp (grp_id_); } int -Test_Task::synch (void) +Test_Task::synch () { return thr_mgr_->wait_grp (grp_id_); } diff --git a/ACE/examples/Threads/task_four.cpp b/ACE/examples/Threads/task_four.cpp index e1f06fa7d1f..200aa17f52c 100644 --- a/ACE/examples/Threads/task_four.cpp +++ b/ACE/examples/Threads/task_four.cpp @@ -119,7 +119,7 @@ Worker_Task::open (void *) } int -Worker_Task::svc (void) +Worker_Task::svc () { ACE_DEBUG ((LM_DEBUG, " (%t) in worker %d\n", @@ -167,7 +167,7 @@ Invoker_Task::Invoker_Task (ACE_Thread_Manager *thr_mgr, // for all other threads to complete this iteration. int -Invoker_Task::svc (void) +Invoker_Task::svc () { // Note that the ACE_Task::svc_run () method automatically adds us // to the Thread_Manager when the thread begins. diff --git a/ACE/examples/Threads/task_one.cpp b/ACE/examples/Threads/task_one.cpp index a30478a7ab4..e2dab9b6369 100644 --- a/ACE/examples/Threads/task_one.cpp +++ b/ACE/examples/Threads/task_one.cpp @@ -49,7 +49,7 @@ Barrier_Task::Barrier_Task (ACE_Thread_Manager *thr_mgr, // for all other threads to complete this iteration. int -Barrier_Task::svc (void) +Barrier_Task::svc () { // Note that the ACE_Task::svc_run() method automatically adds us to // the Thread_Manager when the thread begins. diff --git a/ACE/examples/Threads/task_three.cpp b/ACE/examples/Threads/task_three.cpp index eda453579fe..89d118daba0 100644 --- a/ACE/examples/Threads/task_three.cpp +++ b/ACE/examples/Threads/task_three.cpp @@ -32,8 +32,8 @@ static const size_t TASK_COUNT = 130; 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 virtual int open (void *args = 0); @@ -55,7 +55,7 @@ size_t Test_Task::done_cnt_ = 0; static ACE_Thread_Mutex Lock; -Test_Task::Test_Task (void) +Test_Task::Test_Task () { ACE_GUARD (ACE_Thread_Mutex, ace_mon, Lock); @@ -66,7 +66,7 @@ Test_Task::Test_Task (void) Test_Task::current_count_)); } -Test_Task::~Test_Task (void) +Test_Task::~Test_Task () { ACE_GUARD (ACE_Thread_Mutex, ace_mon, Lock); @@ -95,7 +95,7 @@ Test_Task::close (u_long) } int -Test_Task::svc (void) +Test_Task::svc () { // Every thread must register the same stream to write to file. if (out_stream) diff --git a/ACE/examples/Threads/task_two.cpp b/ACE/examples/Threads/task_two.cpp index e0dadf0bd44..47ccea2ae98 100644 --- a/ACE/examples/Threads/task_two.cpp +++ b/ACE/examples/Threads/task_two.cpp @@ -67,7 +67,7 @@ Task_Test::close (u_long) } int -Task_Test::svc (void) +Task_Test::svc () { wait_count++; max_count++; diff --git a/ACE/examples/Threads/thread_pool.cpp b/ACE/examples/Threads/thread_pool.cpp index 4b3124d3aa2..9ea0488c330 100644 --- a/ACE/examples/Threads/thread_pool.cpp +++ b/ACE/examples/Threads/thread_pool.cpp @@ -34,7 +34,7 @@ public: int n_threads); // Constructor activates <n_threads> in the thread pool. - ~Thread_Pool (void); + ~Thread_Pool (); // Destructor... virtual int svc (); @@ -72,7 +72,7 @@ Thread_Pool::Thread_Pool (ACE_Thread_Manager *thr_mgr, "activate failed")); } -Thread_Pool::~Thread_Pool (void) +Thread_Pool::~Thread_Pool () { } @@ -89,7 +89,7 @@ Thread_Pool::put (ACE_Message_Block *mb, // for all other threads to complete this iteration. int -Thread_Pool::svc (void) +Thread_Pool::svc () { // Note that the <ACE_Task::svc_run> method automatically adds us to // the Thread_Manager when the thread begins. diff --git a/ACE/examples/Threads/thread_specific.h b/ACE/examples/Threads/thread_specific.h index fbc18d450f7..f17c21a8751 100644 --- a/ACE/examples/Threads/thread_specific.h +++ b/ACE/examples/Threads/thread_specific.h @@ -21,7 +21,7 @@ public: // Errno::flags_ is a static variable, so we've got to protect it // with a mutex since it isn't kept in thread-specific storage. - int flags (void) + int flags () { ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, Errno::lock_, -1); diff --git a/ACE/examples/Threads/token.cpp b/ACE/examples/Threads/token.cpp index 391a7adafa3..411b37fbdf7 100644 --- a/ACE/examples/Threads/token.cpp +++ b/ACE/examples/Threads/token.cpp @@ -39,7 +39,7 @@ My_Task::sleep_hook (void *) // Test out the behavior of the ACE_Token class. int -My_Task::svc (void) +My_Task::svc () { for (size_t i = 0; i < 100; i++) { diff --git a/ACE/examples/Threads/tss1.cpp b/ACE/examples/Threads/tss1.cpp index 5b00898aba3..4a41d84f596 100644 --- a/ACE/examples/Threads/tss1.cpp +++ b/ACE/examples/Threads/tss1.cpp @@ -57,7 +57,7 @@ public: }; template <ACE_SYNCH_DECL> int -Tester<ACE_SYNCH_USE>::svc (void) +Tester<ACE_SYNCH_USE>::svc () { ACE_DEBUG ((LM_DEBUG, "(%t) svc: setting error code to 1\n")); diff --git a/ACE/examples/Threads/tss2.cpp b/ACE/examples/Threads/tss2.cpp index 8abd9de1f0a..eba9b59e29d 100644 --- a/ACE/examples/Threads/tss2.cpp +++ b/ACE/examples/Threads/tss2.cpp @@ -35,26 +35,26 @@ static ACE_Token token; ACE_Atomic_Op<ACE_Thread_Mutex, int> TSS_Obj::count_ = 0; -TSS_Obj::TSS_Obj (void) +TSS_Obj::TSS_Obj () { TSS_Obj::count_++; ACE_DEBUG ((LM_DEBUG, "(%t) TSS_Obj+: %d\n", TSS_Obj::count_.value ())); } -TSS_Obj::~TSS_Obj (void) +TSS_Obj::~TSS_Obj () { TSS_Obj::count_--; ACE_DEBUG ((LM_DEBUG, "(%t) TSS_Obj-: %d\n", TSS_Obj::count_.value ())); } -Test_Task::Test_Task (void) +Test_Task::Test_Task () { Test_Task::count_++; ACE_DEBUG ((LM_DEBUG, "(%t) Test_Task+: %d\n", Test_Task::count_.value ())); } -Test_Task::~Test_Task (void) +Test_Task::~Test_Task () { Test_Task::count_--; diff --git a/ACE/examples/Threads/wfmo.cpp b/ACE/examples/Threads/wfmo.cpp index 65aad644704..08ee7eb82de 100644 --- a/ACE/examples/Threads/wfmo.cpp +++ b/ACE/examples/Threads/wfmo.cpp @@ -46,7 +46,7 @@ WFMO_Test::open (void *arg) } int -WFMO_Test::svc (void) +WFMO_Test::svc () { while(1) { diff --git a/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp b/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp index 8a39ab6c705..b1e1f1367bf 100644 --- a/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp +++ b/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.cpp @@ -43,7 +43,7 @@ Async_Timer_Queue *Async_Timer_Queue::instance_ = 0; // Implement the Singleton logic. Async_Timer_Queue * -Async_Timer_Queue::instance (void) +Async_Timer_Queue::instance () { if (Async_Timer_Queue::instance_ == 0) { @@ -69,7 +69,7 @@ Async_Timer_Queue::Async_Timer_Queue (ACE_Sig_Set *ss) : // Dump the contents of the queue when we receive ^C. void -Async_Timer_Queue::dump (void) +Async_Timer_Queue::dump () { ACE_DEBUG ((LM_DEBUG, "begin dumping timer queue\n")); @@ -196,7 +196,7 @@ signal_handler (int signum) // However, SIGQUIT is never blocked... static void -register_signal_handlers (void) +register_signal_handlers () { #if !defined (ACE_LACKS_UNIX_SIGNALS) // Register SIGQUIT (never blocked). @@ -219,14 +219,14 @@ register_signal_handlers (void) // constructor -Async_Timer_Queue_Test_Driver::Async_Timer_Queue_Test_Driver (void) +Async_Timer_Queue_Test_Driver::Async_Timer_Queue_Test_Driver () { } // displays the menu of options. int -Async_Timer_Queue_Test_Driver::display_menu (void) +Async_Timer_Queue_Test_Driver::display_menu () { // The menu of options provided to the user. static char menu[] = @@ -243,7 +243,7 @@ Async_Timer_Queue_Test_Driver::display_menu (void) // Initializes the test driver. int -Async_Timer_Queue_Test_Driver::init (void) +Async_Timer_Queue_Test_Driver::init () { typedef Command<Async_Timer_Queue, Async_Timer_Queue::ACTION> CMD; diff --git a/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.h b/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.h index 9e4c74bd4c5..69d4568118f 100644 --- a/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.h +++ b/ACE/examples/Timer_Queue/Async_Timer_Queue_Test.h @@ -56,7 +56,7 @@ public: typedef int (Async_Timer_Queue::*ACTION) (void *); /// Singleton access point. - static Async_Timer_Queue *instance (void); + static Async_Timer_Queue *instance (); /// Schedule a timer to expire <microsecs> in the future. void schedule (u_int microsecs); @@ -65,7 +65,7 @@ public: void cancel (long timer_id); /// Dump the contents of the queue. - void dump (void); + void dump (); /// hook method to schedule a timer. Called from /// <Timer_Queue_Test_Driver> @@ -108,13 +108,13 @@ private: class ACE_Svc_Export Async_Timer_Queue_Test_Driver : public Timer_Queue_Test_Driver <Async_Timer_Queue *, Async_Timer_Queue, Async_Timer_Queue::ACTION> { public: - Async_Timer_Queue_Test_Driver (void); + Async_Timer_Queue_Test_Driver (); /// Print menu of options. - virtual int display_menu (void); + virtual int display_menu (); /// Initializes the driver's internal variables inherited from the parent - virtual int init (void); + virtual int init (); }; #endif /* _ASYNC_TIMER_QUEUE_TEST_H_ */ diff --git a/ACE/examples/Timer_Queue/Custom_Handler.cpp b/ACE/examples/Timer_Queue/Custom_Handler.cpp index 9fa50ffdc3e..5e7357260e9 100644 --- a/ACE/examples/Timer_Queue/Custom_Handler.cpp +++ b/ACE/examples/Timer_Queue/Custom_Handler.cpp @@ -19,7 +19,7 @@ Custom_Handler::Custom_Handler(const ACE_Time_Value &expiration_time) { } -Custom_Handler::~Custom_Handler (void) +Custom_Handler::~Custom_Handler () { } diff --git a/ACE/examples/Timer_Queue/Custom_Handler.h b/ACE/examples/Timer_Queue/Custom_Handler.h index e1454379314..3da0b1aab32 100644 --- a/ACE/examples/Timer_Queue/Custom_Handler.h +++ b/ACE/examples/Timer_Queue/Custom_Handler.h @@ -31,7 +31,7 @@ class Custom_Handler public: Custom_Handler (const ACE_Time_Value &expiration_time); - virtual ~Custom_Handler (void); + virtual ~Custom_Handler (); // Set the custom handler's id void set_id (int id); diff --git a/ACE/examples/Timer_Queue/Driver.cpp b/ACE/examples/Timer_Queue/Driver.cpp index 3b7ff955884..345a1fc68f1 100644 --- a/ACE/examples/Timer_Queue/Driver.cpp +++ b/ACE/examples/Timer_Queue/Driver.cpp @@ -33,7 +33,7 @@ Command<RECEIVER, ACTION>::Command (RECEIVER &recvr, // destructor template <class RECEIVER, class ACTION> -Command<RECEIVER, ACTION>::~Command (void) +Command<RECEIVER, ACTION>::~Command () { } @@ -48,12 +48,12 @@ Command<RECEIVER, ACTION>::execute (void *arg) // gets the next request from the user input. template <class TQ, class RECEIVER, class ACTION> -Timer_Queue_Test_Driver<TQ, RECEIVER, ACTION>::~Timer_Queue_Test_Driver (void) +Timer_Queue_Test_Driver<TQ, RECEIVER, ACTION>::~Timer_Queue_Test_Driver () { } template <class TQ, class RECEIVER, class ACTION> int -Timer_Queue_Test_Driver<TQ, RECEIVER, ACTION>::get_next_request (void) +Timer_Queue_Test_Driver<TQ, RECEIVER, ACTION>::get_next_request () { char buf[BUFSIZ]; @@ -73,7 +73,7 @@ Timer_Queue_Test_Driver<TQ, RECEIVER, ACTION>::get_next_request (void) // Runs the test. template <class TQ, class RECEIVER, class ACTION> int -Timer_Queue_Test_Driver<TQ, RECEIVER, ACTION>::run_test (void) +Timer_Queue_Test_Driver<TQ, RECEIVER, ACTION>::run_test () { this->init (); diff --git a/ACE/examples/Timer_Queue/Driver.h b/ACE/examples/Timer_Queue/Driver.h index 2a570dd8247..86bd29fe908 100644 --- a/ACE/examples/Timer_Queue/Driver.h +++ b/ACE/examples/Timer_Queue/Driver.h @@ -46,7 +46,7 @@ public: /// <action_> of the Command to <action>. Command (RECEIVER &recvr, ACTION action); - virtual ~Command (void); + virtual ~Command (); /// Invokes the method <action_> from the object <receiver_>. virtual int execute (void *arg); @@ -77,7 +77,7 @@ class Timer_Queue_Test_Driver { public: /// Default destructor - virtual ~Timer_Queue_Test_Driver (void); + virtual ~Timer_Queue_Test_Driver (); /// Breaks up the input string buffer into pieces and executes /// the appropriate method to handle that operation. @@ -88,11 +88,11 @@ public: * of the class should normally invoke this method. * Returns 0 when successful, or 0 otherwise. */ - virtual int run_test (void); + virtual int run_test (); /// This internal method gets the next request from the user. /// Returns -1 when user wants to exit. Returns 0 otherwise. - virtual int get_next_request (void); + virtual int get_next_request (); /** * Reads input from the user into the buffer <buf> with a maximum diff --git a/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp b/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp index 007fd06e849..6d668f9edc8 100644 --- a/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp +++ b/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp @@ -50,7 +50,7 @@ Input_Handler::Input_Handler (ACE_Timer_Queue *tq, } int -Input_Handler::done (void) +Input_Handler::done () { return this->done_; } @@ -127,19 +127,19 @@ Input_Handler::handle_input (ACE_HANDLE) return driver_.get_next_request (); } -Reactor_Timer_Queue_Test_Driver::Reactor_Timer_Queue_Test_Driver (void) +Reactor_Timer_Queue_Test_Driver::Reactor_Timer_Queue_Test_Driver () : thandler_ (&timer_queue_, *this) { } -Reactor_Timer_Queue_Test_Driver::~Reactor_Timer_Queue_Test_Driver (void) +Reactor_Timer_Queue_Test_Driver::~Reactor_Timer_Queue_Test_Driver () { // unhook our timer queue ACE_Reactor::instance ()->timer_queue (0); } int -Reactor_Timer_Queue_Test_Driver::display_menu (void) +Reactor_Timer_Queue_Test_Driver::display_menu () { static char menu[] = "\n*****\n" @@ -156,7 +156,7 @@ Reactor_Timer_Queue_Test_Driver::display_menu (void) } int -Reactor_Timer_Queue_Test_Driver::init (void) +Reactor_Timer_Queue_Test_Driver::init () { typedef Command<Input_Handler, Input_Handler::ACTION> CMD; @@ -192,7 +192,7 @@ Reactor_Timer_Queue_Test_Driver::init (void) // run test was overrun due to the reactive way of handling input. int -Reactor_Timer_Queue_Test_Driver::run_test (void) +Reactor_Timer_Queue_Test_Driver::run_test () { ACE_DEBUG ((LM_DEBUG, "TIMER TEST STARTED\n")); diff --git a/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.h b/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.h index fc39a412a2c..33b74a1fb5c 100644 --- a/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.h +++ b/ACE/examples/Timer_Queue/Reactor_Timer_Queue_Test.h @@ -61,7 +61,7 @@ public: * exiting the program.A value of 0 indicates that we are NOT done, * 1 otherwise. */ - int done (void); + int done (); // = Hook methods to be called from <Reactor_Timer_Queue_Test_Driver> @@ -112,23 +112,23 @@ public: * methods are the common factored out code from other * implementations of timer queues. */ - Reactor_Timer_Queue_Test_Driver (void); + Reactor_Timer_Queue_Test_Driver (); /// Default destructor - virtual ~Reactor_Timer_Queue_Test_Driver (void); + virtual ~Reactor_Timer_Queue_Test_Driver (); /// Prints the menu of options. - virtual int display_menu (void); + virtual int display_menu (); /** * Sets the timer queue that the REACTOR will use; registers the * stdin input handler with the REACTOR and sets the <Command>s that * the <Timer_Queue_Test_Driver> will execute(). */ - virtual int init (void); + virtual int init (); /// Main entry point to the test driver implementation. - virtual int run_test (void); + virtual int run_test (); private: /// This is the stdin handler. diff --git a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.cpp b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.cpp index 43f8ab11b51..8f6bae445ad 100644 --- a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.cpp +++ b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.cpp @@ -35,7 +35,7 @@ Custom_Handler_Input_Task::Custom_Handler_Input_Task (Thread_Timer_Queue *queue, // user. int -Custom_Handler_Input_Task::svc (void) +Custom_Handler_Input_Task::svc () { for (;;) // call back to the driver's implementation on how to read and @@ -127,7 +127,7 @@ Custom_Handler_Input_Task::shutdown_timer (void *) } void -Custom_Handler_Input_Task::dump (void) +Custom_Handler_Input_Task::dump () { ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, this->queue_->mutex ()); @@ -145,24 +145,24 @@ Custom_Handler_Input_Task::dump (void) // constructor -Thread_Timer_Queue_Custom_Handler_Test::Thread_Timer_Queue_Custom_Handler_Test (void) +Thread_Timer_Queue_Custom_Handler_Test::Thread_Timer_Queue_Custom_Handler_Test () : input_task_ (&timer_queue_, *this) { } -Thread_Timer_Queue_Custom_Handler_Test::~Thread_Timer_Queue_Custom_Handler_Test (void) +Thread_Timer_Queue_Custom_Handler_Test::~Thread_Timer_Queue_Custom_Handler_Test () { } int -Thread_Timer_Queue_Custom_Handler_Test::run_test (void) +Thread_Timer_Queue_Custom_Handler_Test::run_test () { this->init (); return 0; } int -Thread_Timer_Queue_Custom_Handler_Test::display_menu (void) +Thread_Timer_Queue_Custom_Handler_Test::display_menu () { static char menu[] = "Usage:\n" @@ -178,7 +178,7 @@ Thread_Timer_Queue_Custom_Handler_Test::display_menu (void) } int -Thread_Timer_Queue_Custom_Handler_Test::init (void) +Thread_Timer_Queue_Custom_Handler_Test::init () { typedef Command<Custom_Handler_Input_Task, Custom_Handler_Input_Task::ACTION> CMD; diff --git a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.h b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.h index 6a357be66c9..452543671f9 100644 --- a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.h +++ b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.h @@ -81,7 +81,7 @@ public: int shutdown_timer (void *); /// Dump the state of the timer queue. - void dump (void); + void dump (); private: /// The timer queue implementation. @@ -108,12 +108,12 @@ private: class ACE_Svc_Export Thread_Timer_Queue_Custom_Handler_Test : public Timer_Queue_Test_Driver <Thread_Timer_Queue, Custom_Handler_Input_Task, Custom_Handler_Input_Task::ACTION> { public: - Thread_Timer_Queue_Custom_Handler_Test (void); - ~Thread_Timer_Queue_Custom_Handler_Test (void); + Thread_Timer_Queue_Custom_Handler_Test (); + ~Thread_Timer_Queue_Custom_Handler_Test (); - virtual int display_menu (void); - virtual int init (void); - virtual int run_test (void); + virtual int display_menu (); + virtual int init (); + virtual int run_test (); private: /// Subclassed from ACE_Task. diff --git a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp index 8af8cfdccf5..5c238e99af1 100644 --- a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp +++ b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp @@ -30,7 +30,7 @@ Handler::Handler(const ACE_Time_Value &expiration_time) { } -Handler::~Handler (void) +Handler::~Handler () { } @@ -75,7 +75,7 @@ Input_Task::Input_Task (Thread_Timer_Queue *queue, // user. int -Input_Task::svc (void) +Input_Task::svc () { for (;;) // call back to the driver's implementation on how to read and @@ -167,7 +167,7 @@ Input_Task::shutdown_timer (void *) } void -Input_Task::dump (void) +Input_Task::dump () { ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, this->queue_->mutex ()); @@ -185,24 +185,24 @@ Input_Task::dump (void) // constructor -Thread_Timer_Queue_Test_Driver::Thread_Timer_Queue_Test_Driver (void) +Thread_Timer_Queue_Test_Driver::Thread_Timer_Queue_Test_Driver () : input_task_ (&timer_queue_, *this) { } -Thread_Timer_Queue_Test_Driver::~Thread_Timer_Queue_Test_Driver (void) +Thread_Timer_Queue_Test_Driver::~Thread_Timer_Queue_Test_Driver () { } int -Thread_Timer_Queue_Test_Driver::run_test (void) +Thread_Timer_Queue_Test_Driver::run_test () { this->init (); return 0; } int -Thread_Timer_Queue_Test_Driver::display_menu (void) +Thread_Timer_Queue_Test_Driver::display_menu () { static char menu[] = "Usage:\n" @@ -218,7 +218,7 @@ Thread_Timer_Queue_Test_Driver::display_menu (void) } int -Thread_Timer_Queue_Test_Driver::init (void) +Thread_Timer_Queue_Test_Driver::init () { typedef Command<Input_Task, Input_Task::ACTION> CMD; diff --git a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.h b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.h index 10e8443ad8c..abdabe082a2 100644 --- a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.h +++ b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.h @@ -83,7 +83,7 @@ public: int shutdown_timer (void *); /// Dump the state of the timer queue. - void dump (void); + void dump (); private: /// The timer queue implementation. @@ -110,12 +110,12 @@ private: class ACE_Svc_Export Thread_Timer_Queue_Test_Driver : public Timer_Queue_Test_Driver <Thread_Timer_Queue, Input_Task, Input_Task::ACTION> { public: - Thread_Timer_Queue_Test_Driver (void); - ~Thread_Timer_Queue_Test_Driver (void); + Thread_Timer_Queue_Test_Driver (); + ~Thread_Timer_Queue_Test_Driver (); - virtual int display_menu (void); - virtual int init (void); - virtual int run_test (void); + virtual int display_menu (); + virtual int init (); + virtual int run_test (); private: /// Subclassed from ACE_Task. @@ -134,7 +134,7 @@ class Handler : public ACE_Event_Handler { public: Handler (const ACE_Time_Value &expiration_time); - ~Handler (void); + ~Handler (); /// Store an "id" for the Handler, which is only use to print better /// messages. diff --git a/ACE/examples/Web_Crawler/Command_Processor.cpp b/ACE/examples/Web_Crawler/Command_Processor.cpp index e2f59ebd460..e629a4a0ded 100644 --- a/ACE/examples/Web_Crawler/Command_Processor.cpp +++ b/ACE/examples/Web_Crawler/Command_Processor.cpp @@ -6,7 +6,7 @@ #include "URL_Visitor.h" -Command::~Command (void) +Command::~Command () { } @@ -16,7 +16,7 @@ URL_Command::URL_Command (URL *url) } int -URL_Command::execute (void) +URL_Command::execute () { ACE_CString check_string (ACE_TEXT_ALWAYS_CHAR (this->url_->url_addr ().get_path_name ())); @@ -54,28 +54,28 @@ URL_Command::execute (void) } int -URL_Command::destroy (void) +URL_Command::destroy () { delete this; return 0; } -Command_Processor::Command_Processor (void) +Command_Processor::Command_Processor () { } -Command_Processor::~Command_Processor (void) +Command_Processor::~Command_Processor () { } int -Command_Processor::destroy (void) +Command_Processor::destroy () { delete this; return 0; } int -Command_Processor::execute (void) +Command_Processor::execute () { Command *command; while (this->url_queue_.is_empty () != 1) diff --git a/ACE/examples/Web_Crawler/Command_Processor.h b/ACE/examples/Web_Crawler/Command_Processor.h index d0d8cd8860a..f6bff11ff74 100644 --- a/ACE/examples/Web_Crawler/Command_Processor.h +++ b/ACE/examples/Web_Crawler/Command_Processor.h @@ -33,7 +33,7 @@ class Command { public: /// Virtual destructor. - virtual ~Command (void); + virtual ~Command (); /// This is the entry point to execute the command. virtual int execute (void) = 0; @@ -54,10 +54,10 @@ public: URL_Command (URL *); /// Execute the URL command. - virtual int execute (void); + virtual int execute (); /// Commit suicide. - int destroy (void); + int destroy (); private: /// Pointer to the URL. URL *url_; @@ -73,20 +73,20 @@ private: class Command_Processor { public: - Command_Processor (void); + Command_Processor (); /// Insert a new <Command> into the <Command_Processor>'s queue. int insert (Command *); /// Execute all the <Commands> in the queue. - int execute (void); + int execute (); /// Destroy the <Command_Processor>. - int destroy (void); + int destroy (); protected: /// Ensure dynamic allocation. - ~Command_Processor (void); + ~Command_Processor (); private: // @@ You fill in here... diff --git a/ACE/examples/Web_Crawler/HTTP_URL.cpp b/ACE/examples/Web_Crawler/HTTP_URL.cpp index f146ac108e1..3a0206d04f8 100644 --- a/ACE/examples/Web_Crawler/HTTP_URL.cpp +++ b/ACE/examples/Web_Crawler/HTTP_URL.cpp @@ -21,7 +21,7 @@ HTTP_URL::HTTP_URL (const ACE_URL_Addr &url_addr, } ssize_t -HTTP_URL::send_request (void) +HTTP_URL::send_request () { size_t commandsize = ACE_OS::strlen (this->url_addr ().get_path_name ()) @@ -76,7 +76,7 @@ HTTP_URL::accept (URL_Visitor *visitor) } int -HTTP_URL::destroy (void) +HTTP_URL::destroy () { delete this; return 0; diff --git a/ACE/examples/Web_Crawler/HTTP_URL.h b/ACE/examples/Web_Crawler/HTTP_URL.h index 87ab46b56a5..817a5f1119e 100644 --- a/ACE/examples/Web_Crawler/HTTP_URL.h +++ b/ACE/examples/Web_Crawler/HTTP_URL.h @@ -47,13 +47,13 @@ public: /// Send a <GET> command to fetch the contents in the URI from the /// server. - virtual ssize_t send_request (void); + virtual ssize_t send_request (); /// Returns the URL that we represent. virtual const ACE_URL_Addr &url_addr () const; /// Commit suicide - int destroy (void); + int destroy (); private: /// Address of the URL we're connected to. ACE_URL_Addr url_addr_; diff --git a/ACE/examples/Web_Crawler/Iterators.cpp b/ACE/examples/Web_Crawler/Iterators.cpp index 67485251b98..d5edd7a5f12 100644 --- a/ACE/examples/Web_Crawler/Iterators.cpp +++ b/ACE/examples/Web_Crawler/Iterators.cpp @@ -2,12 +2,12 @@ #include "Options.h" #include "Iterators.h" -URL_Iterator::~URL_Iterator (void) +URL_Iterator::~URL_Iterator () { } int -URL_Iterator::destroy (void) +URL_Iterator::destroy () { // Commit suicide. delete this; diff --git a/ACE/examples/Web_Crawler/Iterators.h b/ACE/examples/Web_Crawler/Iterators.h index 936af00cc4d..a799f97f286 100644 --- a/ACE/examples/Web_Crawler/Iterators.h +++ b/ACE/examples/Web_Crawler/Iterators.h @@ -32,7 +32,7 @@ class URL_Iterator { public: /// "virtual" destructor. - virtual int destroy (void); + virtual int destroy (); // = Iterator methods. /// Pass back the next <string> that hasn't been seen yet. Returns 0 @@ -41,7 +41,7 @@ public: protected: /// C++ destructor. - virtual ~URL_Iterator (void); + virtual ~URL_Iterator (); }; /** diff --git a/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp b/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp index 1f5b68164ea..47a0f54e1f2 100644 --- a/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp +++ b/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp @@ -6,7 +6,7 @@ ACE_SOCK_Stream & -Mem_Map_Stream::stream (void) +Mem_Map_Stream::stream () { return svc_handler_->peer (); } @@ -24,7 +24,7 @@ Mem_Map_Stream::eof () const } int -Mem_Map_Stream::get_char (void) +Mem_Map_Stream::get_char () { if (this->eof () && this->grow_file_and_remap () == -1) return EOF; @@ -33,7 +33,7 @@ Mem_Map_Stream::get_char (void) } int -Mem_Map_Stream::rewind (void) +Mem_Map_Stream::rewind () { this->recv_pos_ = reinterpret_cast<char *> (this->mem_map_.addr ()); @@ -126,7 +126,7 @@ Mem_Map_Stream::seek (ACE_OFF_T offset, int whence) } Mem_Map_Stream::Svc_Handler * -Mem_Map_Stream::svc_handler (void) +Mem_Map_Stream::svc_handler () { return this->svc_handler_; } @@ -179,7 +179,7 @@ Mem_Map_Stream::open (STRAT_CONNECTOR *connector, } int -Mem_Map_Stream::grow_file_and_remap (void) +Mem_Map_Stream::grow_file_and_remap () { char buf[BUFSIZ + 1]; @@ -230,7 +230,7 @@ Mem_Map_Stream::grow_file_and_remap (void) return 0; } -Mem_Map_Stream::~Mem_Map_Stream (void) +Mem_Map_Stream::~Mem_Map_Stream () { // Remove the mapping and the file. this->mem_map_.remove (); diff --git a/ACE/examples/Web_Crawler/Mem_Map_Stream.h b/ACE/examples/Web_Crawler/Mem_Map_Stream.h index 2089256f3d8..f2e9195ce61 100644 --- a/ACE/examples/Web_Crawler/Mem_Map_Stream.h +++ b/ACE/examples/Web_Crawler/Mem_Map_Stream.h @@ -57,18 +57,18 @@ public: ACE_SOCK_CONNECTOR> STRAT_CONNECTOR; - // Mem_Map_Stream (void); + // Mem_Map_Stream (); // constructor added:KIRTHIKA /// Initialize this object. virtual int open (STRAT_CONNECTOR *connector, const ACE_INET_Addr &); /// Destructor. - virtual ~Mem_Map_Stream (void); + virtual ~Mem_Map_Stream (); // = Accessor. /// Returns the underlying <ACE_SOCK_Stream>. - ACE_SOCK_Stream &stream (void); + ACE_SOCK_Stream &stream (); // = I/O methods. @@ -83,7 +83,7 @@ public: * position. Returns EOF when the <get> position reaches the end of * the HTTP stream. */ - virtual int get_char (void); + virtual int get_char (); /** * Returns a pointer to array of at most <len> characters starting @@ -108,7 +108,7 @@ public: * stream. This works since all the data has been cached in the * memory-mapped backing store. */ - virtual int rewind (void); + virtual int rewind (); /** * Returns the nth character <offset> from the <get> position in the @@ -154,7 +154,7 @@ public: ACE_SYNCH_NULL_MUTEX> CACHED_CONNECT_STRATEGY;*/ - Svc_Handler *svc_handler (void); + Svc_Handler *svc_handler (); private: /** @@ -162,7 +162,7 @@ private: * extend the mapping to cover this chunk. Returns -1 on failure or * EOF, else 0. */ - int grow_file_and_remap (void); + int grow_file_and_remap (); //ACE_SOCK_Stream stream_; diff --git a/ACE/examples/Web_Crawler/Options.cpp b/ACE/examples/Web_Crawler/Options.cpp index 34d1cf47ef0..824b4b784db 100644 --- a/ACE/examples/Web_Crawler/Options.cpp +++ b/ACE/examples/Web_Crawler/Options.cpp @@ -172,7 +172,7 @@ Options::visitor (URL_Visitor *v) } int -Options::handle_limit (void) +Options::handle_limit () { return this->handle_limit_; } diff --git a/ACE/examples/Web_Crawler/Options.h b/ACE/examples/Web_Crawler/Options.h index 7a8b9f02f48..c4b1537f0e4 100644 --- a/ACE/examples/Web_Crawler/Options.h +++ b/ACE/examples/Web_Crawler/Options.h @@ -76,7 +76,7 @@ public: void visitor (URL_Visitor *); // Get the handle_limit. - int handle_limit (void); + int handle_limit (); private: /// Are we recursving. int recurse_; diff --git a/ACE/examples/Web_Crawler/URL.cpp b/ACE/examples/Web_Crawler/URL.cpp index 69a36d6acbb..c9eb6fd7382 100644 --- a/ACE/examples/Web_Crawler/URL.cpp +++ b/ACE/examples/Web_Crawler/URL.cpp @@ -2,17 +2,17 @@ Mem_Map_Stream & -URL::stream (void) +URL::stream () { return this->stream_; } -URL::~URL (void) +URL::~URL () { } const URL_Status & -URL::reply_status (void) +URL::reply_status () { return this->reply_status_; } @@ -24,7 +24,7 @@ URL::reply_status (const URL_Status &rs) } const ACE_CString & -URL::content_type (void) +URL::content_type () { return this->content_type_; } diff --git a/ACE/examples/Web_Crawler/URL.h b/ACE/examples/Web_Crawler/URL.h index 529747dd89d..9d6c517bd82 100644 --- a/ACE/examples/Web_Crawler/URL.h +++ b/ACE/examples/Web_Crawler/URL.h @@ -38,7 +38,7 @@ class URL { public: /// Destructor. - virtual ~URL (void); + virtual ~URL (); /** * Accept the visitor, which will then perform a particular @@ -55,14 +55,14 @@ public: virtual const ACE_URL_Addr &url_addr () const = 0; /// Returns the <Mem_Map_Stream>. - virtual Mem_Map_Stream &stream (void); + virtual Mem_Map_Stream &stream (); // = Get/set the reply status. - virtual const URL_Status &reply_status (void); + virtual const URL_Status &reply_status (); virtual void reply_status (const URL_Status &); // = Get/set the reply status. - virtual const ACE_CString &content_type (void); + virtual const ACE_CString &content_type (); virtual void content_type (const ACE_CString &); diff --git a/ACE/examples/Web_Crawler/URL_Addr.cpp b/ACE/examples/Web_Crawler/URL_Addr.cpp index f7d92b2c13e..bf9e9d439eb 100644 --- a/ACE/examples/Web_Crawler/URL_Addr.cpp +++ b/ACE/examples/Web_Crawler/URL_Addr.cpp @@ -5,7 +5,7 @@ #include "ace/OS_NS_stdlib.h" #include "ace/OS_Memory.h" -ACE_URL_Addr::ACE_URL_Addr (void) +ACE_URL_Addr::ACE_URL_Addr () : path_name_ (0), addr_string_ (0), addr_string_len_ (0) @@ -210,7 +210,7 @@ ACE_URL_Addr::get_path_name () const return this->path_name_; } -ACE_URL_Addr::~ACE_URL_Addr (void) +ACE_URL_Addr::~ACE_URL_Addr () { ACE_OS::free (reinterpret_cast<void *> (const_cast<ACE_TCHAR *> (this->path_name_))); @@ -220,7 +220,7 @@ ACE_URL_Addr::~ACE_URL_Addr (void) } int -ACE_URL_Addr::destroy (void) +ACE_URL_Addr::destroy () { // Commit suicide. delete this; diff --git a/ACE/examples/Web_Crawler/URL_Addr.h b/ACE/examples/Web_Crawler/URL_Addr.h index 565b1d068e7..2b27dd181df 100644 --- a/ACE/examples/Web_Crawler/URL_Addr.h +++ b/ACE/examples/Web_Crawler/URL_Addr.h @@ -30,7 +30,7 @@ class ACE_URL_Addr : public ACE_INET_Addr { public: /// Constructor. - ACE_URL_Addr (void); + ACE_URL_Addr (); ACE_URL_Addr (const ACE_TCHAR *host_name, const ACE_TCHAR *path_name, @@ -82,7 +82,7 @@ public: void operator= (const ACE_URL_Addr &addr); /// Destructor. - ~ACE_URL_Addr (void); + ~ACE_URL_Addr (); /** * Compare two addresses for equality. The addresses are considered @@ -101,7 +101,7 @@ public: const ACE_TCHAR *get_path_name () const; /// Commit suicide. - int destroy (void); + int destroy (); private: /// Our path name. ACE_TCHAR *path_name_; diff --git a/ACE/examples/Web_Crawler/URL_Status.cpp b/ACE/examples/Web_Crawler/URL_Status.cpp index c58153b7ce7..6ccb29c422a 100644 --- a/ACE/examples/Web_Crawler/URL_Status.cpp +++ b/ACE/examples/Web_Crawler/URL_Status.cpp @@ -30,7 +30,7 @@ URL_Status::status (URL_Status::STATUS_CODE s) this->status_ = s; } -int URL_Status::destroy (void) +int URL_Status::destroy () { delete this; return 0; diff --git a/ACE/examples/Web_Crawler/URL_Status.h b/ACE/examples/Web_Crawler/URL_Status.h index 08760a3ee27..a9054470b37 100644 --- a/ACE/examples/Web_Crawler/URL_Status.h +++ b/ACE/examples/Web_Crawler/URL_Status.h @@ -50,7 +50,7 @@ public: STATUS_CODE status () const; void status (int); void status (STATUS_CODE); - int destroy (void); + int destroy (); private: STATUS_CODE status_; }; diff --git a/ACE/examples/Web_Crawler/URL_Visitor.cpp b/ACE/examples/Web_Crawler/URL_Visitor.cpp index bf6ef871193..8f6ed5af3e0 100644 --- a/ACE/examples/Web_Crawler/URL_Visitor.cpp +++ b/ACE/examples/Web_Crawler/URL_Visitor.cpp @@ -11,12 +11,12 @@ URL_Processing_Strategy::URL_Processing_Strategy (URL &url, { } -URL_Processing_Strategy::~URL_Processing_Strategy (void) +URL_Processing_Strategy::~URL_Processing_Strategy () { } int -URL_Processing_Strategy::destroy (void) +URL_Processing_Strategy::destroy () { // Commit suicide. delete this; @@ -30,7 +30,7 @@ URL_Download_Strategy::URL_Download_Strategy (URL &url, } int -URL_Download_Strategy::execute (void) +URL_Download_Strategy::execute () { ACE_CString buffer; @@ -51,7 +51,7 @@ HTTP_Header_Processing_Strategy::HTTP_Header_Processing_Strategy (URL &url, } int -HTTP_Header_Processing_Strategy::execute (void) +HTTP_Header_Processing_Strategy::execute () { // Set the get() position.Necessary since later a peek is done. if (this->url_.stream ().get_char () == 0) @@ -106,7 +106,7 @@ HTML_Body_Validation_Strategy::HTML_Body_Validation_Strategy (URL &url, } int -HTML_Body_Validation_Strategy::execute (void) +HTML_Body_Validation_Strategy::execute () { char host_name_buf[BUFSIZ + 1]; ACE_CString host_name (host_name_buf); @@ -184,7 +184,7 @@ HTML_Body_Validation_Strategy::execute (void) } URL_Iterator * -URL_Validation_Visitation_Strategy_Factory::make_header_iterator (void) +URL_Validation_Visitation_Strategy_Factory::make_header_iterator () { URL_Iterator *i; ACE_NEW_RETURN (i, @@ -194,7 +194,7 @@ URL_Validation_Visitation_Strategy_Factory::make_header_iterator (void) } URL_Iterator * -URL_Validation_Visitation_Strategy_Factory::make_body_iterator (void) +URL_Validation_Visitation_Strategy_Factory::make_body_iterator () { URL_Iterator *i; ACE_NEW_RETURN (i, @@ -227,18 +227,18 @@ URL_Validation_Visitation_Strategy_Factory::make_body_strategy (URL_Iterator &it } int -URL_Validation_Visitation_Strategy_Factory::destroy (void) +URL_Validation_Visitation_Strategy_Factory::destroy () { // Commit suicide. delete this; return 0; } -URL_Visitor::~URL_Visitor (void) +URL_Visitor::~URL_Visitor () { } -URL_Validation_Visitor::URL_Validation_Visitor (void) +URL_Validation_Visitor::URL_Validation_Visitor () { ACE_NEW (this->caching_connect_strategy_, CACHED_CONNECT_STRATEGY (this->caching_strategy_)); @@ -254,7 +254,7 @@ URL_Validation_Visitor::URL_Validation_Visitor (void) } -URL_Validation_Visitor::~URL_Validation_Visitor (void) +URL_Validation_Visitor::~URL_Validation_Visitor () { this->strat_connector_ = 0; if (this->caching_connect_strategy_ != 0) @@ -262,7 +262,7 @@ URL_Validation_Visitor::~URL_Validation_Visitor (void) } URL_Validation_Visitor::URL_CACHE & -URL_Validation_Visitor::url_cache (void) +URL_Validation_Visitor::url_cache () { return this->url_cache_; } @@ -329,7 +329,7 @@ URL_Validation_Visitor::make_visitation_strategy_factory (URL &url) } int -URL_Validation_Visitor::destroy (void) +URL_Validation_Visitor::destroy () { delete this->strat_connector_; // Commit suicide. @@ -412,7 +412,7 @@ URL_Validation_Visitor::visit (HTTP_URL &http_url) } int -URL_Download_Visitation_Strategy_Factory::destroy (void) +URL_Download_Visitation_Strategy_Factory::destroy () { // Commit suicide. delete this; @@ -420,13 +420,13 @@ URL_Download_Visitation_Strategy_Factory::destroy (void) } URL_Iterator * -URL_Download_Visitation_Strategy_Factory::make_header_iterator (void) +URL_Download_Visitation_Strategy_Factory::make_header_iterator () { return 0; } URL_Iterator * -URL_Download_Visitation_Strategy_Factory::make_body_iterator (void) +URL_Download_Visitation_Strategy_Factory::make_body_iterator () { URL_Iterator *i; ACE_NEW_RETURN (i, @@ -460,7 +460,7 @@ URL_Visitation_Strategy_Factory::URL_Visitation_Strategy_Factory (URL *url) { } -URL_Visitation_Strategy_Factory::~URL_Visitation_Strategy_Factory (void) +URL_Visitation_Strategy_Factory::~URL_Visitation_Strategy_Factory () { } @@ -498,7 +498,7 @@ URL_Download_Visitor::make_visitation_strategy_factory (URL &url) } int -URL_Download_Visitor::destroy (void) +URL_Download_Visitor::destroy () { // Commit suicide. delete this; diff --git a/ACE/examples/Web_Crawler/URL_Visitor.h b/ACE/examples/Web_Crawler/URL_Visitor.h index 2e4f816a2bc..88fcd023325 100644 --- a/ACE/examples/Web_Crawler/URL_Visitor.h +++ b/ACE/examples/Web_Crawler/URL_Visitor.h @@ -42,12 +42,12 @@ public: URL_Processing_Strategy (URL &, URL_Iterator &); - virtual ~URL_Processing_Strategy (void); + virtual ~URL_Processing_Strategy (); /// Perform the strategy. virtual int execute (void) = 0; - virtual int destroy (void); + virtual int destroy (); // Close down the resources. @@ -72,7 +72,7 @@ public: URL_Iterator &); /// Perform the strategy for processing an HTTP header. - virtual int execute (void); + virtual int execute (); }; /** @@ -96,7 +96,7 @@ public: * iterates over the HTML file and recursively visits embedded links * to process them, as well. */ - virtual int execute (void); + virtual int execute (); private: /// This is the context of the visit. @@ -118,7 +118,7 @@ public: URL_Iterator &); /// Perform the strategy for downloading a URL to a temporary file. - virtual int execute (void); + virtual int execute (); }; /** @@ -132,7 +132,7 @@ public: URL_Visitation_Strategy_Factory (URL *); /// Destructor. - virtual ~URL_Visitation_Strategy_Factory (void); + virtual ~URL_Visitation_Strategy_Factory (); // = Factory Methods. /// Factory Method that makes the header iterator. @@ -168,10 +168,10 @@ public: // = Factory Methods. /// Factory Method that makes an <HTTP_Header_Iterator>. - virtual URL_Iterator *make_header_iterator (void); + virtual URL_Iterator *make_header_iterator (); /// Factory Method that makes an <HTML_Body_Iterator>. - virtual URL_Iterator *make_body_iterator (void); + virtual URL_Iterator *make_body_iterator (); /// Factory Method that makes the header processing strategy. virtual URL_Processing_Strategy *make_header_strategy (URL_Iterator &); @@ -180,7 +180,7 @@ public: virtual URL_Processing_Strategy *make_body_strategy (URL_Iterator &); /// Close down the resources. - virtual int destroy (void); + virtual int destroy (); }; /** @@ -197,10 +197,10 @@ public: // = Factory Methods. /// Factory Method that makes an <HTTP_Header_Iterator>. - virtual URL_Iterator *make_header_iterator (void); + virtual URL_Iterator *make_header_iterator (); /// Factory Method that makes an <HTML_Body_Iterator>. - virtual URL_Iterator *make_body_iterator (void); + virtual URL_Iterator *make_body_iterator (); /// Factory Method that makes the header processing strategy. virtual URL_Processing_Strategy *make_header_strategy (URL_Iterator &); @@ -209,7 +209,7 @@ public: virtual URL_Processing_Strategy *make_body_strategy (URL_Iterator &); /// Close down the resources. - virtual int destroy (void); + virtual int destroy (); private: /// Context of the visitor. @@ -226,7 +226,7 @@ private: class URL_Visitor { public: - virtual ~URL_Visitor (void); + virtual ~URL_Visitor (); /// Visit an <HTTP_URL>. virtual int visit (HTTP_URL &http_url) = 0; @@ -310,16 +310,16 @@ public: // virtual int visit (FTP_URL &http_url); /// Cleanup the resources. - URL_Validation_Visitor (void); - virtual int destroy (void); + URL_Validation_Visitor (); + virtual int destroy (); /// Returns a reference to the URL cache. - URL_CACHE &url_cache (void); + URL_CACHE &url_cache (); protected: /// Factory Method that makes a /// <URL_Validation_Visitation_Strategy_Factory>. - virtual ~URL_Validation_Visitor (void); + virtual ~URL_Validation_Visitor (); virtual URL_Visitation_Strategy_Factory *make_visitation_strategy_factory (URL &); /// Cache the status of URLs we've already validated. @@ -364,7 +364,7 @@ public: // virtual int visit (FTP_URL &http_url); /// Cleanup the resources. - virtual int destroy (void); + virtual int destroy (); protected: /// Factory Method that makes a <URL_Download_Visitation_Strategy_Factory>. @@ -394,7 +394,7 @@ public: this->t_->destroy (); this->t_ = t; } - ~Auto_Destroyer (void) + ~Auto_Destroyer () { if (this->t_ != 0) t_->destroy (); diff --git a/ACE/examples/Web_Crawler/URL_Visitor_Factory.cpp b/ACE/examples/Web_Crawler/URL_Visitor_Factory.cpp index aadb46732d2..8978411ddea 100644 --- a/ACE/examples/Web_Crawler/URL_Visitor_Factory.cpp +++ b/ACE/examples/Web_Crawler/URL_Visitor_Factory.cpp @@ -1,12 +1,12 @@ /* -*- C++ -*- */ #include "URL_Visitor_Factory.h" -URL_Visitor_Factory::~URL_Visitor_Factory (void) +URL_Visitor_Factory::~URL_Visitor_Factory () { } URL_Visitor * -URL_Validation_Visitor_Factory::make_visitor (void) +URL_Validation_Visitor_Factory::make_visitor () { URL_Visitor *v; @@ -18,7 +18,7 @@ URL_Validation_Visitor_Factory::make_visitor (void) } Command_Processor * -URL_Validation_Visitor_Factory::make_command_processor (void) +URL_Validation_Visitor_Factory::make_command_processor () { Command_Processor *cp; @@ -29,7 +29,7 @@ URL_Validation_Visitor_Factory::make_command_processor (void) } URL_Visitor * -URL_Download_Visitor_Factory::make_visitor (void) +URL_Download_Visitor_Factory::make_visitor () { URL_Visitor *v; @@ -40,7 +40,7 @@ URL_Download_Visitor_Factory::make_visitor (void) } Command_Processor * -URL_Download_Visitor_Factory::make_command_processor (void) +URL_Download_Visitor_Factory::make_command_processor () { return 0; } diff --git a/ACE/examples/Web_Crawler/URL_Visitor_Factory.h b/ACE/examples/Web_Crawler/URL_Visitor_Factory.h index 5bfd1834b53..af0d48a8317 100644 --- a/ACE/examples/Web_Crawler/URL_Visitor_Factory.h +++ b/ACE/examples/Web_Crawler/URL_Visitor_Factory.h @@ -31,7 +31,7 @@ class URL_Visitor_Factory { public: /// Destructor. - virtual ~URL_Visitor_Factory (void); + virtual ~URL_Visitor_Factory (); /// Factory Method that makes the appropriate type of <URL_Visitor>. virtual URL_Visitor *make_visitor (void) = 0; @@ -50,10 +50,10 @@ class URL_Validation_Visitor_Factory : public URL_Visitor_Factory { public: /// Factory Method that makes a <URL_Validation_Visitor>. - virtual URL_Visitor *make_visitor (void); + virtual URL_Visitor *make_visitor (); /// Factory Method that makes a <FIFO_Command_Processor>. - virtual Command_Processor *make_command_processor (void); + virtual Command_Processor *make_command_processor (); }; /** @@ -65,10 +65,10 @@ class URL_Download_Visitor_Factory : public URL_Visitor_Factory { public: /// Factory Method that makes a <URL_Download_Visitor>. - virtual URL_Visitor *make_visitor (void); + virtual URL_Visitor *make_visitor (); /// Factory Method that makes a <FIFO_Command_Processor>. - virtual Command_Processor *make_command_processor (void); + virtual Command_Processor *make_command_processor (); }; #endif /* _URL_VISITOR_FACTORY_H */ diff --git a/ACE/examples/Web_Crawler/Web_Crawler.cpp b/ACE/examples/Web_Crawler/Web_Crawler.cpp index 9a6f06fa5a4..29a6ad3ed9f 100644 --- a/ACE/examples/Web_Crawler/Web_Crawler.cpp +++ b/ACE/examples/Web_Crawler/Web_Crawler.cpp @@ -3,12 +3,12 @@ #include "Web_Crawler.h" -Web_Crawler::~Web_Crawler (void) +Web_Crawler::~Web_Crawler () { delete this->url_visitor_factory_; } -Web_Crawler::Web_Crawler (void) +Web_Crawler::Web_Crawler () : url_visitor_factory_ (0) { } @@ -30,7 +30,7 @@ Web_Crawler::open (int argc, ACE_TCHAR *argv[]) } int -Web_Crawler::run (void) +Web_Crawler::run () { // Make the appropriate <URL_Visitor>. Auto_Destroyer<URL_Visitor> visitor (this->url_visitor_factory_->make_visitor ()); diff --git a/ACE/examples/Web_Crawler/Web_Crawler.h b/ACE/examples/Web_Crawler/Web_Crawler.h index b799cc151cf..a63ba252d75 100644 --- a/ACE/examples/Web_Crawler/Web_Crawler.h +++ b/ACE/examples/Web_Crawler/Web_Crawler.h @@ -35,10 +35,10 @@ class Web_Crawler { public: /// Constructor. - Web_Crawler (void); + Web_Crawler (); /// Destructor. - ~Web_Crawler (void); + ~Web_Crawler (); /// Parses the command-line options and initializes the /// <URL_Visitor_Factory>. @@ -46,7 +46,7 @@ public: /// Run the Web Crawler and carries out whatever visitation strategy /// is configured. Returns -1 on failure and 0 on success. - int run (void); + int run (); private: /** |