summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/AVStreams
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/tests/AVStreams')
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp22
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h21
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp10
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h11
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp12
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h11
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp9
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h6
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp13
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h14
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp13
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h15
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp21
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h18
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp31
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h32
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp25
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h24
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp28
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h21
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp33
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h22
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp22
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h22
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Latency/control.cpp1
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp13
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Latency/ping.h13
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp16
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Latency/pong.h13
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp10
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h11
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp10
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h6
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp19
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h16
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp18
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast/server.h12
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp24
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h22
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp18
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h18
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp11
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h13
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp10
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h9
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp22
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h21
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp10
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable/server.h8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp13
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h9
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp7
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h6
-rw-r--r--TAO/orbsvcs/tests/AVStreams/README2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp12
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h13
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp9
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h9
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp5
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h4
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp1
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.h2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.inl2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp11
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h13
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp7
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h7
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp10
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h9
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp9
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h6
73 files changed, 427 insertions, 555 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
index e04a1d22fcd..8627d18ee88 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
@@ -1,10 +1,10 @@
#include "Connection_Manager.h"
-Connection_Manager::Connection_Manager (void)
+Connection_Manager::Connection_Manager ()
{
}
-Connection_Manager::~Connection_Manager (void)
+Connection_Manager::~Connection_Manager ()
{
}
@@ -214,7 +214,7 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
}
void
-Connection_Manager::find_receivers (void)
+Connection_Manager::find_receivers ()
{
CosNaming::BindingIterator_var iterator;
CosNaming::BindingList_var binding_list;
@@ -464,7 +464,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
}
void
-Connection_Manager::connect_to_sender (void)
+Connection_Manager::connect_to_sender ()
{
if (CORBA::is_nil (this->sender_.in ()))
return;
@@ -570,9 +570,8 @@ Connection_Manager::add_streamctrl (const ACE_CString &flowname,
if( streamctrl_any.in() >>= streamctrl )
{
// Any still owns the pointer, so we duplicate it
- AVStreams::StreamCtrl::_duplicate( streamctrl );
- this->streamctrls_.bind (flowname,
- streamctrl);
+ AVStreams::StreamCtrl::_duplicate( streamctrl);
+ this->streamctrls_.bind (flowname, streamctrl);
}
}
@@ -582,24 +581,23 @@ Connection_Manager::destroy (const ACE_CString &flowname)
this->protocol_objects_.unbind (flowname);
this->receivers_.unbind (flowname);
- this->streamctrls_.unbind (flowname );
-
+ this->streamctrls_.unbind (flowname);
}
Connection_Manager::Receivers &
-Connection_Manager::receivers (void)
+Connection_Manager::receivers ()
{
return this->receivers_;
}
Connection_Manager::Protocol_Objects &
-Connection_Manager::protocol_objects (void)
+Connection_Manager::protocol_objects ()
{
return this->protocol_objects_;
}
Connection_Manager::StreamCtrls &
-Connection_Manager::streamctrls (void)
+Connection_Manager::streamctrls ()
{
return this->streamctrls_;
}
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
index 654488b0b08..1db47f8201c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
@@ -36,12 +36,11 @@ class Endpoint_Addresses
class Connection_Manager
{
public:
-
/// Constructor
- Connection_Manager (void);
+ Connection_Manager ();
/// Destructor
- ~Connection_Manager (void);
+ ~Connection_Manager ();
/// Initialize this class.
int init (CORBA::ORB_ptr orb);
@@ -60,10 +59,10 @@ public:
AVStreams::MMDevice_ptr receiver);
/// Connect to the sender that we found.
- void connect_to_sender (void);
+ void connect_to_sender ();
/// Destroy all streams.
- void destroy (void);
+ void destroy ();
/// Destroy streams associated with <flowname>.
void destroy (const ACE_CString &flowname);
@@ -85,7 +84,6 @@ public:
Protocol_Objects;
-
// Map of streamctrl.
typedef ACE_Hash_Map_Manager<ACE_CString,
AVStreams::StreamCtrl_var,
@@ -99,17 +97,14 @@ public:
EP_Addr;
// Map accessors.
- Receivers &receivers (void);
- Protocol_Objects &protocol_objects (void);
- StreamCtrls &streamctrls (void);
+ Receivers &receivers ();
+ Protocol_Objects &protocol_objects ();
+ StreamCtrls &streamctrls ();
void load_ep_addr (const char* file_name);
protected:
-
-
-
- void find_receivers (void);
+ void find_receivers ();
void add_to_receivers (CosNaming::BindingList &binding_list);
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
index 167b84ac85e..1f3f044273f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
@@ -41,7 +41,7 @@ Distributer_Receiver_StreamEndPoint::get_callback (const char *,
return 0;
}
-Distributer_Receiver_Callback::Distributer_Receiver_Callback (void)
+Distributer_Receiver_Callback::Distributer_Receiver_Callback ()
: frame_count_ (1)
{
}
@@ -79,7 +79,7 @@ Distributer_Receiver_Callback::receive_frame (ACE_Message_Block *frame,
}
int
-Distributer_Receiver_Callback::handle_destroy (void)
+Distributer_Receiver_Callback::handle_destroy ()
{
ACE_DEBUG ((LM_DEBUG,
"Distributer_Callback::end_stream\n"));
@@ -90,7 +90,7 @@ Distributer_Receiver_Callback::handle_destroy (void)
return 0;
}
-Distributer::Distributer (void)
+Distributer::Distributer ()
: sender_name_ ("sender")
, distributer_name_ ("distributer")
, done_ (0)
@@ -98,12 +98,12 @@ Distributer::Distributer (void)
{
}
-Distributer::~Distributer (void)
+Distributer::~Distributer ()
{
}
Connection_Manager &
-Distributer::connection_manager (void)
+Distributer::connection_manager ()
{
return this->connection_manager_;
}
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
index 687d48db000..9d3ffed6471 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
@@ -27,9 +27,8 @@
class Distributer_Receiver_Callback : public TAO_AV_Callback
{
public:
-
/// Constructor.
- Distributer_Receiver_Callback (void);
+ Distributer_Receiver_Callback ();
// Method that is called when there is data to be received from a
// sender.
@@ -39,7 +38,7 @@ public:
// Called when the sender is done sending data and wants to close
// down the connection.
- int handle_destroy (void);
+ int handle_destroy ();
private:
/// Count of the frames passing through us.
@@ -112,10 +111,10 @@ class Distributer
{
public:
/// Constructor
- Distributer (void);
+ Distributer ();
/// Destructor.
- ~Distributer (void);
+ ~Distributer ();
/// Initialize data components.
int init (int argc, ACE_TCHAR *argv[]);
@@ -128,7 +127,7 @@ public:
void done (int);
/// Accessor to connection manager.
- Connection_Manager &connection_manager (void);
+ Connection_Manager &connection_manager ();
protected:
/// Connection manager.
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
index 768ec577f22..607a97e84d1 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
@@ -17,7 +17,7 @@ Receiver_StreamEndPoint::get_callback (const char *,
return 0;
}
-Receiver_Callback::Receiver_Callback (void)
+Receiver_Callback::Receiver_Callback ()
: frame_count_ (1)
{
}
@@ -56,7 +56,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
}
int
-Receiver_Callback::handle_destroy (void)
+Receiver_Callback::handle_destroy ()
{
// Called when the distributer requests the stream to be shutdown.
ACE_DEBUG ((LM_DEBUG,
@@ -70,13 +70,12 @@ Receiver_Callback::handle_destroy (void)
{
ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
return -1;
-
}
return 0;
}
-Receiver::Receiver (void)
+Receiver::Receiver ()
: mmdevice_ (0),
output_file_name_ (ACE_TEXT ("output")),
addr_file_ (ACE_TEXT ("addr_file")),
@@ -85,7 +84,7 @@ Receiver::Receiver (void)
{
}
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
{
}
@@ -166,7 +165,7 @@ Receiver::parse_args (int argc, ACE_TCHAR *argv[])
}
ACE_TString
-Receiver::output_file_name (void)
+Receiver::output_file_name ()
{
return this->output_file_name_;
}
@@ -230,7 +229,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
// Hack for now....
ACE_OS::sleep (1);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
index 32dd67bdff7..863f5d6aafa 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
@@ -27,9 +27,8 @@
class Receiver_Callback : public TAO_AV_Callback
{
public:
-
/// Constructor.
- Receiver_Callback (void);
+ Receiver_Callback ();
// Method that is called when there is data to be received from a
// sender.
@@ -39,7 +38,7 @@ public:
// Called when the sender is done sending data and wants to close
// down the connection.
- int handle_destroy (void);
+ int handle_destroy ();
private:
/// Keeping a count of the incoming frames.
@@ -77,10 +76,10 @@ class Receiver
{
public:
/// Constructor
- Receiver (void);
+ Receiver ();
/// Destructor.
- ~Receiver (void);
+ ~Receiver ();
/// Initialize data components.
int init (int argc, ACE_TCHAR *argv[]);
@@ -89,7 +88,7 @@ public:
int parse_args (int argc, ACE_TCHAR *argv[]);
/// Name of the output file.
- ACE_TString output_file_name (void);
+ ACE_TString output_file_name ();
protected:
/// Connection manager.
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
index eda4570e7eb..8739741efa0 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
@@ -38,7 +38,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *flowname,
return 0;
}
-Sender::Sender (void)
+Sender::Sender ()
: sender_mmdevice_ (0),
frame_count_ (0),
filename_ (ACE_TEXT("input")),
@@ -101,7 +101,6 @@ Sender::init (int argc, ACE_TCHAR *argv[])
return result;
-
// Parse the command line arguments
result =
this->parse_args (argc, argv);
@@ -149,7 +148,7 @@ Sender::init (int argc, ACE_TCHAR *argv[])
// Method to send data at the specified rate
int
-Sender::pace_data (void)
+Sender::pace_data ()
{
// The time that should lapse between two consecutive frames sent.
ACE_Time_Value inter_frame_time;
@@ -257,7 +256,6 @@ Sender::pace_data (void)
// Reset the message block.
this->mb_.reset ();
-
} // end while
}
catch (const CORBA::Exception& ex)
@@ -269,7 +267,7 @@ Sender::pace_data (void)
}
Connection_Manager &
-Sender::connection_manager (void)
+Sender::connection_manager ()
{
return this->connection_manager_;
}
@@ -306,7 +304,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
"client::init failed\n"), -1);
SENDER::instance ()->pace_data ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
index 9c723e92832..15dc9543efa 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
@@ -58,17 +58,17 @@ class Sender
{
public:
/// Constructor
- Sender (void);
+ Sender ();
/// Method to initialize the various data components.
int init (int argc,
ACE_TCHAR **argv);
/// Method to pace and send data from a file.
- int pace_data (void);
+ int pace_data ();
/// Accessor to the connection manager.
- Connection_Manager &connection_manager (void);
+ Connection_Manager &connection_manager ();
private:
/// Method to parse the command line arguments.
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
index 87785bb6e65..c4a529fc542 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
@@ -33,7 +33,7 @@ Receiver_StreamEndPoint::set_protocol_object (const char * flowname,
return 0;
}
-Receiver_Callback::Receiver_Callback (void)
+Receiver_Callback::Receiver_Callback ()
: frame_count_ (1),
mb_ (BUFSIZ)
{
@@ -103,7 +103,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
}
int
-Receiver_Callback::handle_destroy (void)
+Receiver_Callback::handle_destroy ()
{
// Called when the distributer requests the stream to be shutdown.
ACE_DEBUG ((LM_DEBUG,
@@ -123,7 +123,6 @@ Receiver_Callback::handle_destroy (void)
ex._tao_print_exception (
"Receiver_Callback::handle_destroy Failed\n");
return -1;
-
}
}
@@ -131,7 +130,7 @@ Receiver_Callback::handle_destroy (void)
return 0;
}
-Receiver::Receiver (void)
+Receiver::Receiver ()
: mmdevice_ (0),
frame_rate_ (30),
input_file_ (0),
@@ -141,7 +140,7 @@ Receiver::Receiver (void)
{
}
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
{
}
@@ -246,13 +245,13 @@ Receiver::init (int argc,
}
TAO_AV_Protocol_Object*
-Receiver::protocol_object (void)
+Receiver::protocol_object ()
{
return this->protocol_object_;
}
FILE *
-Receiver::input_file (void)
+Receiver::input_file ()
{
return this->input_file_;
}
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
index cabbbcc2e92..e84bb472b2f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
@@ -28,9 +28,8 @@
class Receiver_Callback : public TAO_AV_Callback
{
public:
-
/// Constructor.
- Receiver_Callback (void);
+ Receiver_Callback ();
// Method that is called when there is data to be received from a
// sender.
@@ -40,7 +39,7 @@ public:
// Called when the sender is done sending data and wants to close
// down the connection.
- int handle_destroy (void);
+ int handle_destroy ();
private:
/// Keeping a count of the incoming frames.
@@ -87,10 +86,10 @@ class Receiver
{
public:
/// Constructor
- Receiver (void);
+ Receiver ();
/// Destructor.
- ~Receiver (void);
+ ~Receiver ();
/// Initialize data components.
int init (int argc,
@@ -100,9 +99,9 @@ public:
void protocol_object (TAO_AV_Protocol_Object *protocol_object);
/// Set the protocol object corresponding to the transport protocol chosen.
- TAO_AV_Protocol_Object * protocol_object (void);
+ TAO_AV_Protocol_Object * protocol_object ();
- FILE * input_file (void);
+ FILE * input_file ();
protected:
/// The Naming Service Client.
@@ -135,5 +134,4 @@ protected:
/// Message block into which data is read from a file and then sent.
ACE_Message_Block mb_;
-
};
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
index 4ab1e54dc56..0c607516030 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
@@ -33,7 +33,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *,
return 0;
}
-Sender_Callback::Sender_Callback (void)
+Sender_Callback::Sender_Callback ()
: frame_count_ (1)
{
}
@@ -73,7 +73,7 @@ Sender_Callback::receive_frame (ACE_Message_Block *frame,
return 0;
}
-Sender::Sender (void)
+Sender::Sender ()
: sender_mmdevice_ (0),
streamctrl_ (0),
frame_count_ (0),
@@ -95,13 +95,13 @@ Sender::protocol_object (TAO_AV_Protocol_Object *object)
}
int
-Sender::eof (void)
+Sender::eof ()
{
return this->eof_;
}
void
-Sender::shutdown (void)
+Sender::shutdown ()
{
try
{
@@ -152,7 +152,7 @@ Sender::parse_args (int argc,
// Method to get the object reference of the receiver
int
-Sender::bind_to_receiver (void)
+Sender::bind_to_receiver ()
{
CosNaming::Name name (1);
name.length (1);
@@ -282,7 +282,7 @@ Sender::init (int argc,
// Method to send data at the specified rate
int
-Sender::pace_data (void)
+Sender::pace_data ()
{
// The time that should lapse between two consecutive frames sent.
ACE_Time_Value inter_frame_time;
@@ -382,7 +382,6 @@ Sender::pace_data (void)
// Reset the message block.
this->mb_.reset ();
-
} // end while
// File reading is complete, destroy the stream.
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
index bf531089d2b..5bbc4cc5e4a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
@@ -27,9 +27,8 @@
class Sender_Callback : public TAO_AV_Callback
{
public:
-
/// Constructor.
- Sender_Callback (void);
+ Sender_Callback ();
// Method that is called when there is data to be received from a
// sender.
@@ -39,7 +38,7 @@ public:
// Called when the sender is done sending data and wants to close
// down the connection.
- // int handle_destroy (void);
+ // int handle_destroy ();
private:
/// Keeping a count of the incoming frames.
@@ -87,28 +86,28 @@ class Sender
{
public:
/// Constructor
- Sender (void);
+ Sender ();
/// Method to initialize the various data components.
int init (int argc,
ACE_TCHAR *argv[]);
/// Method to pace and send data from a file.
- int pace_data (void);
+ int pace_data ();
/// Set the protocol object corresponding to the transport protocol chosen.
void protocol_object (TAO_AV_Protocol_Object *protocol_object);
- int eof (void);
+ int eof ();
- void shutdown (void);
+ void shutdown ();
private:
/// Method to parse the command line arguments.
int parse_args (int argc, ACE_TCHAR *argv[]);
/// Method that binds the sender to the receiver.
- int bind_to_receiver (void);
+ int bind_to_receiver ();
/// The endpoint strategy used by the sender.
SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
index c3639d2f62e..92013d8ce7f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
@@ -1,11 +1,11 @@
#include "Connection_Manager.h"
#include "tao/debug.h"
-Connection_Manager::Connection_Manager (void)
+Connection_Manager::Connection_Manager ()
{
}
-Connection_Manager::~Connection_Manager (void)
+Connection_Manager::~Connection_Manager ()
{
}
@@ -95,7 +95,7 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
}
void
-Connection_Manager::find_receivers (void)
+Connection_Manager::find_receivers ()
{
CosNaming::BindingIterator_var iterator;
CosNaming::BindingList_var binding_list;
@@ -159,7 +159,7 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list)
}
void
-Connection_Manager::connect_to_receivers (void)
+Connection_Manager::connect_to_receivers ()
{
// Connect to all receivers that we know about.
for (Receivers::iterator iterator = this->receivers_.begin ();
@@ -316,7 +316,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
}
void
-Connection_Manager::connect_to_sender (void)
+Connection_Manager::connect_to_sender ()
{
if (CORBA::is_nil (this->sender_.in ()))
return;
@@ -394,10 +394,9 @@ Connection_Manager::add_streamctrl (const ACE_CString &flowname,
{
// the CORBA::Any_var owns the pointer, so we should
// _duplicate it before passing it around
- AVStreams::StreamCtrl::_duplicate( streamctrl );
+ AVStreams::StreamCtrl::_duplicate( streamctrl);
this->streamctrls_.unbind(flowname);
- this->streamctrls_.bind (flowname,
- streamctrl);
+ this->streamctrls_.bind (flowname, streamctrl);
}
}
@@ -551,19 +550,19 @@ Connection_Manager::unbind_receiver (const ACE_CString &sender_name,
}
Connection_Manager::Receivers &
-Connection_Manager::receivers (void)
+Connection_Manager::receivers ()
{
return this->receivers_;
}
Connection_Manager::Protocol_Objects &
-Connection_Manager::protocol_objects (void)
+Connection_Manager::protocol_objects ()
{
return this->protocol_objects_;
}
Connection_Manager::StreamCtrls &
-Connection_Manager::streamctrls (void)
+Connection_Manager::streamctrls ()
{
return this->streamctrls_;
}
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
index 587edfb50fa..8668d308985 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
@@ -32,12 +32,11 @@
class Connection_Manager
{
public:
-
/// Constructor
- Connection_Manager (void);
+ Connection_Manager ();
/// Destructor
- ~Connection_Manager (void);
+ ~Connection_Manager ();
/// Initialize this class.
int init (CORBA::ORB_ptr orb);
@@ -48,7 +47,7 @@ public:
AVStreams::MMDevice_ptr sender);
/// Connect to the receivers that we found.
- void connect_to_receivers (void);
+ void connect_to_receivers ();
/// Bind receiver to the sender.
void bind_to_sender (const ACE_CString &sender_name,
@@ -56,7 +55,7 @@ public:
AVStreams::MMDevice_ptr receiver);
/// Connect to the sender that we found.
- void connect_to_sender (void);
+ void connect_to_sender ();
/// Destroy streams associated with <flowname>.
void destroy (const ACE_CString &flowname);
@@ -93,13 +92,12 @@ public:
StreamCtrls;
// Map accessors.
- Receivers &receivers (void);
- Protocol_Objects &protocol_objects (void);
- StreamCtrls &streamctrls (void);
+ Receivers &receivers ();
+ Protocol_Objects &protocol_objects ();
+ StreamCtrls &streamctrls ();
protected:
-
- void find_receivers (void);
+ void find_receivers ();
void add_to_receivers (CosNaming::BindingList &binding_list);
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
index 535b16c0b06..5a7d703a2e8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
@@ -9,7 +9,7 @@
typedef ACE_Unmanaged_Singleton<Distributer, ACE_Null_Mutex> DISTRIBUTER;
// constructor.
-Signal_Handler::Signal_Handler (void)
+Signal_Handler::Signal_Handler ()
{
}
@@ -23,7 +23,6 @@ Signal_Handler::handle_signal (int signum, siginfo_t *, ucontext_t*)
"In the signal handler\n"));
DISTRIBUTER::instance ()->done (1);
-
}
return 0;
}
@@ -119,25 +118,22 @@ Distributer_Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flo
///Destroy old stream with the same flowname.
connection_manager.destroy (flowname);
-
}
/// Store the related streamctrl.
connection_manager.add_streamctrl (flowname.c_str (), this);
-
}
return true;
-
}
-Distributer_Receiver_Callback::Distributer_Receiver_Callback (void)
+Distributer_Receiver_Callback::Distributer_Receiver_Callback ()
: frame_count_ (1)
{
}
ACE_CString &
-Distributer_Receiver_Callback::flowname (void)
+Distributer_Receiver_Callback::flowname ()
{
return this->flowname_;
}
@@ -181,7 +177,7 @@ Distributer_Receiver_Callback::receive_frame (ACE_Message_Block *frame,
}
int
-Distributer_Receiver_Callback::handle_destroy (void)
+Distributer_Receiver_Callback::handle_destroy ()
{
/// Called when the sender requests the stream to be shutdown.
ACE_DEBUG ((LM_DEBUG,
@@ -196,7 +192,7 @@ Distributer_Receiver_Callback::handle_destroy (void)
}
ACE_CString &
-Distributer_Sender_Callback::flowname (void)
+Distributer_Sender_Callback::flowname ()
{
return this->flowname_;
}
@@ -208,7 +204,7 @@ Distributer_Sender_Callback::flowname (const ACE_CString &flowname)
}
int
-Distributer_Sender_Callback::handle_destroy (void)
+Distributer_Sender_Callback::handle_destroy ()
{
/// Called when the sender requests the stream to be shutdown.
@@ -224,7 +220,7 @@ Distributer_Sender_Callback::handle_destroy (void)
return 0;
}
-Distributer::Distributer (void)
+Distributer::Distributer ()
: distributer_receiver_mmdevice_ (0),
sender_name_ ("sender"),
distributer_name_ ("distributer"),
@@ -233,18 +229,18 @@ Distributer::Distributer (void)
{
}
-Distributer::~Distributer (void)
+Distributer::~Distributer ()
{
}
void
-Distributer::stream_created (void)
+Distributer::stream_created ()
{
++this->stream_count_;
}
void
-Distributer::stream_destroyed (void)
+Distributer::stream_destroyed ()
{
--this->stream_count_;
@@ -254,7 +250,7 @@ Distributer::stream_destroyed (void)
Connection_Manager &
-Distributer::connection_manager (void)
+Distributer::connection_manager ()
{
return this->connection_manager_;
}
@@ -374,7 +370,7 @@ Distributer::done () const
}
void
-Distributer::shut_down (void)
+Distributer::shut_down ()
{
try
{
@@ -391,7 +387,6 @@ Distributer::shut_down (void)
sender_mmdevice.in ());
// DISTRIBUTER::instance ()->connection_manager ().destroy ();
-
}
catch (const CORBA::Exception& ex)
{
@@ -439,14 +434,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
if (wp)
{
orb->perform_work ();
-
}
}
DISTRIBUTER::instance ()->shut_down ();
// orb->shutdown(true);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
index 1a4a1038377..e4c61ab7f7b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
@@ -25,14 +25,11 @@
*/
class Signal_Handler : public ACE_Event_Handler
{
-
public:
-
- Signal_Handler (void);
+ Signal_Handler ();
/// Override this method to implement graceful shutdown.
int handle_signal(int signum, siginfo_t*,ucontext_t*);
-
};
@@ -46,9 +43,8 @@ public:
class Distributer_Receiver_Callback : public TAO_AV_Callback
{
public:
-
//// Constructor.
- Distributer_Receiver_Callback (void);
+ Distributer_Receiver_Callback ();
/// Method that is called when there is data to be received from a
/// sender.
@@ -58,10 +54,10 @@ public:
/// Called when the sender is done sending data and wants to close
/// down the connection.
- int handle_destroy (void);
+ int handle_destroy ();
/// Accessor methods for the flowname of the callback.
- ACE_CString &flowname (void);
+ ACE_CString &flowname ();
void flowname (const ACE_CString &flowname);
private:
@@ -83,21 +79,17 @@ private:
*/
class Distributer_Sender_Callback : public TAO_AV_Callback
{
-
public:
-
//// Called when the sender has finished reading the file and wants
//// to close down the connection.
- int handle_destroy (void);
+ int handle_destroy ();
/// Accessor methods for the flowname of the callback.
- ACE_CString &flowname (void);
+ ACE_CString &flowname ();
void flowname (const ACE_CString &flowname);
private:
-
ACE_CString flowname_;
-
};
/**
@@ -174,10 +166,10 @@ class Distributer
{
public:
//// Constructor
- Distributer (void);
+ Distributer ();
//// Destructor.
- ~Distributer (void);
+ ~Distributer ();
//// Initialize data components.
int init (int argc,
@@ -192,16 +184,16 @@ public:
void done (bool);
//// Accessor to connection manager.
- Connection_Manager &connection_manager (void);
+ Connection_Manager &connection_manager ();
//// Called when stream created
- void stream_created (void);
+ void stream_created ();
//// Called when stream destroyed
- void stream_destroyed (void);
+ void stream_destroyed ();
////Unbind the sender and receiver from the Naming Service
- void shut_down (void);
+ void shut_down ();
protected:
//// Connection manager.
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
index 49d8fc18d9b..68262b9a5a5 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
@@ -11,7 +11,7 @@ static int done = 0;
/// Flag set when a signal is raised.
// constructor.
-Signal_Handler::Signal_Handler (void)
+Signal_Handler::Signal_Handler ()
{
}
@@ -68,19 +68,17 @@ Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flows
/// Store the related streamctrl.
connection_manager->add_streamctrl (flowname.c_str (),
this);
-
}
return 1;
-
}
-Receiver_Callback::Receiver_Callback (void)
+Receiver_Callback::Receiver_Callback ()
: frame_count_ (1)
{
}
ACE_CString &
-Receiver_Callback::flowname (void)
+Receiver_Callback::flowname ()
{
return this->flowname_;
}
@@ -92,7 +90,7 @@ Receiver_Callback::flowname (const ACE_CString &flowname)
}
int
-Receiver_Callback::handle_destroy (void)
+Receiver_Callback::handle_destroy ()
{
/// Called when the sender requests the stream to be shutdown.
ACE_DEBUG ((LM_DEBUG,
@@ -136,7 +134,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
return 0;
}
-Receiver::Receiver (void)
+Receiver::Receiver ()
: mmdevice_ (0),
output_file_name_ ("output"),
sender_name_ ("distributer"),
@@ -144,19 +142,18 @@ Receiver::Receiver (void)
{
}
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
{
-
}
ACE_CString
-Receiver::sender_name (void)
+Receiver::sender_name ()
{
return this->sender_name_;
}
ACE_CString
-Receiver::receiver_name (void)
+Receiver::receiver_name ()
{
return this->receiver_name_;
}
@@ -247,13 +244,13 @@ Receiver::parse_args (int argc,
}
ACE_CString
-Receiver::output_file_name (void)
+Receiver::output_file_name ()
{
return this->output_file_name_;
}
void
-Receiver::shut_down (void)
+Receiver::shut_down ()
{
try
{
@@ -264,8 +261,6 @@ Receiver::shut_down (void)
this->connection_manager_.unbind_receiver (this->sender_name_,
this->receiver_name_,
mmdevice_obj.in ());
-
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
index 681b8c7ebc9..812ab6f7916 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
@@ -25,14 +25,11 @@
*/
class Signal_Handler : public ACE_Event_Handler
{
-
public:
-
- Signal_Handler (void);
+ Signal_Handler ();
/// Override this method to implement graceful shutdown.
int handle_signal(int signum, siginfo_t*,ucontext_t*);
-
};
/**
@@ -45,9 +42,8 @@ public:
class Receiver_Callback : public TAO_AV_Callback
{
public:
-
//// Constructor.
- Receiver_Callback (void);
+ Receiver_Callback ();
/// Method that is called when there is data to be received from a
/// sender.
@@ -55,10 +51,10 @@ public:
TAO_AV_frame_info *frame_info,
const ACE_Addr &peer_address);
- int handle_destroy (void);
+ int handle_destroy ();
/// Accessor methods for the flowname of the callback.
- ACE_CString &flowname (void);
+ ACE_CString &flowname ();
void flowname (const ACE_CString &flowname);
private:
@@ -103,10 +99,10 @@ class Receiver
{
public:
//// Constructor
- Receiver (void);
+ Receiver ();
//// Destructor.
- virtual ~Receiver (void);
+ virtual ~Receiver ();
//// Initialize data components.
int init (int argc,
@@ -117,12 +113,12 @@ public:
ACE_TCHAR **argv);
//// Name of the output file.
- ACE_CString output_file_name (void);
+ ACE_CString output_file_name ();
- ACE_CString sender_name (void);
- ACE_CString receiver_name (void);
+ ACE_CString sender_name ();
+ ACE_CString receiver_name ();
- void shut_down (void);
+ void shut_down ();
protected:
//// Connection manager.
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
index b7b47d1a487..d8a91aecb9b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
@@ -17,7 +17,7 @@ int g_shutdown = 0;
/// Flag set when a signal is raised.
// constructor.
-Signal_Handler::Signal_Handler (void)
+Signal_Handler::Signal_Handler ()
{
}
@@ -31,13 +31,12 @@ Signal_Handler::handle_signal (int signum, siginfo_t *, ucontext_t*)
"In the signal handler\n"));
g_shutdown = 1;
-
}
return 0;
}
ACE_CString &
-Sender_Callback::flowname (void)
+Sender_Callback::flowname ()
{
return this->flowname_;
}
@@ -50,7 +49,7 @@ Sender_Callback::flowname (const ACE_CString &flowname)
int
-Sender_Callback::handle_destroy (void)
+Sender_Callback::handle_destroy ()
{
SENDER::instance ()->connection_manager ().protocol_objects ().unbind (this->flowname_.c_str ());
@@ -129,7 +128,7 @@ Sender_StreamEndPoint::handle_preconnect (AVStreams::flowSpec &flowspec)
return 1;
}
-Sender::Sender (void)
+Sender::Sender ()
: sender_mmdevice_ (0),
frame_count_ (0),
filename_ ("input"),
@@ -140,7 +139,7 @@ Sender::Sender (void)
{
}
-Sender::~Sender (void)
+Sender::~Sender ()
{
if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG,
@@ -148,7 +147,7 @@ Sender::~Sender (void)
}
void
-Sender::shut_down (void)
+Sender::shut_down ()
{
try
{
@@ -157,7 +156,6 @@ Sender::shut_down (void)
SENDER::instance ()->connection_manager ().unbind_sender (this->sender_name_,
mmdevice.in ());
-
}
catch (const CORBA::Exception& ex)
{
@@ -273,7 +271,7 @@ Sender::init (int argc,
/// Method to send data at the specified rate
int
-Sender::pace_data (void)
+Sender::pace_data ()
{
/// The time that should lapse between two consecutive frames sent.
ACE_Time_Value inter_frame_time;
@@ -296,7 +294,6 @@ Sender::pace_data (void)
/// Continue to send data till the file is read to the end.
while (1)
{
-
if (g_shutdown == 1)
{
ACE_DEBUG ((LM_DEBUG,
@@ -327,7 +324,6 @@ Sender::pace_data (void)
this->shut_down ();
break;
-
}
this->mb_.wr_ptr (n);
@@ -366,7 +362,6 @@ Sender::pace_data (void)
/// Run the orb for the wait time so the sender can
/// continue other orb requests.
TAO_AV_CORE::instance ()->orb ()->run (wait_time);
-
}
}
@@ -397,7 +392,6 @@ Sender::pace_data (void)
/// Reset the message block.
this->mb_.reset ();
-
} /// end while
}
@@ -410,25 +404,25 @@ Sender::pace_data (void)
}
Connection_Manager &
-Sender::connection_manager (void)
+Sender::connection_manager ()
{
return this->connection_manager_;
}
// void
-// Sender::add_stream (void)
+// Sender::add_stream ()
// {
// this->stream_count_++;
// }
// void
-// Sender::remove_stream (void)
+// Sender::remove_stream ()
// {
// this->stream_count_--;
// }
// int
-// Sender::stream_alive (void)
+// Sender::stream_alive ()
// {
// return this->stream_count_;
// }
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
index c179a105c2b..9d40a9f9312 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
@@ -25,14 +25,11 @@
*/
class Signal_Handler : public ACE_Event_Handler
{
-
public:
-
- Signal_Handler (void);
+ Signal_Handler ();
/// Override this method to implement graceful shutdown.
int handle_signal(int signum, siginfo_t*,ucontext_t*);
-
};
@@ -46,18 +43,16 @@ public:
*/
class Sender_Callback : public TAO_AV_Callback
{
-
public:
-
/**
* Called when the sender has finished reading the file and wants
* to close down the connection. Also called when the distributer
* tears down the connection when it switches to a new sender.
*/
- int handle_destroy (void);
+ int handle_destroy ();
/// Accessor methods for the flowname of the callback
- ACE_CString &flowname (void);
+ ACE_CString &flowname ();
void flowname (const ACE_CString &flowname);
private:
@@ -110,22 +105,22 @@ class Sender
{
public:
//// Constructor
- Sender (void);
+ Sender ();
//// Destructor
- ~Sender (void);
+ ~Sender ();
- void shut_down (void);
+ void shut_down ();
//// Method to initialize the various data components.
int init (int argc,
ACE_TCHAR *argv[]);
//// Method to pace and send data from a file.
- int pace_data (void);
+ int pace_data ();
//// Accessor to the connection manager.
- Connection_Manager &connection_manager (void);
+ Connection_Manager &connection_manager ();
private:
//// Method to parse the command line arguments.
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
index 66094a47083..74372401d7c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
@@ -1,13 +1,13 @@
#include "ftp.h"
-FTP_Client_Callback::FTP_Client_Callback (void)
+FTP_Client_Callback::FTP_Client_Callback ()
:count_ (0)
{
}
int
-FTP_Client_Callback::handle_end_stream (void)
+FTP_Client_Callback::handle_end_stream ()
{
TAO_AV_CORE::instance ()->stop_run ();
return 0;
@@ -73,7 +73,7 @@ FTP_Client_Callback::handle_timeout (void *)
return 0;
}
-FTP_Client_Producer::FTP_Client_Producer (void)
+FTP_Client_Producer::FTP_Client_Producer ()
:TAO_FlowProducer ("Data",CLIENT::instance ()->protocols (),CLIENT::instance ()->format ())
{
}
@@ -155,19 +155,19 @@ Client::parse_args (int argc,
}
FILE *
-Client::file (void)
+Client::file ()
{
return this->fp_;
}
const char*
-Client::flowname (void)
+Client::flowname ()
{
return this->flowname_.c_str();
}
AVStreams::protocolSpec
-Client::protocols (void)
+Client::protocols ()
{
AVStreams::protocolSpec protocols (1);
protocols.length (1);
@@ -178,25 +178,25 @@ Client::protocols (void)
}
const char *
-Client::format (void)
+Client::format ()
{
return "UNS:ftp";
}
const char *
-Client::address (void)
+Client::address ()
{
return this->address_.c_str ();
}
TAO_StreamCtrl*
-Client::streamctrl (void)
+Client::streamctrl ()
{
return &this->streamctrl_;
}
-Client::Client (void)
+Client::Client ()
: fp_ (0),
protocol_ (ACE_OS::strdup ("UDP")),
orb_ (TAO_AV_CORE::instance ()->orb ()),
@@ -216,7 +216,6 @@ Client::init (int argc, ACE_TCHAR *argv[])
CORBA::String_var ior;
try
{
-
PortableServer::POAManager_var mgr
= TAO_AV_CORE::instance ()->poa ()->the_POAManager ();
@@ -225,9 +224,9 @@ Client::init (int argc, ACE_TCHAR *argv[])
this->parse_args (this->argc_, this->argv_);
ACE_NEW_RETURN (this->streamendpoint_a_,
- TAO_StreamEndPoint_A, -1 );
+ TAO_StreamEndPoint_A, -1);
- ACE_NEW_RETURN (this->fep_a_, FTP_Client_Producer, -1 );
+ ACE_NEW_RETURN (this->fep_a_, FTP_Client_Producer, -1);
this->flowname_ = "Data";
sep_a_ = this->streamendpoint_a_->_this();
@@ -259,7 +258,7 @@ Client::init (int argc, ACE_TCHAR *argv[])
}
int
-Client::run (void)
+Client::run ()
{
try
{
@@ -281,7 +280,7 @@ Client::run (void)
this->protocol_,
&addr);
- ACE_INET_Addr peer_addr (this->peer_addr_.c_str ());;
+ ACE_INET_Addr peer_addr (this->peer_addr_.c_str ());
entry.set_peer_addr (&peer_addr);
flow_spec [0] = CORBA::string_dup (entry.entry_to_string ());
@@ -292,7 +291,7 @@ Client::run (void)
CORBA::Object_var obj_b = this->orb_->string_to_object("corbaname:rir:#Server_StreamEndPoint_b");
- AVStreams::StreamEndPoint_B_var sep_b = AVStreams::StreamEndPoint_B::_narrow ( obj_b.in() );
+ AVStreams::StreamEndPoint_B_var sep_b = AVStreams::StreamEndPoint_B::_narrow (obj_b.in());
CORBA::Boolean result =
this->streamctrl_.bind (sep_a_.in(),
@@ -314,7 +313,6 @@ Client::run (void)
this->orb_->run (tv);
ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
-
}
catch (const CORBA::Exception& ex)
{
@@ -354,7 +352,6 @@ ACE_TMAIN (int argc,
if (result < 0)
ACE_ERROR_RETURN ((LM_ERROR,"client::run failed\n"),1);
-
}
catch (const CORBA::Exception& ex)
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h
index ee8214651a8..805f58fd42c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h
@@ -19,7 +19,7 @@ class FTP_Client_Producer
:public virtual TAO_FlowProducer
{
public:
- FTP_Client_Producer (void);
+ FTP_Client_Producer ();
virtual int get_callback (const char *flowname,
TAO_AV_Callback *&callback);
int set_protocol_object (const char *flowname,
@@ -32,9 +32,9 @@ class FTP_Client_Callback
:public TAO_AV_Callback
{
public:
- FTP_Client_Callback (void);
+ FTP_Client_Callback ();
virtual int handle_timeout (void *arg);
- virtual int handle_end_stream (void);
+ virtual int handle_end_stream ();
virtual void get_timeout (ACE_Time_Value *&tv,
void *&arg);
void set_protocol_object (TAO_AV_Protocol_Object *protocol_object) {this->protocol_object_ = protocol_object;}
@@ -49,15 +49,15 @@ typedef TAO_AV_Endpoint_Reactive_Strategy_A<TAO_StreamEndPoint_A,TAO_VDev,AV_Nul
class Client
{
public:
- Client (void);
+ Client ();
int init (int argc, ACE_TCHAR *argv[]);
- int run (void);
- FILE *file (void);
- const char *flowname (void);
- TAO_StreamCtrl* streamctrl (void);
- AVStreams::protocolSpec protocols (void);
- const char *format (void);
- const char *address (void);
+ int run ();
+ FILE *file ();
+ const char *flowname ();
+ TAO_StreamCtrl* streamctrl ();
+ AVStreams::protocolSpec protocols ();
+ const char *format ();
+ const char *address ();
private:
int parse_args (int argc, ACE_TCHAR *argv[]);
ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
index 808d78b1227..1d1d5ffd14c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
@@ -1,6 +1,6 @@
#include "server.h"
-FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint (void)
+FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint ()
:TAO_FlowConsumer ("Data",FTP_SERVER::instance ()->protocols (), FTP_SERVER::instance ()->format ())
{
AVStreams::protocolSpec protocols (2);
@@ -29,12 +29,12 @@ FTP_Server_FlowEndPoint::get_callback (const char *,
return 0;
}
-FTP_Server_Callback::FTP_Server_Callback (void)
+FTP_Server_Callback::FTP_Server_Callback ()
{
}
int
-FTP_Server_Callback::handle_stop (void)
+FTP_Server_Callback::handle_stop ()
{
ACE_DEBUG ((LM_DEBUG,"FTP_Server_Callback::stop\n"));
ACE_OS::fclose (FTP_SERVER::instance ()->file ());
@@ -62,14 +62,14 @@ FTP_Server_Callback::receive_frame (ACE_Message_Block *frame,
}
int
-FTP_Server_Callback::handle_end_stream (void)
+FTP_Server_Callback::handle_end_stream ()
{
CORBA::ORB_var orb = TAO_AV_CORE::instance ()->orb ();
orb->shutdown ();
return 0;
}
-Server::Server (void)
+Server::Server ()
:orb_ (TAO_AV_CORE::instance ()->orb ()),
poa_ (TAO_AV_CORE::instance ()->poa ())
{
@@ -78,7 +78,7 @@ Server::Server (void)
}
AVStreams::protocolSpec
-Server::protocols (void)
+Server::protocols ()
{
AVStreams::protocolSpec protocols (2);
protocols.length (2);
@@ -88,7 +88,7 @@ Server::protocols (void)
}
const char*
-Server::format (void)
+Server::format ()
{
return "UNS:ftp";
}
@@ -123,7 +123,7 @@ Server::init (int argc,
fep_b_obj_ = this->fep_b_->_this ();
- CORBA::String_var s1 = sep_b_->add_fep( fep_b_obj_.in() );
+ CORBA::String_var s1 = sep_b_->add_fep( fep_b_obj_.in());
ACE_DEBUG ((LM_DEBUG, "(%N,%l) Added flowendpoint named: %C\n", s1.in() ));
@@ -136,8 +136,6 @@ Server::init (int argc,
// Register the video control object with the naming server.
this->my_naming_client_->rebind (server_sep_b_name,
sep_b_.in ());
-
-
}
catch (const CORBA::Exception& ex)
{
@@ -148,7 +146,7 @@ Server::init (int argc,
}
int
-Server::run (void)
+Server::run ()
{
try
{
@@ -196,7 +194,7 @@ Server::parse_args (int argc, ACE_TCHAR *argv[])
}
FILE*
-Server::file (void)
+Server::file ()
{
return this->fp_;
}
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h
index 0901c0e4e69..3025cc70017 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h
@@ -15,19 +15,19 @@ class FTP_Server_Callback
:public TAO_AV_Callback
{
public:
- FTP_Server_Callback (void);
- virtual int handle_stop (void);
+ FTP_Server_Callback ();
+ virtual int handle_stop ();
virtual int receive_frame (ACE_Message_Block *frame,
TAO_AV_frame_info *,
const ACE_Addr &);
- virtual int handle_end_stream (void);
+ virtual int handle_end_stream ();
};
class FTP_Server_FlowEndPoint
:public TAO_FlowConsumer
{
public:
- FTP_Server_FlowEndPoint (void);
+ FTP_Server_FlowEndPoint ();
int get_callback (const char *flowname,
TAO_AV_Callback *&callback);
};
@@ -35,17 +35,17 @@ public:
class Server
{
public:
- Server (void);
+ Server ();
int init (int argc,
ACE_TCHAR *argv[]);
- int run (void);
- FILE *file (void);
- AVStreams::protocolSpec protocols (void);
- CORBA::ORB_ptr orb (void);
+ int run ();
+ FILE *file ();
+ AVStreams::protocolSpec protocols ();
+ CORBA::ORB_ptr orb ();
void orb (CORBA::ORB_ptr orb_in);
- PortableServer::POA_ptr poa (void);
+ PortableServer::POA_ptr poa ();
void poa (PortableServer::POA_ptr poa_in);
- const char *format (void);
+ const char *format ();
protected:
int parse_args (int argc, ACE_TCHAR *argv[]);
TAO_Naming_Client my_naming_client_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
index 793325b735d..183dca390a0 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
@@ -148,7 +148,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
// flow_spec.length (0);
// stream_control->stop (flow_spec);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
index b538a2695fa..6b1135648a4 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
@@ -172,7 +172,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
ACE_DEBUG ((LM_DEBUG, "done %d\n", gsf));
recv_latency.dump_results (ACE_TEXT("Receive"), gsf);
-
}
catch (const CORBA::Exception& ex)
{
@@ -185,7 +184,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
// ****************************************************************
-Ping_Recv::Ping_Recv (void)
+Ping_Recv::Ping_Recv ()
: TAO_FlowConsumer ("Ping",
ping_protocols,
"UNS:ping")
@@ -201,13 +200,13 @@ Ping_Recv::get_callback (const char *,
return 0;
}
-Ping_Recv_Callback::Ping_Recv_Callback (void)
+Ping_Recv_Callback::Ping_Recv_Callback ()
: count_ (0)
{
}
int
-Ping_Recv_Callback::handle_stop (void)
+Ping_Recv_Callback::handle_stop ()
{
ACE_DEBUG ((LM_DEBUG,"Ping_Recv_Callback::stop"));
TAO_AV_CORE::instance ()->orb ()->shutdown ();
@@ -258,7 +257,7 @@ Ping_Recv_Callback::receive_frame (ACE_Message_Block *frame,
}
int
-Ping_Recv_Callback::handle_destroy (void)
+Ping_Recv_Callback::handle_destroy ()
{
ACE_DEBUG ((LM_DEBUG,"Ping_Recv_Callback::destroy\n"));
return 0;
@@ -266,7 +265,7 @@ Ping_Recv_Callback::handle_destroy (void)
// ****************************************************************
-Pong_Send::Pong_Send (void)
+Pong_Send::Pong_Send ()
: TAO_FlowProducer ("Pong",
pong_protocols,
"UNS:pong")
@@ -299,7 +298,7 @@ Pong_Send_Callback::handle_timeout (void *)
}
int
-Pong_Send_Callback::handle_end_stream (void)
+Pong_Send_Callback::handle_end_stream ()
{
return 0;
}
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.h b/TAO/orbsvcs/tests/AVStreams/Latency/ping.h
index b5623956b53..70e3d743bef 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.h
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.h
@@ -19,12 +19,12 @@
class Ping_Recv_Callback : public TAO_AV_Callback
{
public:
- Ping_Recv_Callback (void);
- virtual int handle_stop (void);
+ Ping_Recv_Callback ();
+ virtual int handle_stop ();
virtual int receive_frame (ACE_Message_Block *frame,
TAO_AV_frame_info *frame_info = 0,
const ACE_Addr &peer_address = ACE_Addr::sap_any);
- virtual int handle_destroy (void);
+ virtual int handle_destroy ();
protected:
int count_;
};
@@ -32,7 +32,7 @@ public:
class Ping_Recv : public TAO_FlowConsumer
{
public:
- Ping_Recv (void);
+ Ping_Recv ();
virtual int get_callback (const char *flowname,
TAO_AV_Callback *&callback);
@@ -45,13 +45,12 @@ private:
class Pong_Send_Callback : public TAO_AV_Callback
{
public:
-
/// Ad-hoc method to send a response outside the context of a
/// handle_timeout.
int send_response (ACE_hrtime_t stamp);
virtual int handle_timeout (void *arg);
- virtual int handle_end_stream (void);
+ virtual int handle_end_stream ();
virtual void get_timeout (ACE_Time_Value *&tv,
void *&arg);
};
@@ -59,7 +58,7 @@ public:
class Pong_Send : public TAO_FlowProducer
{
public:
- Pong_Send (void);
+ Pong_Send ();
virtual int get_callback (const char *flowname,
TAO_AV_Callback *&callback);
};
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
index 9911cbb775a..42d6dddf6b4 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
@@ -178,7 +178,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
mmdevice->add_fdev (pong_fdev.in ());
}
- orb->run ( );
+ orb->run ();
ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
@@ -190,7 +190,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
recv_latency.dump_results (ACE_TEXT("Receive"), gsf);
send_latency.dump_results (ACE_TEXT("Send"), gsf);
-
}
catch (const CORBA::Exception& ex)
{
@@ -203,7 +202,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
// ****************************************************************
-Pong_Recv::Pong_Recv (void)
+Pong_Recv::Pong_Recv ()
: TAO_FlowConsumer ("Pong",
pong_protocols,
"UNS:pong")
@@ -220,7 +219,7 @@ Pong_Recv::get_callback (const char *,
}
int
-Pong_Recv_Callback::handle_stop (void)
+Pong_Recv_Callback::handle_stop ()
{
// ACE_DEBUG ((LM_DEBUG,"Pong_Recv_Callback::stop"));
TAO_AV_CORE::instance ()->orb ()->shutdown ();
@@ -260,7 +259,7 @@ Pong_Recv_Callback::receive_frame (ACE_Message_Block *frame,
}
int
-Pong_Recv_Callback::handle_destroy (void)
+Pong_Recv_Callback::handle_destroy ()
{
ACE_DEBUG ((LM_DEBUG,"Pong_Recv_Callback::destroy\n"));
return 0;
@@ -268,7 +267,7 @@ Pong_Recv_Callback::handle_destroy (void)
// ****************************************************************
-Ping_Send::Ping_Send (void)
+Ping_Send::Ping_Send ()
: TAO_FlowProducer ("Ping",
ping_protocols,
"UNS:ping")
@@ -284,7 +283,7 @@ Ping_Send::get_callback (const char *,
return 0;
}
-Ping_Send_Callback::Ping_Send_Callback (void)
+Ping_Send_Callback::Ping_Send_Callback ()
:count_ (0)
{
this->timeout_ = ACE_Time_Value (2);
@@ -303,7 +302,6 @@ Ping_Send_Callback::get_timeout (ACE_Time_Value *&tv,
int
Ping_Send_Callback::handle_timeout (void *)
{
-
this->count_++;
ACE_DEBUG ((LM_DEBUG, "Ping timeout frame %d\n", this->count_));
@@ -336,7 +334,7 @@ Ping_Send_Callback::handle_timeout (void *)
}
int
-Ping_Send_Callback::handle_end_stream (void)
+Ping_Send_Callback::handle_end_stream ()
{
return 0;
}
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.h b/TAO/orbsvcs/tests/AVStreams/Latency/pong.h
index 637140564ed..065af4f4f5a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.h
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.h
@@ -17,17 +17,17 @@
class Pong_Recv_Callback : public TAO_AV_Callback
{
public:
- virtual int handle_stop (void);
+ virtual int handle_stop ();
virtual int receive_frame (ACE_Message_Block *frame,
TAO_AV_frame_info *frame_info = 0,
const ACE_Addr &peer_address = ACE_Addr::sap_any);
- virtual int handle_destroy (void);
+ virtual int handle_destroy ();
};
class Pong_Recv : public TAO_FlowConsumer
{
public:
- Pong_Recv (void);
+ Pong_Recv ();
virtual int get_callback (const char *flowname,
TAO_AV_Callback *&callback);
@@ -40,10 +40,10 @@ private:
class Ping_Send_Callback : public TAO_AV_Callback
{
public:
- Ping_Send_Callback (void);
+ Ping_Send_Callback ();
virtual int handle_timeout (void *arg);
- virtual int handle_end_stream (void);
+ virtual int handle_end_stream ();
virtual void get_timeout (ACE_Time_Value *&tv,
void *&arg);
@@ -54,13 +54,12 @@ private:
/// Pre-allocate the message block to send...
ACE_Message_Block frame_;
int count_;
-
};
class Ping_Send : public TAO_FlowProducer
{
public:
- Ping_Send (void);
+ Ping_Send ();
virtual int get_callback (const char *flowname,
TAO_AV_Callback *&callback);
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
index 829afe4ed37..0cab42145e8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
@@ -38,7 +38,7 @@ Receiver_StreamEndPoint::get_callback (const char *,
return 0;
}
-Receiver_Callback::Receiver_Callback (void)
+Receiver_Callback::Receiver_Callback ()
: frame_count_ (0)
{
}
@@ -126,7 +126,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
}
int
-Receiver_Callback::handle_destroy (void)
+Receiver_Callback::handle_destroy ()
{
// Called when the distributer requests the stream to be shutdown.
ACE_DEBUG ((LM_DEBUG,
@@ -140,23 +140,21 @@ Receiver_Callback::handle_destroy (void)
{
ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
return -1;
-
}
return 0;
}
-Receiver::Receiver (void)
+Receiver::Receiver ()
: mmdevice_ (0)
{
}
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
{
}
-
int
Receiver::init (int,
ACE_TCHAR *[])
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
index 6d15aa43d28..5a6cea84bdc 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
@@ -18,8 +18,7 @@
class Receiver_Callback : public TAO_AV_Callback
{
public:
-
- Receiver_Callback (void);
+ Receiver_Callback ();
/// Constructor.
/// Method that is called when there is data to be received from a
@@ -30,7 +29,7 @@ public:
/// Called when the sender is done sending data and wants to close
/// down the connection.
- int handle_destroy (void);
+ int handle_destroy ();
/// Set the related stream control for this flow.
void streamctrl (AVStreams::StreamCtrl_ptr streamctrl);
@@ -41,13 +40,11 @@ private:
/// Related stream control.
AVStreams::StreamCtrl_ptr streamctrl_;
-
};
// = AVStreams calls this class during connection setup.
class Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint
{
-
public:
/// Create a receiver application callback.
int get_callback (const char *flowname,
@@ -62,10 +59,10 @@ private:
class Receiver
{
public:
- Receiver (void);
+ Receiver ();
/// Constructor
- ~Receiver (void);
+ ~Receiver ();
/// Destructor.
int init (int argc,
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
index 8f559e80797..2acff233303 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
@@ -63,7 +63,7 @@ Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
return 1;
}
-Sender::Sender (void)
+Sender::Sender ()
: sender_mmdevice_ (0),
streamctrl_ (0),
frame_count_ (0),
@@ -117,7 +117,7 @@ Sender::parse_args (int argc,
// Method to get the object reference of the receiver
int
-Sender::bind_to_receiver (void)
+Sender::bind_to_receiver ()
{
CosNaming::Name name (1);
name.length (1);
@@ -237,10 +237,8 @@ Sender::init (int argc,
// Method to send data at the specified rate
int
-Sender::pace_data (void)
+Sender::pace_data ()
{
-
-
// The time between two consecutive frames.
inter_frame_time.set (1 / (double) this->frame_rate_);
@@ -331,7 +329,6 @@ Sender::pace_data (void)
// Reset the message block.
this->mb_.reset ();
-
} // end while
// File reading is complete, destroy the stream.
@@ -386,7 +383,6 @@ ACE_TMAIN (int argc,
// Start sending data.
result = SENDER::instance ()->pace_data ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
index b83bbeb5c48..68302f92daa 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
@@ -53,14 +53,14 @@ SENDER_ENDPOINT_STRATEGY;
class Sender
{
public:
- Sender (void);
+ Sender ();
/// Constructor
int init (int argc,
ACE_TCHAR *argv[]);
/// Method to initialize the various data components.
- int pace_data (void);
+ int pace_data ();
/// Method to pace and send data from a file.
void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -70,7 +70,7 @@ private:
int parse_args (int argc, ACE_TCHAR *argv[]);
/// Method to parse the command line arguments.
- int bind_to_receiver (void);
+ int bind_to_receiver ();
/// Method that binds the sender to the receiver.
SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
index ecfa3b10ac3..b367afdda76 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
@@ -1,21 +1,20 @@
#include "ftp.h"
-FTP_Client_Callback::FTP_Client_Callback (void)
+FTP_Client_Callback::FTP_Client_Callback ()
: count_ (0)
{
}
int
-FTP_Client_Callback::handle_end_stream (void)
+FTP_Client_Callback::handle_end_stream ()
{
TAO_AV_CORE::instance ()->orb ()->shutdown ();
return 0;
}
-FTP_Client_StreamEndPoint::FTP_Client_StreamEndPoint (void)
+FTP_Client_StreamEndPoint::FTP_Client_StreamEndPoint ()
: callback_ (0)
{
-
}
void
@@ -152,24 +151,24 @@ Client::parse_args (int argc,
}
FILE *
-Client::file (void)
+Client::file ()
{
return this->fp_;
}
char*
-Client::flowname (void)
+Client::flowname ()
{
return this->flowname_;
}
TAO_StreamCtrl*
-Client::streamctrl (void)
+Client::streamctrl ()
{
return &this->streamctrl_;
}
-Client::Client (void)
+Client::Client ()
:endpoint_strategy_ (TAO_AV_CORE::instance ()->orb (), TAO_AV_CORE::instance ()->poa (),this),
client_mmdevice_ (&endpoint_strategy_),
address_ (ACE_OS::strdup ("224.9.9.2:12345")),
@@ -182,7 +181,6 @@ Client::Client (void)
int
Client::bind_to_server (const char *name)
{
-
try
{
// Initialize the naming services
@@ -212,7 +210,6 @@ Client::bind_to_server (const char *name)
int
Client::init (int argc, ACE_TCHAR *argv[])
{
-
PortableServer::POAManager_var mgr
= TAO_AV_CORE::instance ()->poa ()->the_POAManager ();
@@ -245,7 +242,7 @@ Client::init (int argc, ACE_TCHAR *argv[])
}
int
-Client::run (void)
+Client::run ()
{
try
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
index ca1ffbe22be..18aa68d2b6f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
@@ -16,8 +16,8 @@ class FTP_Client_Callback
:public TAO_AV_Callback
{
public:
- FTP_Client_Callback (void);
- virtual int handle_end_stream (void);
+ FTP_Client_Callback ();
+ virtual int handle_end_stream ();
void set_protocol_object (TAO_AV_Protocol_Object *protocol_object) {this->protocol_object_ = protocol_object;}
virtual int handle_timeout (void *arg);
virtual void get_timeout (ACE_Time_Value *&tv,
@@ -32,7 +32,7 @@ class FTP_Client_StreamEndPoint
:public TAO_Client_StreamEndPoint
{
public:
- FTP_Client_StreamEndPoint (void);
+ FTP_Client_StreamEndPoint ();
virtual int get_callback (const char *flowname,
TAO_AV_Callback *&callback);
@@ -66,12 +66,12 @@ private:
class Client
{
public:
- Client (void);
+ Client ();
int init (int argc, ACE_TCHAR *argv[]);
- int run (void);
- FILE *file (void);
- char *flowname (void);
- TAO_StreamCtrl* streamctrl (void);
+ int run ();
+ FILE *file ();
+ char *flowname ();
+ TAO_StreamCtrl* streamctrl ();
private:
int parse_args (int argc, ACE_TCHAR *argv[]);
int bind_to_server (const char *name);
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
index 707c54a2bc7..b81370f01df 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
@@ -2,7 +2,7 @@
int done = 0;
-FTP_Server_StreamEndPoint::FTP_Server_StreamEndPoint (void)
+FTP_Server_StreamEndPoint::FTP_Server_StreamEndPoint ()
{
ACE_DEBUG ((LM_DEBUG,"FTP_Server_StreamEndPoint::FTP_Server_StreamEndPoint\n"));
}
@@ -19,7 +19,7 @@ FTP_Server_StreamEndPoint::get_callback (const char *,
}
int
-FTP_Server_Callback::handle_stop (void)
+FTP_Server_Callback::handle_stop ()
{
ACE_DEBUG ((LM_DEBUG,"FTP_Server_Callback::stop\n"));
ACE_OS::fclose (FTP_SERVER::instance ()->file ());
@@ -47,14 +47,14 @@ FTP_Server_Callback::receive_frame (ACE_Message_Block *frame,
}
int
-FTP_Server_Callback::handle_end_stream (void)
+FTP_Server_Callback::handle_end_stream ()
{
ACE_DEBUG ((LM_DEBUG,"FTP_Server_Callback::end_stream\n"));
done = 1;
return 0;
}
-Server::Server (void)
+Server::Server ()
{
reactive_strategy_.init (TAO_AV_CORE::instance ()->orb (),
TAO_AV_CORE::instance ()->poa ());
@@ -66,7 +66,6 @@ Server::init (int argc,
{
try
{
-
PortableServer::POAManager_var mgr
= TAO_AV_CORE::instance ()->poa ()->the_POAManager ();
@@ -116,22 +115,21 @@ Server::init (int argc,
}
int
-Server::run (void)
+Server::run ()
{
CORBA::ORB_ptr orb = TAO_AV_CORE::instance ()->orb();
try
{
-
while( !done )
{
CORBA::Boolean wp = orb->work_pending ();
if (wp)
{
- orb->perform_work( );
+ orb->perform_work();
}
}
- orb->shutdown( 1 );
+ orb->shutdown(true);
}
catch (const CORBA::Exception& ex)
{
@@ -171,7 +169,7 @@ Server::parse_args (int argc, ACE_TCHAR *argv[])
}
FILE*
-Server::file (void)
+Server::file ()
{
return this->fp_;
}
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast/server.h
index a20ed2ce30b..a260b4ae471 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.h
@@ -14,7 +14,7 @@ class FTP_Server_StreamEndPoint
:public TAO_Server_StreamEndPoint
{
public:
- FTP_Server_StreamEndPoint (void);
+ FTP_Server_StreamEndPoint ();
virtual int get_callback (const char *flowname,
TAO_AV_Callback *&callback);
};
@@ -23,21 +23,21 @@ class FTP_Server_Callback
:public TAO_AV_Callback
{
public:
- virtual int handle_stop (void);
+ virtual int handle_stop ();
virtual int receive_frame (ACE_Message_Block *frame,
TAO_AV_frame_info *,
const ACE_Addr &);
- virtual int handle_end_stream (void);
+ virtual int handle_end_stream ();
};
class Server
{
public:
- Server (void);
+ Server ();
int init (int argc,
ACE_TCHAR *argv[]);
- int run (void);
- FILE *file (void);
+ int run ();
+ FILE *file ();
protected:
int parse_args (int argc, ACE_TCHAR *argv[]);
TAO_Naming_Client my_naming_client_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
index 2a384f91291..7d435d90afb 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
@@ -1,13 +1,13 @@
#include "ftp.h"
#include "tao/debug.h"
-FTP_Client_Callback::FTP_Client_Callback (void)
+FTP_Client_Callback::FTP_Client_Callback ()
:count_ (0)
{
}
int
-FTP_Client_Callback::handle_end_stream (void)
+FTP_Client_Callback::handle_end_stream ()
{
TAO_AV_CORE::instance ()->orb ()->shutdown ();
return 0;
@@ -72,7 +72,7 @@ FTP_Client_Callback::handle_timeout (void *)
return 0;
}
-FTP_Client_Producer::FTP_Client_Producer (void)
+FTP_Client_Producer::FTP_Client_Producer ()
:TAO_FlowProducer ("Data",CLIENT::instance ()->protocols (),CLIENT::instance ()->format ())
{
}
@@ -125,26 +125,25 @@ Client::parse_args (int argc, ACE_TCHAR *argv[])
default:
ACE_DEBUG ((LM_DEBUG,"Unknown option\n"));
return -1;
-
}
}
return 0;
}
FILE *
-Client::file (void)
+Client::file ()
{
return this->fp_;
}
char*
-Client::flowname (void)
+Client::flowname ()
{
return this->flowname_;
}
AVStreams::protocolSpec
-Client::protocols (void)
+Client::protocols ()
{
AVStreams::protocolSpec protocols (1);
protocols.length (1);
@@ -155,25 +154,25 @@ Client::protocols (void)
}
const char *
-Client::format (void)
+Client::format ()
{
return "UNS:ftp";
}
const char *
-Client::address (void)
+Client::address ()
{
return this->address_;
}
TAO_StreamCtrl*
-Client::streamctrl (void)
+Client::streamctrl ()
{
return &this->streamctrl_;
}
-Client::Client (void)
+Client::Client ()
: client_mmdevice_ (&endpoint_strategy_),
fdev_ (0),
address_ (ACE_OS::strdup ("224.9.9.2:10002")),
@@ -181,7 +180,6 @@ Client::Client (void)
protocol_ (ACE_OS::strdup ("UDP"))
{
endpoint_strategy_.init (TAO_AV_CORE::instance ()->orb (), TAO_AV_CORE::instance ()->poa ());
-
}
@@ -273,7 +271,7 @@ Client::init (int argc, ACE_TCHAR *argv[])
}
int
-Client::run (void)
+Client::run ()
{
try
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h
index 7144b72f254..458bdbf8479 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h
@@ -16,7 +16,7 @@ class FTP_Client_Producer
:public virtual TAO_FlowProducer
{
public:
- FTP_Client_Producer (void);
+ FTP_Client_Producer ();
virtual int get_callback (const char *flowname,
TAO_AV_Callback *&callback);
int set_protocol_object (const char *flowname,
@@ -29,9 +29,9 @@ class FTP_Client_Callback
:public TAO_AV_Callback
{
public:
- FTP_Client_Callback (void);
+ FTP_Client_Callback ();
virtual int handle_timeout (void *arg);
- virtual int handle_end_stream (void);
+ virtual int handle_end_stream ();
virtual void get_timeout (ACE_Time_Value *&tv,
void *&arg);
// virtual int get_frame (ACE_Message_Block *&block,TAO_AV_frame_info *&frame_info);
@@ -50,15 +50,15 @@ typedef TAO_FDev <FTP_Client_Producer,TAO_FlowConsumer> FTP_Client_FDev;
class Client
{
public:
- Client (void);
+ Client ();
int init (int argc, ACE_TCHAR *argv[]);
- int run (void);
- FILE *file (void);
- char *flowname (void);
- TAO_StreamCtrl* streamctrl (void);
- AVStreams::protocolSpec protocols (void);
- const char *format (void);
- const char *address (void);
+ int run ();
+ FILE *file ();
+ char *flowname ();
+ TAO_StreamCtrl* streamctrl ();
+ AVStreams::protocolSpec protocols ();
+ const char *format ();
+ const char *address ();
private:
int parse_args (int argc, ACE_TCHAR *argv[]);
int bind_to_server (const char *name);
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
index 568822bd25d..59ba69be705 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
@@ -1,6 +1,6 @@
#include "server.h"
-FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint (void)
+FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint ()
:TAO_FlowConsumer ("Data",FTP_SERVER::instance ()->protocols (),FTP_SERVER::instance ()->format ())
{
AVStreams::protocolSpec protocols (2);
@@ -30,7 +30,7 @@ FTP_Server_FlowEndPoint::get_callback (const char *,
}
int
-FTP_Server_Callback::handle_stop (void)
+FTP_Server_Callback::handle_stop ()
{
ACE_DEBUG ((LM_DEBUG,"FTP_Server_Callback::stop\n"));
ACE_OS::fclose (FTP_SERVER::instance ()->file ());
@@ -58,7 +58,7 @@ FTP_Server_Callback::receive_frame (ACE_Message_Block *frame,
}
int
-FTP_Server_Callback::handle_end_stream (void)
+FTP_Server_Callback::handle_end_stream ()
{
ACE_DEBUG ((LM_DEBUG,"FTP_SFP_Callback::end_stream\n"));
CORBA::ORB_var orb = TAO_AV_CORE::instance ()->orb ();
@@ -66,7 +66,7 @@ FTP_Server_Callback::handle_end_stream (void)
return 0;
}
-// FTP_Server_FDev::FTP_Server_FDev (void)
+// FTP_Server_FDev::FTP_Server_FDev ()
// :TAO_FDev ("Data")
// {
// }
@@ -86,14 +86,14 @@ FTP_Server_Callback::handle_end_stream (void)
// return endpoint->_this ();
// }
-Server::Server (void)
+Server::Server ()
{
reactive_strategy_.init (TAO_AV_CORE::instance ()->orb (),
TAO_AV_CORE::instance ()->poa ());
}
AVStreams::protocolSpec
-Server::protocols (void)
+Server::protocols ()
{
AVStreams::protocolSpec protocols (2);
protocols.length (2);
@@ -103,7 +103,7 @@ Server::protocols (void)
}
const char*
-Server::format (void)
+Server::format ()
{
return "UNS:ftp";
}
@@ -168,7 +168,7 @@ Server::init (int argc, ACE_TCHAR *argv[])
}
int
-Server::run (void)
+Server::run ()
{
try
{
@@ -210,7 +210,7 @@ Server::parse_args (int argc, ACE_TCHAR *argv[])
}
FILE*
-Server::file (void)
+Server::file ()
{
return this->fp_;
}
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
index 5cec3a1236f..753935e0b05 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
@@ -12,18 +12,18 @@ class FTP_Server_Callback
:public TAO_AV_Callback
{
public:
- virtual int handle_stop (void);
+ virtual int handle_stop ();
virtual int receive_frame (ACE_Message_Block *frame,
TAO_AV_frame_info *frame_info,
const ACE_Addr &);
- virtual int handle_end_stream (void);
+ virtual int handle_end_stream ();
};
class FTP_Server_FlowEndPoint
:public TAO_FlowConsumer
{
public:
- FTP_Server_FlowEndPoint (void);
+ FTP_Server_FlowEndPoint ();
int get_callback (const char *flowname,
TAO_AV_Callback *&callback);
};
@@ -32,7 +32,7 @@ public:
// :public TAO_FDev
// {
// public:
-// FTP_Server_FDev (void);
+// FTP_Server_FDev ();
// virtual AVStreams::FlowConsumer_ptr make_consumer (AVStreams::FlowConnection_ptr the_requester,
// AVStreams::QoS & the_qos,
// CORBA::Boolean_out met_qos,
@@ -48,13 +48,13 @@ typedef TAO_FDev <TAO_FlowProducer, FTP_Server_FlowEndPoint> FTP_Server_FDev;
class Server
{
public:
- Server (void);
+ Server ();
int init (int argc,
ACE_TCHAR *argv[]);
- int run (void);
- FILE *file (void);
- AVStreams::protocolSpec protocols (void);
- const char *format (void);
+ int run ();
+ FILE *file ();
+ AVStreams::protocolSpec protocols ();
+ const char *format ();
protected:
int parse_args (int argc, ACE_TCHAR *argv[]);
TAO_Naming_Client my_naming_client_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
index 15f68fb1acb..e7989d81d56 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
@@ -40,7 +40,7 @@ Receiver_StreamEndPoint::set_protocol_object (const char * flowname,
return 0;
}
-Receiver_Callback::Receiver_Callback (void)
+Receiver_Callback::Receiver_Callback ()
: frame_count_ (1),
mb_ (BUFSIZ)
{
@@ -66,7 +66,6 @@ Receiver_Callback::flowname (const char* flow_name)
"%C File Opened Successfully\n",
this->flowname_.c_str ()));
-
}
int
@@ -104,7 +103,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
}
int
-Receiver_Callback::handle_destroy (void)
+Receiver_Callback::handle_destroy ()
{
// Called when the distributer requests the stream to be shutdown.
ACE_DEBUG ((LM_DEBUG,
@@ -115,7 +114,7 @@ Receiver_Callback::handle_destroy (void)
return 0;
}
-Receiver::Receiver (void)
+Receiver::Receiver ()
: mmdevice_ (0),
frame_rate_ (30),
frame_count_ (0),
@@ -124,7 +123,7 @@ Receiver::Receiver (void)
{
}
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
{
}
@@ -217,7 +216,7 @@ Receiver::init (int argc,
}
TAO_AV_Protocol_Object*
-Receiver::protocol_object (void)
+Receiver::protocol_object ()
{
return this->protocol_object_;
}
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
index 83448da9579..0f5cdd0207e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
@@ -28,9 +28,8 @@
class Receiver_Callback : public TAO_AV_Callback
{
public:
-
/// Constructor.
- Receiver_Callback (void);
+ Receiver_Callback ();
// Method that is called when there is data to be received from a
// sender.
@@ -40,7 +39,7 @@ public:
// Called when the sender is done sending data and wants to close
// down the connection.
- int handle_destroy (void);
+ int handle_destroy ();
void flowname (const char*);
@@ -55,7 +54,6 @@ private:
/// File handle of the file into which received data is written.
FILE *output_file_;
-
};
/**
@@ -90,10 +88,10 @@ class Receiver
{
public:
/// Constructor
- Receiver (void);
+ Receiver ();
/// Destructor.
- ~Receiver (void);
+ ~Receiver ();
/// Initialize data components.
int init (int argc,
@@ -103,7 +101,7 @@ public:
void protocol_object (TAO_AV_Protocol_Object *protocol_object);
/// Set the protocol object corresponding to the transport protocol chosen.
- TAO_AV_Protocol_Object * protocol_object (void);
+ TAO_AV_Protocol_Object * protocol_object ();
protected:
/// The Naming Service Client.
@@ -133,5 +131,4 @@ protected:
/// Message block into which data is read from a file and then sent.
ACE_Message_Block mb_;
-
};
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
index 805b34997c8..bcd859a1f5b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
@@ -31,7 +31,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *,
return 0;
}
-Sender::Sender (void)
+Sender::Sender ()
: sender_mmdevice_ (0),
streamctrl_ (0),
frame_count_ (0),
@@ -52,7 +52,7 @@ Sender::protocol_object (TAO_AV_Protocol_Object *object)
}
void
-Sender::shutdown (void)
+Sender::shutdown ()
{
// File reading is complete, destroy the stream.
AVStreams::flowSpec stop_spec;
@@ -60,7 +60,6 @@ Sender::shutdown (void)
// Shut the orb down.
TAO_AV_CORE::instance ()->orb ()->shutdown (0);
-
}
int
@@ -97,7 +96,7 @@ Sender::parse_args (int argc,
// Method to get the object reference of the receiver
int
-Sender::bind_to_receiver (void)
+Sender::bind_to_receiver ()
{
CosNaming::Name name (1);
name.length (1);
@@ -229,7 +228,7 @@ Sender::init (int argc,
// Method to send data at the specified rate
int
-Sender::pace_data (void)
+Sender::pace_data ()
{
// The time that should lapse between two consecutive frames sent.
ACE_Time_Value inter_frame_time;
@@ -335,7 +334,6 @@ Sender::pace_data (void)
// Reset the message block.
this->mb_.reset ();
-
} // end while
ACE_OS::sleep (1);
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
index e26e31aa300..1d1c5311c02 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
@@ -61,26 +61,26 @@ class Sender
{
public:
/// Constructor
- Sender (void);
+ Sender ();
/// Method to initialize the various data components.
int init (int argc,
ACE_TCHAR *argv[]);
/// Method to pace and send data from a file.
- int pace_data (void);
+ int pace_data ();
/// Set the protocol object corresponding to the transport protocol chosen.
void protocol_object (TAO_AV_Protocol_Object *protocol_object);
- void shutdown (void);
+ void shutdown ();
private:
/// Method to parse the command line arguments.
int parse_args (int argc, ACE_TCHAR *argv[]);
/// Method that binds the sender to the receiver.
- int bind_to_receiver (void);
+ int bind_to_receiver ();
/// The endpoint strategy used by the sender.
SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
@@ -117,5 +117,4 @@ private:
/// Protocol object corresponding to the transport protocol selected.
ProtocolObject_Set protocol_object_;
-
};
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
index 4767b8cb342..034592b6f83 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
@@ -9,11 +9,11 @@ ACE_High_Res_Timer last_frame_sent_time;
ACE_Time_Value inter_frame_time;
// The time that should lapse between two consecutive frames sent.
-FTP_Client_Callback::FTP_Client_Callback (void)
+FTP_Client_Callback::FTP_Client_Callback ()
{
}
-FTP_Client_StreamEndPoint::FTP_Client_StreamEndPoint (void)
+FTP_Client_StreamEndPoint::FTP_Client_StreamEndPoint ()
{
}
@@ -36,7 +36,7 @@ FTP_Client_StreamEndPoint::set_protocol_object (const char *,
return 0;
}
-Client::Client (void)
+Client::Client ()
:client_mmdevice_ (&endpoint_strategy_),
count_ (0),
address_ (0),
@@ -99,26 +99,26 @@ Client::parse_args (int argc,
}
FILE *
-Client::file (void)
+Client::file ()
{
return this->fp_;
}
char*
-Client::flowname (void)
+Client::flowname ()
{
return this->flowname_;
}
TAO_StreamCtrl*
-Client::streamctrl (void)
+Client::streamctrl ()
{
return &this->streamctrl_;
}
int
-Client::frame_rate (void)
+Client::frame_rate ()
{
return this->frame_rate_;
}
@@ -126,7 +126,7 @@ Client::frame_rate (void)
// Method to get the object reference of the server
int
-Client::bind_to_server (void)
+Client::bind_to_server ()
{
// Initialize the naming services
if (my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0)
@@ -278,9 +278,8 @@ Client::init (int argc,
// Method to send data at the specified rate
int
-Client::pace_data (void)
+Client::pace_data ()
{
-
// Rate at which frames of data need to be sent.
this->frame_rate_ = CLIENT::instance ()->frame_rate ();
@@ -303,7 +302,6 @@ Client::pace_data (void)
try
{
-
// Continue to send data till the file is read to the end.
while (1)
{
@@ -377,7 +375,6 @@ Client::pace_data (void)
// Reset the mb.
this->mb.reset ();
-
} // end while
// Since the file is read stop the stream.
@@ -386,7 +383,6 @@ Client::pace_data (void)
// Shut the orb down.
TAO_AV_CORE::instance ()->orb ()->shutdown (0);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
index bc2d2f3a855..f7d997fb99c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
@@ -11,7 +11,6 @@
//=============================================================================
-
#ifndef TAO_AV_FTP_H
#define TAO_AV_FTP_H
@@ -36,7 +35,7 @@ class FTP_Client_Callback : public TAO_AV_Callback
{
public:
///Constructor
- FTP_Client_Callback (void);
+ FTP_Client_Callback ();
};
@@ -51,10 +50,9 @@ public:
*/
class FTP_Client_StreamEndPoint : public TAO_Client_StreamEndPoint
{
-
public:
/// Constructor
- FTP_Client_StreamEndPoint (void);
+ FTP_Client_StreamEndPoint ();
/// Create the application client callback and return its handle to the
/// AVStreams for further application callbacks
@@ -85,7 +83,7 @@ class Client
{
public:
/// Constructor
- Client (void);
+ Client ();
/// Method to initialize the various data components.
int init (int argc,
@@ -95,26 +93,26 @@ public:
void set_protocol_object (TAO_AV_Protocol_Object *protocol_object);
/// Method to pace and send data from a file.
- int pace_data (void);
+ int pace_data ();
/// File handle from which data is read to be sent.
- FILE *file (void);
+ FILE *file ();
/// The stream control interface that manages the stream set up
- TAO_StreamCtrl* streamctrl (void);
+ TAO_StreamCtrl* streamctrl ();
/// name of the flow set up.
- char *flowname (void);
+ char *flowname ();
/// The requested frame rate for sending each frame of data read from the file.
- int frame_rate (void);
+ int frame_rate ();
private:
/// Method to parse the command line arguments.
int parse_args (int argc, ACE_TCHAR *argv[]);
/// Method that binds the ftp client to the server
- int bind_to_server (void);
+ int bind_to_server ();
/// The reacfive strategy of the client.
ENDPOINT_STRATEGY endpoint_strategy_;
@@ -163,7 +161,6 @@ private:
/// Protocol object corresponding to the transport protocol selected.
TAO_AV_Protocol_Object* protocol_object_;
-
};
typedef ACE_Unmanaged_Singleton<Client,ACE_Null_Mutex> CLIENT;
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
index 27c0cc9c762..7dfca4aa58d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
@@ -51,7 +51,7 @@ FTP_Server_Callback::receive_frame (ACE_Message_Block *frame,
}
int
-FTP_Server_Callback::handle_destroy (void)
+FTP_Server_Callback::handle_destroy ()
{
// Called when the ftp client requests the stream to be shutdown.
ACE_DEBUG ((LM_DEBUG,
@@ -60,12 +60,12 @@ FTP_Server_Callback::handle_destroy (void)
return 0;
}
-Server::Server (void)
+Server::Server ()
: mmdevice_ (0)
{
}
-Server::~Server (void)
+Server::~Server ()
{
delete this->mmdevice_;
}
@@ -187,13 +187,13 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
while ( !done )
{
- if ( orb->work_pending( ) )
+ if ( orb->work_pending())
{
orb->perform_work ();
}
}
- orb->shutdown( 1 );
+ orb->shutdown(1);
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
index 9e79d0ccaea..fea72eda173 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
@@ -26,9 +26,7 @@
*/
class FTP_Server_Callback : public TAO_AV_Callback
{
-
public:
-
// Method that is called when there is data to be received from the ftp client.
int receive_frame (ACE_Message_Block *frame,
TAO_AV_frame_info *frame_info,
@@ -36,7 +34,7 @@ public:
// Called when the ftp client has finished reading the file and wants
// to close4 down the connection.
- int handle_destroy (void);
+ int handle_destroy ();
};
/**
@@ -71,10 +69,10 @@ class Server
{
public:
/// Constructor
- Server (void);
+ Server ();
/// Destructor.
- ~Server (void);
+ ~Server ();
/// Initialize data components.
int init (int argc,
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
index fd8a2e09260..f52576c9482 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
@@ -19,7 +19,7 @@ TimeStamp_Protocol_Object::TimeStamp_Protocol_Object (TAO_AV_Callback *callback,
int
-TimeStamp_Protocol_Object::handle_input (void)
+TimeStamp_Protocol_Object::handle_input ()
{
ssize_t n = this->transport_->recv (this->frame_->rd_ptr (),
this->frame_->size ());
@@ -33,7 +33,7 @@ TimeStamp_Protocol_Object::handle_input (void)
}
// int
-// TimeStamp_Protocol_Object::handle_input (void)
+// TimeStamp_Protocol_Object::handle_input ()
// {
// iovec iov;
// int iovcnt;
@@ -88,7 +88,6 @@ TimeStamp_Protocol_Object::handle_input (void)
// }
// else
// {
-
// ACE_DEBUG ((LM_DEBUG,
// "(%N|%l) Frame Size %d\n",
// n));
@@ -168,18 +167,18 @@ TimeStamp_Protocol_Object::send_frame (const char* buf,
/// end the stream.
int
-TimeStamp_Protocol_Object::destroy (void)
+TimeStamp_Protocol_Object::destroy ()
{
this->callback_->handle_destroy ();
return 0;
}
-TimeStamp_Protocol_Factory::TimeStamp_Protocol_Factory (void)
+TimeStamp_Protocol_Factory::TimeStamp_Protocol_Factory ()
{
}
-TimeStamp_Protocol_Factory::~TimeStamp_Protocol_Factory (void)
+TimeStamp_Protocol_Factory::~TimeStamp_Protocol_Factory ()
{
}
@@ -237,5 +236,3 @@ ACE_STATIC_SVC_DEFINE (TimeStamp_Protocol_Factory,
-
-
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h
index f940cb1133a..4e0b055a32f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h
@@ -16,7 +16,7 @@ class TAO_TS_Export TimeStamp_Protocol_Object : public TAO_AV_Protocol_Object
TimeStamp_Protocol_Object (TAO_AV_Callback *callback,
TAO_AV_Transport *transport);
- virtual int handle_input (void);
+ virtual int handle_input ();
/// send a data frame.
virtual int send_frame (ACE_Message_Block *frame,
@@ -30,7 +30,7 @@ class TAO_TS_Export TimeStamp_Protocol_Object : public TAO_AV_Protocol_Object
size_t len);
/// end the stream.
- virtual int destroy (void);
+ virtual int destroy ();
private:
/// Pre-allocated memory to receive the data...
@@ -41,8 +41,8 @@ class TAO_TS_Export TimeStamp_Protocol_Factory : public TAO_AV_Flow_Protocol_Fac
{
public:
/// Initialization hook.
- TimeStamp_Protocol_Factory (void);
- virtual ~TimeStamp_Protocol_Factory (void);
+ TimeStamp_Protocol_Factory ();
+ virtual ~TimeStamp_Protocol_Factory ();
virtual int init (int argc, ACE_TCHAR *argv[]);
virtual int match_protocol (const char *flow_string);
// Note : Some platforms still don't support Covariant returns
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
index e470d872208..77b08b6b154 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
@@ -20,7 +20,7 @@ Receiver_StreamEndPoint::get_callback (const char *,
return 0;
}
-Receiver_Callback::Receiver_Callback (void)
+Receiver_Callback::Receiver_Callback ()
: frame_count_ (1)
{
}
@@ -68,7 +68,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
}
int
-Receiver_Callback::handle_destroy (void)
+Receiver_Callback::handle_destroy ()
{
// Called when the distributer requests the stream to be shutdown.
ACE_DEBUG ((LM_DEBUG,
@@ -78,12 +78,12 @@ Receiver_Callback::handle_destroy (void)
return 0;
}
-Receiver::Receiver (void)
+Receiver::Receiver ()
: mmdevice_ (0)
{
}
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
{
}
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
index 1d8ccea084b..872f4213484 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
@@ -27,9 +27,8 @@
class Receiver_Callback : public TAO_AV_Callback
{
public:
-
/// Constructor.
- Receiver_Callback (void);
+ Receiver_Callback ();
// Method that is called when there is data to be received from a
// sender.
@@ -39,7 +38,7 @@ public:
// Called when the sender is done sending data and wants to close
// down the connection.
- int handle_destroy (void);
+ int handle_destroy ();
private:
/// Keeping a count of the incoming frames.
@@ -77,10 +76,10 @@ class Receiver
{
public:
/// Constructor
- Receiver (void);
+ Receiver ();
/// Destructor.
- ~Receiver (void);
+ ~Receiver ();
/// Initialize data components.
int init (int argc,
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
index ec3f5548c13..330e26f925e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
@@ -31,7 +31,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *,
return 0;
}
-Sender::Sender (void)
+Sender::Sender ()
: sender_mmdevice_ (0),
streamctrl_ (0),
frame_count_ (0),
@@ -85,7 +85,7 @@ Sender::parse_args (int argc,
// Method to get the object reference of the receiver
int
-Sender::bind_to_receiver (void)
+Sender::bind_to_receiver ()
{
CosNaming::Name name (1);
name.length (1);
@@ -205,7 +205,7 @@ Sender::init (int argc,
// Method to send data at the specified rate
int
-Sender::pace_data (void)
+Sender::pace_data ()
{
// The time that should lapse between two consecutive frames sent.
ACE_Time_Value inter_frame_time;
@@ -305,7 +305,6 @@ Sender::pace_data (void)
// Reset the message block.
this->mb_.reset ();
-
} // end while
// File reading is complete, destroy the stream.
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
index e1e92fced3c..806320d3b2d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
@@ -58,14 +58,14 @@ class Sender
{
public:
/// Constructor
- Sender (void);
+ Sender ();
/// Method to initialize the various data components.
int init (int argc,
ACE_TCHAR *argv[]);
/// Method to pace and send data from a file.
- int pace_data (void);
+ int pace_data ();
/// Set the protocol object corresponding to the transport protocol chosen.
void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -75,7 +75,7 @@ private:
int parse_args (int argc, ACE_TCHAR *argv[]);
/// Method that binds the sender to the receiver.
- int bind_to_receiver (void);
+ int bind_to_receiver ();
/// The endpoint strategy used by the sender.
SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/README b/TAO/orbsvcs/tests/AVStreams/README
index 0da167d0893..f8afb0c5fe8 100644
--- a/TAO/orbsvcs/tests/AVStreams/README
+++ b/TAO/orbsvcs/tests/AVStreams/README
@@ -1,5 +1,3 @@
-
-
TAO Audio/Video Streaming service
---------------------------------
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
index 08e7e6c15ab..364a896a791 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
@@ -39,7 +39,7 @@ Distributer_Receiver_StreamEndPoint::get_callback (const char *,
return 0;
}
-Distributer_Receiver_Callback::Distributer_Receiver_Callback (void)
+Distributer_Receiver_Callback::Distributer_Receiver_Callback ()
: frame_count_ (1)
{
}
@@ -69,7 +69,7 @@ Distributer_Receiver_Callback::receive_frame (ACE_Message_Block *frame,
}
int
-Distributer_Receiver_Callback::handle_destroy (void)
+Distributer_Receiver_Callback::handle_destroy ()
{
// Called when the sender requests the stream to be shutdown.
try
@@ -104,12 +104,12 @@ Distributer::sender_protocol_object (TAO_AV_Protocol_Object *object)
}
TAO_AV_Protocol_Object *
-Distributer::sender_protocol_object (void)
+Distributer::sender_protocol_object ()
{
return this->sender_protocol_object_;
}
-Distributer::Distributer (void)
+Distributer::Distributer ()
: distributer_receiver_mmdevice_ (0),
distributer_sender_mmdevice_ (0),
sender_protocol_object_ (0),
@@ -119,7 +119,7 @@ Distributer::Distributer (void)
{
}
-Distributer::~Distributer (void)
+Distributer::~Distributer ()
{
}
@@ -263,7 +263,7 @@ Distributer::init (int /*argc*/,
}
TAO_StreamCtrl *
-Distributer::receiver_streamctrl (void)
+Distributer::receiver_streamctrl ()
{
return this->receiver_streamctrl_;
}
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
index 071fc07d339..fa3ac21e854 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
@@ -27,9 +27,8 @@
class Distributer_Receiver_Callback : public TAO_AV_Callback
{
public:
-
/// Constructor.
- Distributer_Receiver_Callback (void);
+ Distributer_Receiver_Callback ();
// Method that is called when there is data to be received from a
// sender.
@@ -39,7 +38,7 @@ public:
// Called when the sender is done sending data and wants to close
// down the connection.
- int handle_destroy (void);
+ int handle_destroy ();
private:
/// Count of the frames passing through us.
@@ -112,10 +111,10 @@ class Distributer
{
public:
/// Constructor
- Distributer (void);
+ Distributer ();
/// Destructor.
- ~Distributer (void);
+ ~Distributer ();
/// Initialize data components.
int init (int argc,
@@ -126,11 +125,11 @@ public:
const ACE_CString &mmdevice_name);
/// Get the stream control of the receiver
- TAO_StreamCtrl *receiver_streamctrl (void);
+ TAO_StreamCtrl *receiver_streamctrl ();
/// Accessor methods to set/get our sender protocol object
int sender_protocol_object (TAO_AV_Protocol_Object *object);
- TAO_AV_Protocol_Object *sender_protocol_object (void);
+ TAO_AV_Protocol_Object *sender_protocol_object ();
// Flag to know when we are done.
int done () const;
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
index c5d8103778f..01c127152ad 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
@@ -17,7 +17,7 @@ Receiver_StreamEndPoint::get_callback (const char *,
return 0;
}
-Receiver_Callback::Receiver_Callback (void)
+Receiver_Callback::Receiver_Callback ()
: frame_count_ (1)
{
}
@@ -56,7 +56,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
}
int
-Receiver_Callback::handle_destroy (void)
+Receiver_Callback::handle_destroy ()
{
// Called when the distributer requests the stream to be shutdown.
ACE_DEBUG ((LM_DEBUG,
@@ -70,18 +70,17 @@ Receiver_Callback::handle_destroy (void)
{
ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
return -1;
-
}
return 0;
}
-Receiver::Receiver (void)
+Receiver::Receiver ()
: mmdevice_ (0)
{
}
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
{
}
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
index 1d8ccea084b..872f4213484 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
@@ -27,9 +27,8 @@
class Receiver_Callback : public TAO_AV_Callback
{
public:
-
/// Constructor.
- Receiver_Callback (void);
+ Receiver_Callback ();
// Method that is called when there is data to be received from a
// sender.
@@ -39,7 +38,7 @@ public:
// Called when the sender is done sending data and wants to close
// down the connection.
- int handle_destroy (void);
+ int handle_destroy ();
private:
/// Keeping a count of the incoming frames.
@@ -77,10 +76,10 @@ class Receiver
{
public:
/// Constructor
- Receiver (void);
+ Receiver ();
/// Destructor.
- ~Receiver (void);
+ ~Receiver ();
/// Initialize data components.
int init (int argc,
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
index 740430dec90..b874d5fb03c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
@@ -50,7 +50,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *,
return 0;
}
-Sender::Sender (void)
+Sender::Sender ()
: sender_mmdevice_ (0),
streamctrl_ (0),
frame_count_ (0),
@@ -171,7 +171,7 @@ Sender::init (int argc,
// Method to send data at the specified rate
int
-Sender::pace_data (void)
+Sender::pace_data ()
{
// The time that should lapse between two consecutive frames sent.
ACE_Time_Value inter_frame_time;
@@ -280,7 +280,6 @@ Sender::pace_data (void)
// Reset the message block.
this->mb_.reset ();
-
} // end while
// If a stream was setup, destroy it.
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
index 6b3e764d532..7b3a97863aa 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
@@ -58,14 +58,14 @@ class Sender
{
public:
/// Constructor
- Sender (void);
+ Sender ();
/// Method to initialize the various data components.
int init (int argc,
ACE_TCHAR *argv[]);
/// Method to pace and send data from a file.
- int pace_data (void);
+ int pace_data ();
/// Set the protocol object corresponding to the transport protocol chosen.
void protocol_object (TAO_AV_Protocol_Object *protocol_object);
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp
index 26ad37fdce5..83dfc47aa97 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.cpp
@@ -7,7 +7,6 @@
#endif /* __ACE_INLINE__ */
-
void
Receiver_Stats::accumulate (const Receiver_Stats &rhs)
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.h
index 8fb1f0083e1..3ca0e7fa23a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.h
@@ -33,7 +33,7 @@ public:
* The number of samples is pre-allocated, and cannot changes once
* the class is initialized.
*/
- Receiver_Stats (void);
+ Receiver_Stats ();
/// The number of samples received so far
ACE_UINT32 samples_count () const;
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.inl b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.inl
index cde3e4b96ea..e27a75f3a6e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.inl
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.inl
@@ -1,5 +1,5 @@
ACE_INLINE
-Receiver_Stats::Receiver_Stats (void)
+Receiver_Stats::Receiver_Stats ()
: samples_count_ (0)
, min_ (0)
, min_at_ (0)
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
index d1ee8185118..65b377646a3 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
@@ -26,7 +26,7 @@ Receiver_StreamEndPoint::get_callback (const char *,
return 0;
}
-Receiver_Callback::Receiver_Callback (void)
+Receiver_Callback::Receiver_Callback ()
: frame_count_ (0)
{
}
@@ -115,7 +115,7 @@ Receiver_Callback::dump_samples (const char* file)
}
int
-Receiver_Callback::handle_destroy (void)
+Receiver_Callback::handle_destroy ()
{
// Called when the distributer requests the stream to be shutdown.
ACE_DEBUG ((LM_DEBUG,
@@ -131,18 +131,17 @@ Receiver_Callback::handle_destroy (void)
{
ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
return -1;
-
}
return 0;
}
-Receiver::Receiver (void)
+Receiver::Receiver ()
: mmdevice_ (0)
{
}
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
{
}
@@ -279,8 +278,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
ACE_OS::sleep (1);
orb->destroy ();
-
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
index 21a7eece79a..c1ecdd5966c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
@@ -28,9 +28,8 @@
class Receiver_Callback : public TAO_AV_Callback
{
public:
-
/// Constructor.
- Receiver_Callback (void);
+ Receiver_Callback ();
// Method that is called when there is data to be received from a
// sender.
@@ -40,7 +39,7 @@ public:
// Called when the sender is done sending data and wants to close
// down the connection.
- int handle_destroy (void);
+ int handle_destroy ();
void dump_samples (const char* file);
@@ -49,7 +48,6 @@ private:
int frame_count_;
Receiver_Stats stats_;
-
};
/**
@@ -69,7 +67,6 @@ public:
private:
/// Receiver application callback.
Receiver_Callback callback_;
-
};
/**
@@ -84,10 +81,10 @@ class Receiver
{
public:
/// Constructor
- Receiver (void);
+ Receiver ();
/// Destructor.
- ~Receiver (void);
+ ~Receiver ();
/// Initialize data components.
int init (int argc,
@@ -104,6 +101,4 @@ protected:
/// Receiver MMDevice.
TAO_MMDevice *mmdevice_;
-
-
};
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
index 48b4b51d641..1ef57c5fc35 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
@@ -32,7 +32,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *,
return 0;
}
-Sender::Sender (void)
+Sender::Sender ()
: sender_mmdevice_ (0),
streamctrl_ (0),
frame_count_ (0),
@@ -139,7 +139,7 @@ Sender::parse_args (int argc,
// Method to get the object reference of the receiver
int
-Sender::bind_to_receiver (void)
+Sender::bind_to_receiver ()
{
CosNaming::Name name (1);
name.length (1);
@@ -290,7 +290,7 @@ Sender::init (int argc,
// Method to send data at the specified rate
int
-Sender::pace_data (void)
+Sender::pace_data ()
{
// The time that should lapse between two consecutive frames sent.
ACE_Time_Value inter_frame_time;
@@ -396,7 +396,6 @@ Sender::pace_data (void)
// Reset the message block.
this->mb_.reset ();
-
} // end while
// File reading is complete, destroy the stream.
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
index 54c3a285e89..dfd7069736a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
@@ -58,14 +58,14 @@ class Sender
{
public:
/// Constructor
- Sender (void);
+ Sender ();
/// Method to initialize the various data components.
int init (int argc,
ACE_TCHAR *argv[]);
/// Method to pace and send data from a file.
- int pace_data (void);
+ int pace_data ();
/// Set the protocol object corresponding to the transport protocol chosen.
void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -75,7 +75,7 @@ private:
int parse_args (int argc, ACE_TCHAR *argv[]);
/// Method that binds the sender to the receiver.
- int bind_to_receiver (void);
+ int bind_to_receiver ();
/// The endpoint strategy used by the sender.
SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
@@ -129,5 +129,4 @@ private:
int num_peer_sec_addrs_;
long max_frame_count_;
-
};
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
index a4b8f17c4d0..1dda9921bb7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
@@ -18,7 +18,7 @@ Receiver_StreamEndPoint::get_callback (const char *,
return 0;
}
-Receiver_Callback::Receiver_Callback (void)
+Receiver_Callback::Receiver_Callback ()
: frame_count_ (0)
{
}
@@ -57,7 +57,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
}
int
-Receiver_Callback::handle_destroy (void)
+Receiver_Callback::handle_destroy ()
{
// Called when the distributer requests the stream to be shutdown.
ACE_DEBUG ((LM_DEBUG,
@@ -71,23 +71,21 @@ Receiver_Callback::handle_destroy (void)
{
ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
return -1;
-
}
return 0;
}
-Receiver::Receiver (void)
+Receiver::Receiver ()
: mmdevice_ (0)
{
}
-Receiver::~Receiver (void)
+Receiver::~Receiver ()
{
}
-
int
Receiver::init (int,
ACE_TCHAR *[])
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
index 89a97c1a1cd..39981ceb659 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
@@ -28,9 +28,8 @@
class Receiver_Callback : public TAO_AV_Callback
{
public:
-
/// Constructor.
- Receiver_Callback (void);
+ Receiver_Callback ();
// Method that is called when there is data to be received from a
// sender.
@@ -40,7 +39,7 @@ public:
// Called when the sender is done sending data and wants to close
// down the connection.
- int handle_destroy (void);
+ int handle_destroy ();
private:
/// Keeping a count of the incoming frames.
@@ -78,10 +77,10 @@ class Receiver
{
public:
/// Constructor
- Receiver (void);
+ Receiver ();
/// Destructor.
- ~Receiver (void);
+ ~Receiver ();
/// Initialize data components.
int init (int argc,
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
index 0c9d41de402..e75a3ebf319 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
@@ -56,7 +56,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *,
return 0;
}
-Sender::Sender (void)
+Sender::Sender ()
: sender_mmdevice_ (0),
streamctrl_ (0),
frame_count_ (0),
@@ -183,7 +183,7 @@ Sender::fill_qos (AVStreams::streamQoS &qos)
// Method to get the object reference of the receiver
int
-Sender::bind_to_receiver (void)
+Sender::bind_to_receiver ()
{
CosNaming::Name name (1);
name.length (1);
@@ -340,10 +340,8 @@ Sender::init (int argc,
// Method to send data at the specified rate
int
-Sender::pace_data (void)
+Sender::pace_data ()
{
-
-
// The time between two consecutive frames.
inter_frame_time.set (1.0 / this->frame_rate_);
@@ -466,7 +464,6 @@ Sender::pace_data (void)
// Shut the orb down.
TAO_AV_CORE::instance ()->orb ()->shutdown (0);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
index c3a323f966f..36c44d8c2f2 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
@@ -60,14 +60,14 @@ class Sender
{
public:
/// Constructor
- Sender (void);
+ Sender ();
/// Method to initialize the various data components.
int init (int argc,
ACE_TCHAR *argv[]);
/// Method to pace and send data from a file.
- int pace_data (void);
+ int pace_data ();
/// Set the protocol object corresponding to the transport protocol chosen.
void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -80,7 +80,7 @@ private:
int parse_args (int argc, ACE_TCHAR *argv[]);
/// Method that binds the sender to the receiver.
- int bind_to_receiver (void);
+ int bind_to_receiver ();
/// The endpoint strategy used by the sender.
SENDER_ENDPOINT_STRATEGY endpoint_strategy_;