summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/PSS
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/PSS')
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp31
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Code_Gen.h14
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Exception_Visitor.cpp4
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp40
-rw-r--r--TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp2
5 files changed, 39 insertions, 52 deletions
diff --git a/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp b/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp
index 1ea00ad9f20..f070e65ec31 100644
--- a/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp
@@ -29,15 +29,13 @@ TAO_PSDL_Code_Gen::~TAO_PSDL_Code_Gen (void)
int
TAO_PSDL_Code_Gen::set_codec (void)
{
- ACE_DECLARE_NEW_CORBA_ENV;
// Obtain a reference to the CodecFactory.
CORBA::Object_var obj =
- this->orb_->resolve_initial_references ("CodecFactory"
- ACE_ENV_ARG_PARAMETER);
+ this->orb_->resolve_initial_references ("CodecFactory");
IOP::CodecFactory_var codec_factory =
- IOP::CodecFactory::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+ IOP::CodecFactory::_narrow (obj.in ());
// Set up a structure that contains information necessary to
// create a GIOP 1.1 CDR encapsulation Codec.
@@ -48,7 +46,7 @@ TAO_PSDL_Code_Gen::set_codec (void)
// Obtain the CDR encapsulation Codec.
this->codec_ =
- codec_factory->create_codec (encoding ACE_ENV_ARG_PARAMETER);
+ codec_factory->create_codec (encoding);
if (this->codec_.in () == 0)
{
@@ -61,8 +59,7 @@ TAO_PSDL_Code_Gen::set_codec (void)
int
TAO_PSDL_Code_Gen::set_name_obj_ref (const char *name,
- const char *string_obj_ref
- ACE_ENV_ARG_DECL)
+ const char *string_obj_ref)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Invoke the helper encode method which will
@@ -71,8 +68,7 @@ TAO_PSDL_Code_Gen::set_name_obj_ref (const char *name,
// hash_map to the database.
// Encode the stringified object reference to a CORBA::OctetSeq *
- CORBA::OctetSeq_var octet_seq = this->encode (string_obj_ref
- ACE_ENV_ARG_PARAMETER);
+ CORBA::OctetSeq_var octet_seq = this->encode (string_obj_ref);
// Insert the new entry to the hash map which contains all the
// name-octet_seq entries. And, write the hash_map to a file.
@@ -96,8 +92,7 @@ TAO_PSDL_Code_Gen::set_name_obj_ref (const char *name,
}
const char *
-TAO_PSDL_Code_Gen::get_obj_ref (const char *name
- ACE_ENV_ARG_DECL)
+TAO_PSDL_Code_Gen::get_obj_ref (const char *name)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Get from the hash_map saved in the database, the corresponding entry
@@ -113,8 +108,7 @@ TAO_PSDL_Code_Gen::get_obj_ref (const char *name
if (result == 0)
{
// Decode the octet_seq.
- const char *obj_ref = this->decode (octet_seq
- ACE_ENV_ARG_PARAMETER);
+ const char *obj_ref = this->decode (octet_seq);
return CORBA::string_dup (obj_ref);
}
@@ -129,8 +123,7 @@ TAO_PSDL_Code_Gen::get_obj_ref (const char *name
CORBA::OctetSeq *
-TAO_PSDL_Code_Gen::encode (const char *string_obj_ref
- ACE_ENV_ARG_DECL)
+TAO_PSDL_Code_Gen::encode (const char *string_obj_ref)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::Any data;
@@ -138,7 +131,7 @@ TAO_PSDL_Code_Gen::encode (const char *string_obj_ref
CORBA::OctetSeq *encoded_data = 0;
- encoded_data = this->codec_->encode (data ACE_ENV_ARG_PARAMETER);
+ encoded_data = this->codec_->encode (data);
CORBA::OctetSeq_var safe_encoded_data = encoded_data;
@@ -146,16 +139,14 @@ TAO_PSDL_Code_Gen::encode (const char *string_obj_ref
}
const char *
-TAO_PSDL_Code_Gen::decode (const CORBA::OctetSeq &data
- ACE_ENV_ARG_DECL)
+TAO_PSDL_Code_Gen::decode (const CORBA::OctetSeq &data)
ACE_THROW_SPEC ((CORBA::SystemException))
{
const char *extracted_value;
// Extract the data from the octet sequence.
CORBA::Any_var decoded_data =
- this->codec_->decode (data
- ACE_ENV_ARG_PARAMETER);
+ this->codec_->decode (data);
decoded_data.in() >>= extracted_value;
diff --git a/TAO/orbsvcs/PSS/PSDL_Code_Gen.h b/TAO/orbsvcs/PSS/PSDL_Code_Gen.h
index 60bfb96a508..7ec81dfdc5e 100644
--- a/TAO/orbsvcs/PSS/PSDL_Code_Gen.h
+++ b/TAO/orbsvcs/PSS/PSDL_Code_Gen.h
@@ -46,32 +46,28 @@ class TAO_PSDL_Export TAO_PSDL_Code_Gen
/// Initializes a IOP::CodecFactory and IOP::Codec to take care of
/// the marshalling and demarshalling of data.
int set_codec (void);
-
+
/// Method to save the name-stringified object reference pair
/// to the database. Returns -1 on failure.
int set_name_obj_ref (const char *name,
- const char *string_obj_ref
- ACE_ENV_ARG_DECL)
+ const char *string_obj_ref)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Get the stringified form of the object reference given the name
/// of the object.
- const char *get_obj_ref (const char *name
- ACE_ENV_ARG_DECL)
+ const char *get_obj_ref (const char *name)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
/// Helper method which serializes the data and saves it to the
/// database.
- CORBA::OctetSeq *encode (const char *string_obj_ref
- ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+ CORBA::OctetSeq *encode (const char *string_obj_ref)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Helper method to get the octet sequence
- const char *decode (const CORBA::OctetSeq &data
- ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+ const char *decode (const CORBA::OctetSeq &data)
ACE_THROW_SPEC ((CORBA::SystemException));
/// File where the persistent data is stored.
diff --git a/TAO/orbsvcs/PSS/PSDL_Exception_Visitor.cpp b/TAO/orbsvcs/PSS/PSDL_Exception_Visitor.cpp
index b9644240c23..65932b082f1 100644
--- a/TAO/orbsvcs/PSS/PSDL_Exception_Visitor.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Exception_Visitor.cpp
@@ -165,12 +165,12 @@ TAO_PSDL_Exception_Visitor::print_class_for_exception (void)
*ps_sh << "\n";
*ps_sh << " virtual void _tao_encode (\n";
*ps_sh << " TAO_OutputCDR &\n";
- *ps_sh << " ACE_ENV_ARG_DECL_NOT_USED\n";
+ *ps_sh << "\n";
*ps_sh << " ) const;\n";
*ps_sh << " \n";
*ps_sh << " virtual void _tao_decode (\n";
*ps_sh << " TAO_InputCDR &\n";
- *ps_sh << " ACE_ENV_ARG_DECL_NOT_USED\n";
+ *ps_sh << "\n";
*ps_sh << " );\n";
*ps_sh << " \n";
diff --git a/TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp b/TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp
index 08d6005e47a..e90926cd1fa 100644
--- a/TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp
@@ -226,7 +226,7 @@ TAO_PSDL_Interface_Visitor::print_for_forward_dcl (void)
*ps_sh << "CORBA::Object *";
ps_sh->nl ();
- *ps_sh << "ACE_ENV_ARG_DECL_NOT_USED";
+ *ps_sh << "";
ps_sh->decr_indent (0);
ps_sh->nl ();
@@ -382,7 +382,7 @@ TAO_PSDL_Interface_Visitor::print_for_forward_dcl (void)
*ps_sh << "CORBA::Object *";
ps_sh->nl ();
- *ps_sh << "ACE_ENV_ARG_DECL_NOT_USED";
+ *ps_sh << "";
ps_sh->decr_indent (0);
ps_sh->nl ();
@@ -471,13 +471,13 @@ TAO_PSDL_Interface_Visitor::print_class_for_interface (void)
*ps_sh << "static " << this->interface_name_ << "_ptr _narrow ("; ps_sh->nl ();
*ps_sh << "CORBA::Object_ptr obj"; ps_sh->nl ();
- *ps_sh << "ACE_ENV_ARG_DECL_WITH_DEFAULTS"; ps_sh->nl ();
+ *ps_sh << ""; ps_sh->nl ();
*ps_sh << ");"; ps_sh->nl ();
*ps_sh << "static " << this->interface_name_
<< "_ptr _unchecked_narrow ("; ps_sh->nl ();
*ps_sh << "CORBA::Object_ptr obj"; ps_sh->nl ();
- *ps_sh << "ACE_ENV_ARG_DECL_WITH_DEFAULTS"; ps_sh->nl ();
+ *ps_sh << ""; ps_sh->nl ();
*ps_sh << ");"; ps_sh->nl ();
*ps_sh << "static " << this->interface_name_ << "_ptr _nil (void)"; ps_sh->nl ();
@@ -504,7 +504,7 @@ TAO_PSDL_Interface_Visitor::print_end_for_interface (void)
*ps_sh << "virtual CORBA::Boolean _is_a ("; ps_sh->nl ();
*ps_sh << "const CORBA::Char *type_id"; ps_sh->nl ();
- *ps_sh << "ACE_ENV_ARG_DECL_WITH_DEFAULTS"; ps_sh->nl ();
+ *ps_sh << ""; ps_sh->nl ();
*ps_sh << ");"; ps_sh->nl ();
*ps_sh << "virtual void *_tao_QueryInterface (ptrdiff_t type);"; ps_sh->nl ();
@@ -620,7 +620,7 @@ TAO_PSDL_Interface_Visitor::print_end_for_interface (void)
*ps_sh << "virtual ~_TAO_" << this->interface_name_ << "_Proxy_Broker (void);"; ps_sh->nl ();
*ps_sh << "virtual _TAO_" << this->interface_name_ << "_Proxy_Impl &select_proxy ("; ps_sh->nl ();
*ps_sh << this->interface_name_ << "*object"; ps_sh->nl ();
- *ps_sh << "ACE_ENV_ARG_DECL_WITH_DEFAULTS"; ps_sh->nl ();
+ *ps_sh << ""; ps_sh->nl ();
*ps_sh << ") = 0;"; ps_sh->nl ();
*ps_sh << "protected:"; ps_sh->nl ();
@@ -659,7 +659,7 @@ TAO_PSDL_Interface_Visitor::print_end_for_interface (void)
*ps_sh << "virtual _TAO_" << this->interface_name_ << "_Proxy_Impl &select_proxy ("; ps_sh->nl ();
*ps_sh << this->interface_name_ << "*object"; ps_sh->nl ();
- *ps_sh << "ACE_ENV_ARG_DECL"; ps_sh->nl ();
+ *ps_sh << ""; ps_sh->nl ();
*ps_sh << ");"; ps_sh->nl ();
*ps_sh << "private:"; ps_sh->nl ();
@@ -771,7 +771,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
*ps_si << "CORBA::Object *p";
ps_si->nl ();
- *ps_si << "ACE_ENV_ARG_DECL"; ps_si->nl ();
+ *ps_si << ""; ps_si->nl ();
*ps_si << ")";
ps_si->decr_indent (0);
ps_si->nl ();
@@ -781,7 +781,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
ps_si->nl ();
*ps_si << "return " << this->interface_name_
- << "::_narrow (p ACE_ENV_ARG_PARAMETER);";
+ << "::_narrow (p);";
ps_si->decr_indent (0);
ps_si->nl ();
*ps_si << "}";
@@ -1126,7 +1126,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
ps_si->nl ();
*ps_si << "CORBA::Object *p"; ps_si->nl ();
- *ps_si << "ACE_ENV_ARG_DECL"; ps_si->nl ();
+ *ps_si << ""; ps_si->nl ();
*ps_si << ")";
ps_si->decr_indent (0);
@@ -1137,7 +1137,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
ps_si->nl ();
*ps_si << "return ::" << this->interface_name_
- << "::_narrow (p ACE_ENV_ARG_PARAMETER);";
+ << "::_narrow (p);";
ps_si->decr_indent (0);
ps_si->nl ();
@@ -1474,7 +1474,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
ps_si->incr_indent (0);
ps_si->nl ();
*ps_si << "::" << this->interface_name_ << " *"; ps_si->nl ();
- *ps_si << "ACE_ENV_ARG_DECL_NOT_USED"; ps_si->nl ();
+ *ps_si << ""; ps_si->nl ();
*ps_si << ")";
ps_si->decr_indent (0);
ps_si->nl ();
@@ -1600,7 +1600,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
ps_si->incr_indent (0);
ps_si->nl ();
*ps_si << "CORBA::Object_ptr obj"; ps_si->nl ();
- *ps_si << "ACE_ENV_ARG_DECL";
+ *ps_si << "";
ps_si->decr_indent (0);
ps_si->nl ();
@@ -1629,7 +1629,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
ps_si->nl ();
*ps_si << "CORBA::Boolean is_a = obj->_is_a (\"IDL:"
- << this->interface_name_ << ":1.0\" ACE_ENV_ARG_PARAMETER);";
+ << this->interface_name_ << ":1.0\");";
ps_si->nl ();
*ps_si << "if (is_a == 0)";
@@ -1645,7 +1645,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
ps_si->nl ();
*ps_si << "return " << this->interface_name_
- << "::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);";
+ << "::_unchecked_narrow (obj);";
ps_si->decr_indent (0);
ps_si->nl ();
@@ -1660,7 +1660,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
ps_si->incr_indent (0);
ps_si->nl ();
*ps_si << "CORBA::Object_ptr obj"; ps_si->nl ();
- *ps_si << "ACE_ENV_ARG_DECL_NOT_USED"; ps_si->nl ();
+ *ps_si << ""; ps_si->nl ();
*ps_si << ")";
ps_si->decr_indent (0);
@@ -1856,7 +1856,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
ps_si->nl ();
*ps_si << "CORBA::Boolean " << this->interface_name_
- << "::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)"; ps_si->nl ();
+ << "::_is_a (const CORBA::Char *value)"; ps_si->nl ();
*ps_si << "{";
ps_si->incr_indent (0);
@@ -1879,7 +1879,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
ps_si->incr_indent (0);
ps_si->nl ();
- *ps_si << "return this->Object::_is_a (value ACE_ENV_ARG_PARAMETER);";
+ *ps_si << "return this->Object::_is_a (value);";
ps_si->decr_indent (0);
ps_si->decr_indent (0);
ps_si->nl ();
@@ -2141,7 +2141,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
ps_si->incr_indent (0);
ps_si->nl ();
*ps_si << "_tc_" << this->interface_name_ << ""; ps_si->nl ();
- *ps_si << "ACE_ENV_ARG_PARAMETER";
+ *ps_si << "";
ps_si->decr_indent (0);
ps_si->nl ();
@@ -2321,7 +2321,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void)
ps_si->nl ();
*ps_si << "obj.in ()"; ps_si->nl ();
- *ps_si << "ACE_ENV_ARG_PARAMETER";
+ *ps_si << "";
ps_si->decr_indent (0);
ps_si->nl ();
diff --git a/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp b/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp
index 553ad04e041..87662739954 100644
--- a/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Struct_Visitor.cpp
@@ -369,7 +369,7 @@ TAO_PSDL_Struct_Visitor::gen_code_for_si (void)
ps_si->incr_indent (0); ps_si->nl ();
*ps_si << "_tc_" << this->struct_name_ << ""; ps_si->nl ();
- *ps_si << "ACE_ENV_ARG_PARAMETER";
+ *ps_si << "";
ps_si->decr_indent (0); ps_si->nl ();
View Lorry Controller Status