diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/AV')
-rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/RTCP.h | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/RTP.h | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h | 8 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/TCP.h | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/Transport.h | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/UDP.h | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/default_resource.cpp | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/default_resource.h | 6 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/sfp.h | 2 |
12 files changed, 21 insertions, 21 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h index f18774d3006..2dae263ace9 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h +++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h @@ -87,7 +87,7 @@ public: /// Initialization hook. TAO_AV_Flow_Protocol_Factory (void); virtual ~TAO_AV_Flow_Protocol_Factory (void); - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); virtual int match_protocol (const char *flow_string); virtual TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry, TAO_Base_StreamEndPoint *endpoint, diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h index 27a585f0ff4..fb5b38ebb37 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h @@ -35,7 +35,7 @@ class TAO_AV_Export TAO_AV_UDP_QoS_Factory : public TAO_AV_Transport_Factory public: TAO_AV_UDP_QoS_Factory (void); virtual ~TAO_AV_UDP_QoS_Factory (void); - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); /// Initialization hook. virtual int match_protocol (const char *protocol_string); virtual TAO_AV_Acceptor *make_acceptor (void); @@ -255,7 +255,7 @@ class TAO_AV_UDP_QoS_Flow_Factory : public TAO_AV_Flow_Protocol_Factory public: TAO_AV_UDP_QoS_Flow_Factory (void); virtual ~TAO_AV_UDP_QoS_Flow_Factory (void); - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); /// Initialization hook. virtual int match_protocol (const char *flow_string); TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry, diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.h b/TAO/orbsvcs/orbsvcs/AV/RTCP.h index 58688376837..859acc4edcd 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.h @@ -121,7 +121,7 @@ class TAO_AV_Export TAO_AV_RTCP_Flow_Factory public: TAO_AV_RTCP_Flow_Factory (void); virtual ~TAO_AV_RTCP_Flow_Factory (void); - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); virtual int match_protocol (const char *flow_string); virtual TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry, TAO_Base_StreamEndPoint *endpoint, diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.h b/TAO/orbsvcs/orbsvcs/AV/RTP.h index 8cc883386a4..8da7cacf08b 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTP.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTP.h @@ -405,7 +405,7 @@ public: /// Initialization hook. TAO_AV_RTP_Flow_Factory (void); virtual ~TAO_AV_RTP_Flow_Factory (void); - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); virtual int match_protocol (const char *flow_string); virtual TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry, TAO_Base_StreamEndPoint *endpoint, diff --git a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h index a14a9087531..4b32ac58a85 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h +++ b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h @@ -31,11 +31,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * The AV Streams resource factory loads the * pluggable transport and flow protocol factories * in the corresponding factory sets. - * + * * */ class TAO_AV_Export TAO_AV_Resource_Factory -: public ACE_Service_Object +: public ACE_Service_Object { public: @@ -44,8 +44,8 @@ public: */ //@{ /// Dynamic linking hook - virtual int init (int argc, char *argv[]) = 0; - + virtual int init (int argc, ACE_TCHAR *argv[]) = 0; + }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h index 5f8de3cca6e..2582eedbb53 100644 --- a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h +++ b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h @@ -48,7 +48,7 @@ public: /// Initialization hook. TAO_AV_SCTP_SEQ_Factory (void); virtual ~TAO_AV_SCTP_SEQ_Factory (void); - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); virtual int match_protocol (const char *protocol_string); virtual TAO_AV_Acceptor *make_acceptor (void); virtual TAO_AV_Connector *make_connector (void); @@ -284,7 +284,7 @@ public: /// Initialization hook. TAO_AV_SCTP_SEQ_Flow_Factory (void); virtual ~TAO_AV_SCTP_SEQ_Flow_Factory (void); - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); virtual int match_protocol (const char *flow_string); TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry, TAO_Base_StreamEndPoint *endpoint, diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.h b/TAO/orbsvcs/orbsvcs/AV/TCP.h index 1f51a7329be..f9993653b3b 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.h +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.h @@ -33,7 +33,7 @@ public: /// Initialization hook. TAO_AV_TCP_Factory (void); virtual ~TAO_AV_TCP_Factory (void); - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); virtual int match_protocol (const char *protocol_string); virtual TAO_AV_Acceptor *make_acceptor (void); virtual TAO_AV_Connector *make_connector (void); @@ -263,7 +263,7 @@ public: /// Initialization hook. TAO_AV_TCP_Flow_Factory (void); virtual ~TAO_AV_TCP_Flow_Factory (void); - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); virtual int match_protocol (const char *flow_string); TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry, TAO_Base_StreamEndPoint *endpoint, diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.h b/TAO/orbsvcs/orbsvcs/AV/Transport.h index c6e3f63ba57..985d61b333c 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.h +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.h @@ -328,7 +328,7 @@ public: /// Initialization hook. TAO_AV_Transport_Factory (void); virtual ~TAO_AV_Transport_Factory (void); - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); virtual int match_protocol (const char *protocol_string); virtual TAO_AV_Acceptor *make_acceptor (void); virtual TAO_AV_Connector *make_connector (void); diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.h b/TAO/orbsvcs/orbsvcs/AV/UDP.h index d7137bdd92d..0fe25d7d2c5 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.h +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.h @@ -32,7 +32,7 @@ public: /// Initialization hook. TAO_AV_UDP_Factory (void); virtual ~TAO_AV_UDP_Factory (void); - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); virtual int match_protocol (const char *protocol_string); virtual TAO_AV_Acceptor *make_acceptor (void); virtual TAO_AV_Connector *make_connector (void); @@ -270,7 +270,7 @@ public: /// Initialization hook. TAO_AV_UDP_Flow_Factory (void); virtual ~TAO_AV_UDP_Flow_Factory (void); - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); virtual int match_protocol (const char *flow_string); TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry, TAO_Base_StreamEndPoint *endpoint, diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp index 8db6c6c5644..d26bc33bb7c 100644 --- a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp @@ -41,7 +41,7 @@ TAO_AV_Default_Resource_Factory::~TAO_AV_Default_Resource_Factory (void) } int -TAO_AV_Default_Resource_Factory::init (int argc, char *argv[]) +TAO_AV_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.h b/TAO/orbsvcs/orbsvcs/AV/default_resource.h index 0bf2a7b930f..44d5352c388 100644 --- a/TAO/orbsvcs/orbsvcs/AV/default_resource.h +++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.h @@ -33,7 +33,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * The AV Streams resource factory loads the * pluggable transport and flow protocol factories * in the corresponding factory sets. - * + * * */ @@ -53,8 +53,8 @@ public: */ //@{ /// Dynamic linking hook - virtual int init (int argc, char *argv[]); - + virtual int init (int argc, ACE_TCHAR *argv[]); + }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.h b/TAO/orbsvcs/orbsvcs/AV/sfp.h index 35ab492f34f..448deee0337 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.h +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h @@ -288,7 +288,7 @@ class TAO_AV_Export TAO_AV_SFP_Factory : public TAO_AV_Flow_Protocol_Factory public: TAO_AV_SFP_Factory (void); virtual ~TAO_AV_SFP_Factory (void); - virtual int init (int argc, char *argv[]); + virtual int init (int argc, ACE_TCHAR *argv[]); // Initialization hook. virtual int match_protocol (const char *flow_string); virtual TAO_AV_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry, |