summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-01-11 04:52:32 +0000
committernanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-01-11 04:52:32 +0000
commit5bfcbc87a7a32c588f3c2703465683114c827b15 (patch)
tree20f09f16fd2bce3010b7cc99fbf036d732c7c8e1
parentbe336f052416767ee8356c206aed3b404ea0d863 (diff)
downloadATCD-5bfcbc87a7a32c588f3c2703465683114c827b15.tar.gz
Standardized env name
Diffstat
-rw-r--r--TAO/tao/Active_Object_Map.h28
-rw-r--r--TAO/tao/Active_Object_Map.i47
-rw-r--r--TAO/tao/Any.h2
-rw-r--r--TAO/tao/Any.i4
-rw-r--r--TAO/tao/CDR.h8
-rw-r--r--TAO/tao/CDR.i35
-rw-r--r--TAO/tao/Connect.cpp16
-rw-r--r--TAO/tao/Connect.h4
-rw-r--r--TAO/tao/DynAnyC.h28
-rw-r--r--TAO/tao/DynAny_i.h96
-rw-r--r--TAO/tao/DynArray_i.h94
-rw-r--r--TAO/tao/DynEnum_i.h90
-rw-r--r--TAO/tao/DynSequence_i.h96
-rw-r--r--TAO/tao/DynStruct_i.h94
-rw-r--r--TAO/tao/DynUnion_i.h100
-rw-r--r--TAO/tao/Environment.h2
-rw-r--r--TAO/tao/Exception.cpp34
-rw-r--r--TAO/tao/IIOP_Object.h4
-rw-r--r--TAO/tao/Invocation.cpp114
-rw-r--r--TAO/tao/Invocation.i27
-rw-r--r--TAO/tao/Marshal.i4
-rw-r--r--TAO/tao/ORB.h16
-rw-r--r--TAO/tao/ORB_Core.h2
-rw-r--r--TAO/tao/ORB_Core.i8
-rw-r--r--TAO/tao/Object.i8
-rw-r--r--TAO/tao/POA_CORBA.h296
-rw-r--r--TAO/tao/Server_Request.h6
-rw-r--r--TAO/tao/Stub.h6
-rw-r--r--TAO/tao/TAO.h2
29 files changed, 625 insertions, 646 deletions
diff --git a/TAO/tao/Active_Object_Map.h b/TAO/tao/Active_Object_Map.h
index 25a55e853c3..559d6344d09 100644
--- a/TAO/tao/Active_Object_Map.h
+++ b/TAO/tao/Active_Object_Map.h
@@ -9,7 +9,7 @@
// Active_Object_Map.h
//
// = AUTHOR
-// Aniruddha Gokhale
+// Aniruddha Gokhale
// Irfan Pyarali
// Carlos O'Ryan
//
@@ -32,7 +32,7 @@ public:
// Object id
CORBA::ULong generation_;
- // Generation count
+ // Generation count
PortableServer::Servant servant_;
// Servant pointer
@@ -132,7 +132,7 @@ public:
// if <servant> is found.
PortableServer::ObjectId *create_object_id (PortableServer::Servant servant,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
// Create an object id
virtual CORBA::ULong system_id_size (void) const;
@@ -224,7 +224,7 @@ public:
virtual int bind (const PortableServer::ObjectId &id,
PortableServer::Servant servant) = 0;
virtual int unbind (const PortableServer::ObjectId &id,
- PortableServer::Servant &servant) = 0;
+ PortableServer::Servant &servant) = 0;
virtual int find (const PortableServer::ObjectId &id,
PortableServer::Servant &servant) = 0;
virtual int find (const PortableServer::ObjectId &id);
@@ -232,7 +232,7 @@ public:
virtual int find (const PortableServer::Servant servant,
PortableServer::ObjectId &id);
virtual PortableServer::ObjectId *create_object_id (PortableServer::Servant servant,
- CORBA::Environment &env) = 0;
+ CORBA::Environment &TAO_IN_ENV) = 0;
virtual CORBA::ULong system_id_size (void) const = 0;
virtual int is_free (const TAO_Active_Object_Map_Entry &item) const = 0;
};
@@ -300,14 +300,14 @@ public:
protected:
// = Typedef for the hash map
- typedef ACE_Hash_Map_Manager_Ex<PortableServer::Servant,
- PortableServer::ObjectId,
+ typedef ACE_Hash_Map_Manager_Ex<PortableServer::Servant,
+ PortableServer::ObjectId,
TAO_Servant_Hash,
ACE_Equal_To<PortableServer::Servant>,
ACE_Null_Mutex>
REVERSE_MAP;
- REVERSE_MAP map_;
+ REVERSE_MAP map_;
// Hash map instance
};
@@ -360,7 +360,7 @@ class TAO_Export TAO_Dynamic_Hash_Active_Object_Map : public TAO_Active_Object_M
{
// = TITLE
//
- // Lookup strategy based on dynamic hashing.
+ // Lookup strategy based on dynamic hashing.
//
// = DESCRIPTION
//
@@ -387,12 +387,12 @@ public:
virtual int unbind (const PortableServer::ObjectId &id,
PortableServer::Servant &servant);
virtual PortableServer::ObjectId *create_object_id (PortableServer::Servant servant,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
virtual CORBA::ULong system_id_size (void) const;
virtual int is_free (const TAO_Active_Object_Map_Entry &item) const;
- typedef ACE_Hash_Map_Manager_Ex<PortableServer::ObjectId,
- PortableServer::Servant,
+ typedef ACE_Hash_Map_Manager_Ex<PortableServer::ObjectId,
+ PortableServer::Servant,
TAO_ObjectId_Hash,
ACE_Equal_To<PortableServer::ObjectId>,
ACE_Null_Mutex>
@@ -486,7 +486,7 @@ public:
virtual int unbind (const PortableServer::ObjectId &id,
PortableServer::Servant &servant);
virtual PortableServer::ObjectId *create_object_id (PortableServer::Servant servant,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
virtual CORBA::ULong system_id_size (void) const;
virtual int is_free (const TAO_Active_Object_Map_Entry &item) const;
virtual TAO_Active_Object_Map_Iterator_Impl *begin () const;
@@ -549,7 +549,7 @@ public:
PortableServer::Servant &servant);
virtual CORBA::ULong system_id_size (void) const;
virtual PortableServer::ObjectId *create_object_id (PortableServer::Servant servant,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
protected:
diff --git a/TAO/tao/Active_Object_Map.i b/TAO/tao/Active_Object_Map.i
index 8deb8a538f4..73b5edd8f60 100644
--- a/TAO/tao/Active_Object_Map.i
+++ b/TAO/tao/Active_Object_Map.i
@@ -33,7 +33,7 @@ TAO_Active_Object_Map_Impl::find (const PortableServer::Servant servant)
return this->find (servant, id);
}
-ACE_INLINE
+ACE_INLINE
TAO_Dynamic_Hash_Active_Object_Map::TAO_Dynamic_Hash_Active_Object_Map (CORBA::ULong size)
: hash_map_ (size),
counter_ (0)
@@ -86,7 +86,7 @@ TAO_Dynamic_Hash_Active_Object_Map::system_id_size (void) const
return sizeof (CORBA::ULong);
}
-ACE_INLINE int
+ACE_INLINE int
TAO_Dynamic_Hash_Active_Object_Map::is_free (const TAO_Active_Object_Map_Entry &item) const
{
ACE_UNUSED_ARG (item);
@@ -236,7 +236,7 @@ TAO_Linear_Active_Object_Map::system_id_size (void) const
return sizeof (CORBA::ULong);
}
-ACE_INLINE int
+ACE_INLINE int
TAO_Linear_Active_Object_Map::is_free (const TAO_Active_Object_Map_Entry &item) const
{
return item.is_free_;
@@ -332,64 +332,64 @@ TAO_Array_Active_Object_Map_Iterator::~TAO_Array_Active_Object_Map_Iterator (voi
{
}
-ACE_INLINE
+ACE_INLINE
TAO_Reverse_Active_Object_Map_Impl::TAO_Reverse_Active_Object_Map_Impl (void)
{
}
-ACE_INLINE
+ACE_INLINE
TAO_Reverse_Active_Object_Map_Impl::~TAO_Reverse_Active_Object_Map_Impl (void)
{
}
-ACE_INLINE
+ACE_INLINE
TAO_Reverse_Active_Object_Map_For_Unique_Id_Policy::TAO_Reverse_Active_Object_Map_For_Unique_Id_Policy (size_t size)
: map_ (size)
{
}
-ACE_INLINE
+ACE_INLINE
TAO_Reverse_Active_Object_Map_For_Unique_Id_Policy::~TAO_Reverse_Active_Object_Map_For_Unique_Id_Policy (void)
{
}
-ACE_INLINE int
+ACE_INLINE int
TAO_Reverse_Active_Object_Map_For_Unique_Id_Policy::bind (PortableServer::Servant servant,
const PortableServer::ObjectId &id)
{
return this->map_.bind (servant, id);
}
-ACE_INLINE int
+ACE_INLINE int
TAO_Reverse_Active_Object_Map_For_Unique_Id_Policy::unbind (PortableServer::Servant servant)
{
return this->map_.unbind (servant);
}
-ACE_INLINE int
+ACE_INLINE int
TAO_Reverse_Active_Object_Map_For_Unique_Id_Policy::find (const PortableServer::Servant servant,
PortableServer::ObjectId &id)
{
return this->map_.find (servant, id);
}
-ACE_INLINE int
+ACE_INLINE int
TAO_Reverse_Active_Object_Map_For_Unique_Id_Policy::find (PortableServer::Servant servant)
{
return this->map_.find (servant);
}
-ACE_INLINE
+ACE_INLINE
TAO_Reverse_Active_Object_Map_For_Multiple_Id_Policy::TAO_Reverse_Active_Object_Map_For_Multiple_Id_Policy (void)
{
}
-ACE_INLINE
+ACE_INLINE
TAO_Reverse_Active_Object_Map_For_Multiple_Id_Policy::~TAO_Reverse_Active_Object_Map_For_Multiple_Id_Policy (void)
{
}
-ACE_INLINE int
+ACE_INLINE int
TAO_Reverse_Active_Object_Map_For_Multiple_Id_Policy::bind (PortableServer::Servant servant,
const PortableServer::ObjectId &id)
{
@@ -400,7 +400,7 @@ TAO_Reverse_Active_Object_Map_For_Multiple_Id_Policy::bind (PortableServer::Serv
return 0;
}
-ACE_INLINE int
+ACE_INLINE int
TAO_Reverse_Active_Object_Map_For_Multiple_Id_Policy::unbind (PortableServer::Servant servant)
{
ACE_UNUSED_ARG (servant);
@@ -409,7 +409,7 @@ TAO_Reverse_Active_Object_Map_For_Multiple_Id_Policy::unbind (PortableServer::Se
return 0;
}
-ACE_INLINE int
+ACE_INLINE int
TAO_Reverse_Active_Object_Map_For_Multiple_Id_Policy::find (const PortableServer::Servant servant,
PortableServer::ObjectId &id)
{
@@ -420,7 +420,7 @@ TAO_Reverse_Active_Object_Map_For_Multiple_Id_Policy::find (const PortableServer
return -1;
}
-ACE_INLINE int
+ACE_INLINE int
TAO_Reverse_Active_Object_Map_For_Multiple_Id_Policy::find (PortableServer::Servant servant)
{
ACE_UNUSED_ARG (servant);
@@ -512,9 +512,9 @@ TAO_Active_Object_Map::bind (const PortableServer::ObjectId &id,
int result = this->impl_->bind (id, servant);
if (result != 0)
{
- return result;
+ return result;
}
-
+
result = this->reverse_impl_->bind (servant, id);
if (result != 0)
{
@@ -530,8 +530,8 @@ TAO_Active_Object_Map::unbind (const PortableServer::ObjectId &id,
{
int result = this->impl_->unbind (id, servant);
if (result != 0)
- return result;
-
+ return result;
+
return this->reverse_impl_->unbind (servant);
}
@@ -589,9 +589,9 @@ TAO_Active_Object_Map::end (void) const
ACE_INLINE PortableServer::ObjectId *
TAO_Active_Object_Map::create_object_id (PortableServer::Servant servant,
- CORBA::Environment &env)
+ CORBA::Environment &TAO_IN_ENV)
{
- return this->impl_->create_object_id (servant, env);
+ return this->impl_->create_object_id (servant, TAO_IN_ENV);
}
ACE_INLINE CORBA::ULong
@@ -599,4 +599,3 @@ TAO_Active_Object_Map::system_id_size (void) const
{
return this->impl_->system_id_size ();
}
-
diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h
index 6786f85a127..f49a80a7c4b 100644
--- a/TAO/tao/Any.h
+++ b/TAO/tao/Any.h
@@ -322,7 +322,7 @@ public:
// CDR accessor.
protected:
- void free_value (CORBA::Environment &env);
+ void free_value (CORBA::Environment &TAO_IN_ENV);
// Release the <value_>.
private:
diff --git a/TAO/tao/Any.i b/TAO/tao/Any.i
index c43178095b1..37d5c4783cb 100644
--- a/TAO/tao/Any.i
+++ b/TAO/tao/Any.i
@@ -6,11 +6,11 @@
ACE_INLINE void
CORBA_Any::replace (CORBA::TypeCode_ptr type,
const void *value,
- CORBA::Environment &env)
+ CORBA::Environment &TAO_IN_ENV)
{
// invoke the first form of the replace method and pass the default value
// (FALSE) for the "any_owns_data" parameter
- this->replace (type, value, 0, env);
+ this->replace (type, value, 0, TAO_IN_ENV);
}
// insertion operators
diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h
index 999f8a27619..d8903e60123 100644
--- a/TAO/tao/CDR.h
+++ b/TAO/tao/CDR.h
@@ -244,7 +244,7 @@ public:
TAO_InputCDR *src,
CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
// Append the contents of the CDR stream based on information
- // described by <tc>; returning any errors in <env>.
+ // described by <tc>; returning any errors in <TAO_IN_ENV>.
// @@ TODO: do we want a special method to write an array of
// strings and wstrings?
@@ -280,7 +280,7 @@ public:
const void *,
CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
// Marshalls the contents of <data> as described by the TypeCode in
- // <tc>. Any errors are reported though the <env> parameter.
+ // <tc>. Any errors are reported though the <TAO_IN_ENV> parameter.
private:
TAO_OutputCDR (const TAO_OutputCDR& rhs);
@@ -493,7 +493,7 @@ public:
const void *,
CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
// Demarshall the contents of the CDR stream into <data> as
- // described by <tc>; returning any errors in <env>.
+ // described by <tc>; returning any errors in <TAO_IN_ENV>.
// = We have one method per basic IDL type....
// They return 0 on failure and 1 on success.
@@ -523,7 +523,7 @@ public:
CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
// Skip the contents of the CDR stream based on information
- // described by <tc>; returning any errors in <env>.
+ // described by <tc>; returning any errors in <TAO_IN_ENV>.
int good_bit (void) const;
// returns zero if a problem has been detected.
diff --git a/TAO/tao/CDR.i b/TAO/tao/CDR.i
index c4ac921066c..b5e394a0e7a 100644
--- a/TAO/tao/CDR.i
+++ b/TAO/tao/CDR.i
@@ -343,16 +343,16 @@ ACE_INLINE CORBA::TypeCode::traverse_status
TAO_OutputCDR::encode (CORBA::TypeCode_ptr tc,
const void *data,
const void *data2,
- CORBA::Environment &env)
+ CORBA::Environment &TAO_IN_ENV)
{
TAO_Marshal_Object *mobj =
- this->factory_->make_marshal_object (tc, env);
- TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
+ this->factory_->make_marshal_object (tc, TAO_IN_ENV);
+ TAO_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
if (!mobj)
return CORBA::TypeCode::TRAVERSE_STOP;
- return mobj->encode (tc, data, data2, this, env);
+ return mobj->encode (tc, data, data2, this, TAO_IN_ENV);
}
ACE_INLINE int
@@ -666,32 +666,30 @@ ACE_INLINE CORBA::TypeCode::traverse_status
TAO_InputCDR::decode (CORBA::TypeCode_ptr tc,
const void *data,
const void *data2,
- CORBA::Environment &env)
+ CORBA::Environment &TAO_IN_ENV)
{
TAO_Marshal_Object *mobj =
- this->factory_->make_marshal_object (tc, env);
-
- TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
+ this->factory_->make_marshal_object (tc, TAO_IN_ENV);
+ TAO_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
if (!mobj)
return CORBA::TypeCode::TRAVERSE_STOP;
- return mobj->decode (tc, data, data2, this, env);
+ return mobj->decode (tc, data, data2, this, TAO_IN_ENV);
}
ACE_INLINE CORBA::TypeCode::traverse_status
TAO_InputCDR::skip (CORBA::TypeCode_ptr tc,
- CORBA::Environment &env)
+ CORBA::Environment &TAO_IN_ENV)
{
TAO_Marshal_Object *mobj =
- this->factory_->make_marshal_object (tc, env);
-
- TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
+ this->factory_->make_marshal_object (tc, TAO_IN_ENV);
+ TAO_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
if (mobj == 0)
return CORBA::TypeCode::TRAVERSE_STOP;
- return mobj->skip (tc, this, env);
+ return mobj->skip (tc, this, TAO_IN_ENV);
}
ACE_INLINE size_t
@@ -1174,15 +1172,14 @@ TAO_OutputCDR::append_wstring (TAO_InputCDR &stream)
ACE_INLINE CORBA::TypeCode::traverse_status
TAO_OutputCDR::append (CORBA::TypeCode_ptr tc,
TAO_InputCDR *src,
- CORBA::Environment &env)
+ CORBA::Environment &TAO_IN_ENV)
{
TAO_Marshal_Object *mobj =
- this->factory_->make_marshal_object (tc, env);
-
- TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
+ this->factory_->make_marshal_object (tc, TAO_IN_ENV);
+ TAO_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
if (mobj == 0)
return CORBA::TypeCode::TRAVERSE_STOP;
- return mobj->append (tc, src, this, env);
+ return mobj->append (tc, src, this, TAO_IN_ENV);
}
diff --git a/TAO/tao/Connect.cpp b/TAO/tao/Connect.cpp
index f8b4f16c571..a78b254fb19 100644
--- a/TAO/tao/Connect.cpp
+++ b/TAO/tao/Connect.cpp
@@ -193,7 +193,7 @@ TAO_Server_Connection_Handler::svc (void)
// <response_required> to zero if the request is for a oneway or
// non-zero if for a two-way and <output> to any necessary response
// (including errors). In case of errors, -1 is returned and
-// additional information carried in <env>.
+// additional information carried in <TAO_IN_ENV>.
// The request ID is needed by handle_input. It is passed back
// as reference.
@@ -202,22 +202,20 @@ TAO_Server_Connection_Handler::handle_message (TAO_InputCDR &input,
TAO_OutputCDR &output,
CORBA::Boolean &response_required,
CORBA::ULong &request_id,
- CORBA::Environment &env)
+ CORBA::Environment &TAO_IN_ENV)
{
// This will extract the request header, set <response_required> as
// appropriate.
IIOP_ServerRequest request (input,
output,
this->orb_core_,
- env);
+ TAO_IN_ENV);
+ TAO_CHECK_RETURN (-1);
// The request_id_ field in request will be 0 if something went
// wrong before it got a chance to read it out.
request_id = request.request_id ();
- if (env.exception ())
- return -1;
-
response_required = request.response_expected ();
// So, we read a request, now handle it using something more
@@ -236,12 +234,10 @@ TAO_Server_Connection_Handler::handle_message (TAO_InputCDR &input,
request,
0,
this->orb_core_,
- env);
-
+ TAO_IN_ENV);
// Need to check for any errors present in <env> and set the return
// code appropriately.
- if (env.exception () != 0)
- return -1;
+ TAO_CHECK_RETURN (-1);
return 0;
}
diff --git a/TAO/tao/Connect.h b/TAO/tao/Connect.h
index 3f4b977e30e..634445acbba 100644
--- a/TAO/tao/Connect.h
+++ b/TAO/tao/Connect.h
@@ -183,7 +183,7 @@ public:
// <response_required> to zero if the request is for a oneway or
// non-zero if for a two-way and <response> to any necessary
// response (including errors). In case of errors, -1 is returned
- // and additional information carried in <env>.
+ // and additional information carried in <TAO_IN_ENV>.
protected:
virtual int handle_locate (TAO_InputCDR &msg,
@@ -195,7 +195,7 @@ protected:
// setting <response_required> to one if no errors are encountered.
// The LocateRequestReply is placed into <response>. In case of
// errors, -1 is returned and additional information carried in
- // <env>.
+ // <TAO_IN_ENV>.
virtual void send_response (TAO_OutputCDR &response);
// Send <response> to the client on the other end.
diff --git a/TAO/tao/DynAnyC.h b/TAO/tao/DynAnyC.h
index d37e332bfc0..3185b9af17f 100644
--- a/TAO/tao/DynAnyC.h
+++ b/TAO/tao/DynAnyC.h
@@ -112,7 +112,7 @@ public:
static CORBA_DynAny_ptr _duplicate (CORBA_DynAny_ptr obj);
static CORBA_DynAny_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
static CORBA_DynAny_ptr _nil (void);
@@ -454,7 +454,7 @@ public:
);
virtual CORBA::Boolean _is_a (
const CORBA::Char *type_id,
- CORBA::Environment &env =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual const char* _interface_repository_id (void) const;
@@ -551,7 +551,7 @@ public:
static CORBA_DynEnum_ptr _duplicate (CORBA_DynEnum_ptr obj);
static CORBA_DynEnum_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
static CORBA_DynEnum_ptr _nil (void);
@@ -576,7 +576,7 @@ public:
);
virtual CORBA::Boolean _is_a (
const CORBA::Char *type_id,
- CORBA::Environment &env =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual const char* _interface_repository_id (void) const;
@@ -855,7 +855,7 @@ public:
// NameValuePairSeq
// *************************************************************
-class TAO_Export NameValuePairSeq : public
+class TAO_Export NameValuePairSeq : public
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
|| !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
_TAO_Unbounded_Sequence_NameValuePairSeq
@@ -1022,7 +1022,7 @@ public:
static CORBA_DynStruct_ptr _duplicate (CORBA_DynStruct_ptr obj);
static CORBA_DynStruct_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
static CORBA_DynStruct_ptr _nil (void);
@@ -1046,7 +1046,7 @@ public:
);
virtual CORBA::Boolean _is_a (
const CORBA::Char *type_id,
- CORBA::Environment &env =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual const char* _interface_repository_id (void) const;
@@ -1143,7 +1143,7 @@ public:
static CORBA_DynUnion_ptr _duplicate (CORBA_DynUnion_ptr obj);
static CORBA_DynUnion_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
static CORBA_DynUnion_ptr _nil (void);
@@ -1184,7 +1184,7 @@ public:
);
virtual CORBA::Boolean _is_a (
const CORBA::Char *type_id,
- CORBA::Environment &env =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual const char* _interface_repository_id (void) const;
@@ -1405,7 +1405,7 @@ public:
// AnySeq
// *************************************************************
-class TAO_Export AnySeq : public
+class TAO_Export AnySeq : public
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
|| !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
_TAO_Unbounded_Sequence_AnySeq
@@ -1572,7 +1572,7 @@ public:
static CORBA_DynSequence_ptr _duplicate (CORBA_DynSequence_ptr obj);
static CORBA_DynSequence_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
static CORBA_DynSequence_ptr _nil (void);
@@ -1597,7 +1597,7 @@ public:
);
virtual CORBA::Boolean _is_a (
const CORBA::Char *type_id,
- CORBA::Environment &env =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual const char* _interface_repository_id (void) const;
@@ -1694,7 +1694,7 @@ public:
static CORBA_DynArray_ptr _duplicate (CORBA_DynArray_ptr obj);
static CORBA_DynArray_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
static CORBA_DynArray_ptr _nil (void);
@@ -1710,7 +1710,7 @@ public:
);
virtual CORBA::Boolean _is_a (
const CORBA::Char *type_id,
- CORBA::Environment &env =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual const char* _interface_repository_id (void) const;
diff --git a/TAO/tao/DynAny_i.h b/TAO/tao/DynAny_i.h
index 71ec439914d..c8b64e54445 100644
--- a/TAO/tao/DynAny_i.h
+++ b/TAO/tao/DynAny_i.h
@@ -39,26 +39,26 @@ public:
// Functions common to all Dynamic Any types
void assign (CORBA_DynAny_ptr dyn_any,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
// Sets the value of the receiver to the value of the argument
- CORBA_DynAny_ptr copy (CORBA::Environment &env);
+ CORBA_DynAny_ptr copy (CORBA::Environment &TAO_IN_ENV);
// Creates a copy
- void destroy (CORBA::Environment &env);
+ void destroy (CORBA::Environment &TAO_IN_ENV);
// Makes sure the contents are disposed of correctly
void from_any (const CORBA::Any& any,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
// Assigns value from an Any argument
- CORBA::Any_ptr to_any (CORBA::Environment &env);
+ CORBA::Any_ptr to_any (CORBA::Environment &TAO_IN_ENV);
// Outputs contents as an Any
CORBA::TypeCode_ptr type (CORBA::Environment &);
// Returns the (constant) type
- CORBA_DynAny_ptr current_component (CORBA::Environment &env);
+ CORBA_DynAny_ptr current_component (CORBA::Environment &TAO_IN_ENV);
// In this class, there is only one
CORBA::Boolean next (CORBA::Environment &);
@@ -74,102 +74,102 @@ public:
// Insert and get functions
void insert_boolean (CORBA::Boolean value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_octet (CORBA::Octet value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_char (CORBA::Char value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_short (CORBA::Short value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_ushort (CORBA::UShort value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_long (CORBA::Long value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_ulong (CORBA::ULong value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_float (CORBA::Float value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_double (CORBA::Double value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_string (const char * value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_reference (CORBA::Object_ptr value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_typecode (CORBA::TypeCode_ptr value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_longlong (CORBA::LongLong value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_ulonglong (CORBA::ULongLong value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_wchar (CORBA::WChar value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_any (const CORBA::Any& value,
- CORBA::Environment &env);
- CORBA::Boolean get_boolean (CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
+ CORBA::Boolean get_boolean (CORBA::Environment &TAO_IN_ENV);
- CORBA::Octet get_octet (CORBA::Environment &env);
+ CORBA::Octet get_octet (CORBA::Environment &TAO_IN_ENV);
- CORBA::Char get_char (CORBA::Environment &env);
+ CORBA::Char get_char (CORBA::Environment &TAO_IN_ENV);
- CORBA::Short get_short (CORBA::Environment &env);
+ CORBA::Short get_short (CORBA::Environment &TAO_IN_ENV);
- CORBA::UShort get_ushort (CORBA::Environment &env);
+ CORBA::UShort get_ushort (CORBA::Environment &TAO_IN_ENV);
- CORBA::Long get_long (CORBA::Environment &env);
+ CORBA::Long get_long (CORBA::Environment &TAO_IN_ENV);
- CORBA::ULong get_ulong (CORBA::Environment &env);
+ CORBA::ULong get_ulong (CORBA::Environment &TAO_IN_ENV);
- CORBA::Float get_float (CORBA::Environment &env);
+ CORBA::Float get_float (CORBA::Environment &TAO_IN_ENV);
- CORBA::Double get_double (CORBA::Environment &env);
+ CORBA::Double get_double (CORBA::Environment &TAO_IN_ENV);
- char * get_string (CORBA::Environment &env);
+ char * get_string (CORBA::Environment &TAO_IN_ENV);
- CORBA::Object_ptr get_reference (CORBA::Environment &env);
+ CORBA::Object_ptr get_reference (CORBA::Environment &TAO_IN_ENV);
- CORBA::TypeCode_ptr get_typecode (CORBA::Environment &env);
+ CORBA::TypeCode_ptr get_typecode (CORBA::Environment &TAO_IN_ENV);
- CORBA::LongLong get_longlong (CORBA::Environment &env);
+ CORBA::LongLong get_longlong (CORBA::Environment &TAO_IN_ENV);
- CORBA::ULongLong get_ulonglong (CORBA::Environment &env);
+ CORBA::ULongLong get_ulonglong (CORBA::Environment &TAO_IN_ENV);
- CORBA::WChar get_wchar (CORBA::Environment &env);
+ CORBA::WChar get_wchar (CORBA::Environment &TAO_IN_ENV);
- CORBA::Any_ptr get_any (CORBA::Environment &env);
+ CORBA::Any_ptr get_any (CORBA::Environment &TAO_IN_ENV);
// The ORB DynAny-factory functions will call these so we don't need to
// keep an orb pointer in each DynAny object.
static CORBA_DynAny_ptr create_dyn_any (const CORBA_Any& any,
- CORBA::Environment& env);
+ CORBA::Environment &TAO_IN_ENV);
static CORBA_DynAny_ptr create_basic_dyn_any (CORBA_TypeCode_ptr tc,
- CORBA::Environment& env);
+ CORBA::Environment &TAO_IN_ENV);
static CORBA_DynStruct_ptr create_dyn_struct (CORBA_TypeCode_ptr tc,
- CORBA::Environment& env);
+ CORBA::Environment &TAO_IN_ENV);
static CORBA_DynSequence_ptr create_dyn_sequence (CORBA_TypeCode_ptr tc,
- CORBA::Environment& env);
+ CORBA::Environment &TAO_IN_ENV);
static CORBA_DynArray_ptr create_dyn_array (CORBA_TypeCode_ptr tc,
- CORBA::Environment& env);
+ CORBA::Environment &TAO_IN_ENV);
static CORBA_DynUnion_ptr create_dyn_union (CORBA_TypeCode_ptr tc,
- CORBA::Environment& env);
+ CORBA::Environment &TAO_IN_ENV);
static CORBA_DynEnum_ptr create_dyn_enum (CORBA_TypeCode_ptr tc,
- CORBA::Environment& env);
+ CORBA::Environment &TAO_IN_ENV);
// And an extra generic one (not required in the spec)
// that calls one of the above passing a typecode.
// Comes in handy in implementing some versions of current_component().
static CORBA_DynAny_ptr create_dyn_any (CORBA_TypeCode_ptr tc,
- CORBA::Environment& env);
+ CORBA::Environment &TAO_IN_ENV);
static CORBA::TCKind unalias (CORBA_TypeCode_ptr tc,
- CORBA::Environment& env);
+ CORBA::Environment &TAO_IN_ENV);
// Utility, in case we have tk_alias.
private:
@@ -185,5 +185,3 @@ private:
};
#endif /* TAO_DYNANY_I_H */
-
-
diff --git a/TAO/tao/DynArray_i.h b/TAO/tao/DynArray_i.h
index 6448d424e47..7c7f848ccd4 100644
--- a/TAO/tao/DynArray_i.h
+++ b/TAO/tao/DynArray_i.h
@@ -45,118 +45,118 @@ public:
// Assign/dump elements using IDL defined type AnySeq
- AnySeq_ptr get_elements (CORBA::Environment& env);
+ AnySeq_ptr get_elements (CORBA::Environment &TAO_IN_ENV);
void set_elements (const AnySeq& value,
- CORBA::Environment& env);
+ CORBA::Environment &TAO_IN_ENV);
// Functions common to all Dynamic Any types
void assign (CORBA_DynAny_ptr dyn_any,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
// Sets the value of the receiver to the value of the argument
- CORBA_DynAny_ptr copy (CORBA::Environment &env);
+ CORBA_DynAny_ptr copy (CORBA::Environment &TAO_IN_ENV);
// Creates a copy
- void destroy (CORBA::Environment &env);
+ void destroy (CORBA::Environment &TAO_IN_ENV);
// Makes sure the contents are disposed of correctly
void from_any (const CORBA::Any& any,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
// Assigns value from an Any argument
- CORBA::Any_ptr to_any (CORBA::Environment &env);
+ CORBA::Any_ptr to_any (CORBA::Environment &TAO_IN_ENV);
// Outputs contents as an Any
- CORBA::TypeCode_ptr type (CORBA::Environment &);
+ CORBA::TypeCode_ptr type (CORBA::Environment &TAO_IN_ENV);
// Returns the (constant) type
- CORBA_DynAny_ptr current_component (CORBA::Environment &env);
+ CORBA_DynAny_ptr current_component (CORBA::Environment &TAO_IN_ENV);
// Used in iterating through the contents
- CORBA::Boolean next (CORBA::Environment &);
+ CORBA::Boolean next (CORBA::Environment &TAO_IN_ENV);
// Returns next component
CORBA::Boolean seek (CORBA::Long index,
- CORBA::Environment &);
+ CORBA::Environment &TAO_IN_ENV);
// Jump to component at <index>
- void rewind (CORBA::Environment &);
+ void rewind (CORBA::Environment &TAO_IN_ENV);
// Makes first component the current one
// Insert and get functions
void insert_boolean (CORBA::Boolean value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_octet (CORBA::Octet value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_char (CORBA::Char value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_short (CORBA::Short value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_ushort (CORBA::UShort value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_long (CORBA::Long value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_ulong (CORBA::ULong value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_float (CORBA::Float value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_double (CORBA::Double value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_string (const char * value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_reference (CORBA::Object_ptr value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_typecode (CORBA::TypeCode_ptr value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_longlong (CORBA::LongLong value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_ulonglong (CORBA::ULongLong value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_wchar (CORBA::WChar value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_any (const CORBA::Any& value,
- CORBA::Environment &env);
- CORBA::Boolean get_boolean (CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
+ CORBA::Boolean get_boolean (CORBA::Environment &TAO_IN_ENV);
- CORBA::Octet get_octet (CORBA::Environment &env);
+ CORBA::Octet get_octet (CORBA::Environment &TAO_IN_ENV);
- CORBA::Char get_char (CORBA::Environment &env);
+ CORBA::Char get_char (CORBA::Environment &TAO_IN_ENV);
- CORBA::Short get_short (CORBA::Environment &env);
+ CORBA::Short get_short (CORBA::Environment &TAO_IN_ENV);
- CORBA::UShort get_ushort (CORBA::Environment &env);
+ CORBA::UShort get_ushort (CORBA::Environment &TAO_IN_ENV);
- CORBA::Long get_long (CORBA::Environment &env);
+ CORBA::Long get_long (CORBA::Environment &TAO_IN_ENV);
- CORBA::ULong get_ulong (CORBA::Environment &env);
+ CORBA::ULong get_ulong (CORBA::Environment &TAO_IN_ENV);
- CORBA::Float get_float (CORBA::Environment &env);
+ CORBA::Float get_float (CORBA::Environment &TAO_IN_ENV);
- CORBA::Double get_double (CORBA::Environment &env);
+ CORBA::Double get_double (CORBA::Environment &TAO_IN_ENV);
- char * get_string (CORBA::Environment &env);
+ char * get_string (CORBA::Environment &TAO_IN_ENV);
- CORBA::Object_ptr get_reference (CORBA::Environment &env);
+ CORBA::Object_ptr get_reference (CORBA::Environment &TAO_IN_ENV);
- CORBA::TypeCode_ptr get_typecode (CORBA::Environment &env);
+ CORBA::TypeCode_ptr get_typecode (CORBA::Environment &TAO_IN_ENV);
- CORBA::LongLong get_longlong (CORBA::Environment &env);
+ CORBA::LongLong get_longlong (CORBA::Environment &TAO_IN_ENV);
- CORBA::ULongLong get_ulonglong (CORBA::Environment &env);
+ CORBA::ULongLong get_ulonglong (CORBA::Environment &TAO_IN_ENV);
- CORBA::WChar get_wchar (CORBA::Environment &env);
+ CORBA::WChar get_wchar (CORBA::Environment &TAO_IN_ENV);
- CORBA::Any_ptr get_any (CORBA::Environment &env);
+ CORBA::Any_ptr get_any (CORBA::Environment &TAO_IN_ENV);
private:
- CORBA::TypeCode_ptr get_element_type (CORBA::Environment &env);
+ CORBA::TypeCode_ptr get_element_type (CORBA::Environment &TAO_IN_ENV);
// Returns the type of elements contained in the array.
CORBA::ULong get_arg_length (CORBA::TypeCode_ptr tc,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
// Gets the length of the array from the typecode
CORBA::TypeCode_var type_;
@@ -177,5 +177,3 @@ private:
};
#endif /* TAO_DYNARRAY_I_H */
-
-
diff --git a/TAO/tao/DynEnum_i.h b/TAO/tao/DynEnum_i.h
index 104e82474e3..e270b951d0d 100644
--- a/TAO/tao/DynEnum_i.h
+++ b/TAO/tao/DynEnum_i.h
@@ -44,49 +44,49 @@ public:
// Functions specific to DynEnum
// Get and set methods for enum's string and numeric value
- char* value_as_string (CORBA::Environment& env);
+ char* value_as_string (CORBA::Environment &TAO_IN_ENV);
void value_as_string (const char* value_as_string,
- CORBA::Environment& env);
+ CORBA::Environment &TAO_IN_ENV);
CORBA::ULong value_as_ulong (CORBA::Environment&);
void value_as_ulong (CORBA::ULong value_as_ulong,
- CORBA::Environment& env);
+ CORBA::Environment &TAO_IN_ENV);
// Functions common to all Dynamic Any types
void assign (CORBA_DynAny_ptr dyn_any,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
// Sets the value of the receiver to the value of the argument
- CORBA_DynAny_ptr copy (CORBA::Environment &env);
+ CORBA_DynAny_ptr copy (CORBA::Environment &TAO_IN_ENV);
// Creates a copy
- void destroy (CORBA::Environment &env);
+ void destroy (CORBA::Environment &TAO_IN_ENV);
// Makes sure the contents are disposed of correctly
void from_any (const CORBA::Any& any,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
// Assigns value from an Any argument
- CORBA::Any_ptr to_any (CORBA::Environment &env);
+ CORBA::Any_ptr to_any (CORBA::Environment &TAO_IN_ENV);
// Outputs contents as an Any
- CORBA::TypeCode_ptr type (CORBA::Environment &);
+ CORBA::TypeCode_ptr type (CORBA::Environment &TAO_IN_ENV);
// Returns the (constant) type
- CORBA_DynAny_ptr current_component (CORBA::Environment &env);
+ CORBA_DynAny_ptr current_component (CORBA::Environment &TAO_IN_ENV);
// Used in iterating through the contents
- CORBA::Boolean next (CORBA::Environment &);
+ CORBA::Boolean next (CORBA::Environment &TAO_IN_ENV);
// Returns next component
CORBA::Boolean seek (CORBA::Long index,
- CORBA::Environment &);
+ CORBA::Environment &TAO_IN_ENV);
// Jump to component at <index>
- void rewind (CORBA::Environment &);
+ void rewind (CORBA::Environment &TAO_IN_ENV);
// Makes first component the current one
// Insert and get functions
@@ -95,68 +95,68 @@ public:
// their presence, they will just throw an exception
void insert_boolean (CORBA::Boolean value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_octet (CORBA::Octet value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_char (CORBA::Char value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_short (CORBA::Short value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_ushort (CORBA::UShort value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_long (CORBA::Long value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_ulong (CORBA::ULong value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_float (CORBA::Float value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_double (CORBA::Double value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_string (const char * value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_reference (CORBA::Object_ptr value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_typecode (CORBA::TypeCode_ptr value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_longlong (CORBA::LongLong value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_ulonglong (CORBA::ULongLong value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_wchar (CORBA::WChar value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_any (const CORBA::Any& value,
- CORBA::Environment &env);
- CORBA::Boolean get_boolean (CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
+ CORBA::Boolean get_boolean (CORBA::Environment &TAO_IN_ENV);
- CORBA::Octet get_octet (CORBA::Environment &env);
+ CORBA::Octet get_octet (CORBA::Environment &TAO_IN_ENV);
- CORBA::Char get_char (CORBA::Environment &env);
+ CORBA::Char get_char (CORBA::Environment &TAO_IN_ENV);
- CORBA::Short get_short (CORBA::Environment &env);
+ CORBA::Short get_short (CORBA::Environment &TAO_IN_ENV);
- CORBA::UShort get_ushort (CORBA::Environment &env);
+ CORBA::UShort get_ushort (CORBA::Environment &TAO_IN_ENV);
- CORBA::Long get_long (CORBA::Environment &env);
+ CORBA::Long get_long (CORBA::Environment &TAO_IN_ENV);
- CORBA::ULong get_ulong (CORBA::Environment &env);
+ CORBA::ULong get_ulong (CORBA::Environment &TAO_IN_ENV);
- CORBA::Float get_float (CORBA::Environment &env);
+ CORBA::Float get_float (CORBA::Environment &TAO_IN_ENV);
- CORBA::Double get_double (CORBA::Environment &env);
+ CORBA::Double get_double (CORBA::Environment &TAO_IN_ENV);
- char * get_string (CORBA::Environment &env);
+ char * get_string (CORBA::Environment &TAO_IN_ENV);
- CORBA::Object_ptr get_reference (CORBA::Environment &env);
+ CORBA::Object_ptr get_reference (CORBA::Environment &TAO_IN_ENV);
- CORBA::TypeCode_ptr get_typecode (CORBA::Environment &env);
+ CORBA::TypeCode_ptr get_typecode (CORBA::Environment &TAO_IN_ENV);
- CORBA::LongLong get_longlong (CORBA::Environment &env);
+ CORBA::LongLong get_longlong (CORBA::Environment &TAO_IN_ENV);
- CORBA::ULongLong get_ulonglong (CORBA::Environment &env);
+ CORBA::ULongLong get_ulonglong (CORBA::Environment &TAO_IN_ENV);
- CORBA::WChar get_wchar (CORBA::Environment &env);
+ CORBA::WChar get_wchar (CORBA::Environment &TAO_IN_ENV);
- CORBA::Any_ptr get_any (CORBA::Environment &env);
+ CORBA::Any_ptr get_any (CORBA::Environment &TAO_IN_ENV);
private:
CORBA::TypeCode_var type_;
diff --git a/TAO/tao/DynSequence_i.h b/TAO/tao/DynSequence_i.h
index a0682f3a834..7552a1bee69 100644
--- a/TAO/tao/DynSequence_i.h
+++ b/TAO/tao/DynSequence_i.h
@@ -45,121 +45,121 @@ public:
// Get and set length of sequence
- CORBA::ULong length (CORBA::Environment &);
+ CORBA::ULong length (CORBA::Environment &TAO_IN_ENV);
void length (CORBA::ULong length,
- CORBA::Environment& env);
+ CORBA::Environment &TAO_IN_ENV);
// Assign and dump elements using IDL defined type AnySeq
- AnySeq_ptr get_elements (CORBA::Environment& env);
+ AnySeq_ptr get_elements (CORBA::Environment &TAO_IN_ENV);
void set_elements (const AnySeq& value,
- CORBA::Environment& env);
+ CORBA::Environment &TAO_IN_ENV);
// Functions common to all Dynamic Any types
void assign (CORBA_DynAny_ptr dyn_any,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
// Sets the value of the receiver to the value of the argument
- CORBA_DynAny_ptr copy (CORBA::Environment &env);
+ CORBA_DynAny_ptr copy (CORBA::Environment &TAO_IN_ENV);
// Creates a copy
- void destroy (CORBA::Environment &env);
+ void destroy (CORBA::Environment &TAO_IN_ENV);
// Makes sure the contents are disposed of correctly
void from_any (const CORBA::Any& any,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
// Assigns value from an Any argument
- CORBA::Any_ptr to_any (CORBA::Environment &env);
+ CORBA::Any_ptr to_any (CORBA::Environment &TAO_IN_ENV);
// Outputs contents as an Any
- CORBA::TypeCode_ptr type (CORBA::Environment &);
+ CORBA::TypeCode_ptr type (CORBA::Environment &TAO_IN_ENV);
// Returns the (constant) type
- CORBA_DynAny_ptr current_component (CORBA::Environment &env);
+ CORBA_DynAny_ptr current_component (CORBA::Environment &TAO_IN_ENV);
// Used in iterating through the contents
- CORBA::Boolean next (CORBA::Environment &);
+ CORBA::Boolean next (CORBA::Environment &TAO_IN_ENV);
// Returns next component
CORBA::Boolean seek (CORBA::Long index,
- CORBA::Environment &);
+ CORBA::Environment &TAO_IN_ENV);
// Jump to component at <index>
- void rewind (CORBA::Environment &);
+ void rewind (CORBA::Environment &TAO_IN_ENV);
// Makes first component the current one
// Insert and get functions
void insert_boolean (CORBA::Boolean value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_octet (CORBA::Octet value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_char (CORBA::Char value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_short (CORBA::Short value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_ushort (CORBA::UShort value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_long (CORBA::Long value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_ulong (CORBA::ULong value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_float (CORBA::Float value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_double (CORBA::Double value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_string (const char * value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_reference (CORBA::Object_ptr value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_typecode (CORBA::TypeCode_ptr value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_longlong (CORBA::LongLong value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_ulonglong (CORBA::ULongLong value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_wchar (CORBA::WChar value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_any (const CORBA::Any& value,
- CORBA::Environment &env);
- CORBA::Boolean get_boolean (CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
+ CORBA::Boolean get_boolean (CORBA::Environment &TAO_IN_ENV);
- CORBA::Octet get_octet (CORBA::Environment &env);
+ CORBA::Octet get_octet (CORBA::Environment &TAO_IN_ENV);
- CORBA::Char get_char (CORBA::Environment &env);
+ CORBA::Char get_char (CORBA::Environment &TAO_IN_ENV);
- CORBA::Short get_short (CORBA::Environment &env);
+ CORBA::Short get_short (CORBA::Environment &TAO_IN_ENV);
- CORBA::UShort get_ushort (CORBA::Environment &env);
+ CORBA::UShort get_ushort (CORBA::Environment &TAO_IN_ENV);
- CORBA::Long get_long (CORBA::Environment &env);
+ CORBA::Long get_long (CORBA::Environment &TAO_IN_ENV);
- CORBA::ULong get_ulong (CORBA::Environment &env);
+ CORBA::ULong get_ulong (CORBA::Environment &TAO_IN_ENV);
- CORBA::Float get_float (CORBA::Environment &env);
+ CORBA::Float get_float (CORBA::Environment &TAO_IN_ENV);
- CORBA::Double get_double (CORBA::Environment &env);
+ CORBA::Double get_double (CORBA::Environment &TAO_IN_ENV);
- char * get_string (CORBA::Environment &env);
+ char * get_string (CORBA::Environment &TAO_IN_ENV);
- CORBA::Object_ptr get_reference (CORBA::Environment &env);
+ CORBA::Object_ptr get_reference (CORBA::Environment &TAO_IN_ENV);
- CORBA::TypeCode_ptr get_typecode (CORBA::Environment &env);
+ CORBA::TypeCode_ptr get_typecode (CORBA::Environment &TAO_IN_ENV);
- CORBA::LongLong get_longlong (CORBA::Environment &env);
+ CORBA::LongLong get_longlong (CORBA::Environment &TAO_IN_ENV);
- CORBA::ULongLong get_ulonglong (CORBA::Environment &env);
+ CORBA::ULongLong get_ulonglong (CORBA::Environment &TAO_IN_ENV);
- CORBA::WChar get_wchar (CORBA::Environment &env);
+ CORBA::WChar get_wchar (CORBA::Environment &TAO_IN_ENV);
- CORBA::Any_ptr get_any (CORBA::Environment &env);
+ CORBA::Any_ptr get_any (CORBA::Environment &TAO_IN_ENV);
private:
- CORBA::TypeCode_ptr get_element_type (CORBA::Environment& env);
+ CORBA::TypeCode_ptr get_element_type (CORBA::Environment &TAO_IN_ENV);
// Utility, turns the type of elements contained in the sequence.
CORBA::TypeCode_var type_;
@@ -180,5 +180,3 @@ private:
};
#endif /* TAO_DYNSEQUENCE_I_H */
-
-
diff --git a/TAO/tao/DynStruct_i.h b/TAO/tao/DynStruct_i.h
index 1113bc23aff..23cb0fa4e0e 100644
--- a/TAO/tao/DynStruct_i.h
+++ b/TAO/tao/DynStruct_i.h
@@ -43,118 +43,118 @@ public:
// Functions specific to DynStruct
- FieldName current_member_name (CORBA::Environment& env);
+ FieldName current_member_name (CORBA::Environment &TAO_IN_ENV);
// FieldName is IDL typedef for string
- CORBA::TCKind current_member_kind (CORBA::Environment& env);
+ CORBA::TCKind current_member_kind (CORBA::Environment &TAO_IN_ENV);
// Assign and dump elements using IDL defined type NameValuePairSeq
- NameValuePairSeq* get_members (CORBA::Environment& env);
+ NameValuePairSeq* get_members (CORBA::Environment &TAO_IN_ENV);
void set_members (const NameValuePairSeq& value,
- CORBA::Environment& env);
+ CORBA::Environment &TAO_IN_ENV);
// Functions common to all Dynamic Any types
void assign (CORBA_DynAny_ptr dyn_any,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
// Sets the value of the receiver to the value of the argument
- CORBA_DynAny_ptr copy (CORBA::Environment &env);
+ CORBA_DynAny_ptr copy (CORBA::Environment &TAO_IN_ENV);
// Creates a copy
- void destroy (CORBA::Environment &env);
+ void destroy (CORBA::Environment &TAO_IN_ENV);
// Makes sure the contents are disposed of correctly
void from_any (const CORBA::Any& any,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
// Assigns value from an Any argument
- CORBA::Any_ptr to_any (CORBA::Environment &env);
+ CORBA::Any_ptr to_any (CORBA::Environment &TAO_IN_ENV);
// Outputs contents as an Any
- CORBA::TypeCode_ptr type (CORBA::Environment &);
+ CORBA::TypeCode_ptr type (CORBA::Environment &TAO_IN_ENV);
// Returns the (constant) type
- CORBA_DynAny_ptr current_component (CORBA::Environment &env);
+ CORBA_DynAny_ptr current_component (CORBA::Environment &TAO_IN_ENV);
// Used in iterating through the contents
- CORBA::Boolean next (CORBA::Environment &);
+ CORBA::Boolean next (CORBA::Environment &TAO_IN_ENV);
// Returns next component
CORBA::Boolean seek (CORBA::Long index,
- CORBA::Environment &);
+ CORBA::Environment &TAO_IN_ENV);
// Jump to component at <index>
- void rewind (CORBA::Environment &);
+ void rewind (CORBA::Environment &TAO_IN_ENV);
// Makes first component the current one
// Insert and get functions
void insert_boolean (CORBA::Boolean value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_octet (CORBA::Octet value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_char (CORBA::Char value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_short (CORBA::Short value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_ushort (CORBA::UShort value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_long (CORBA::Long value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_ulong (CORBA::ULong value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_float (CORBA::Float value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_double (CORBA::Double value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_string (const char * value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_reference (CORBA::Object_ptr value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_typecode (CORBA::TypeCode_ptr value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_longlong (CORBA::LongLong value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_ulonglong (CORBA::ULongLong value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_wchar (CORBA::WChar value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_any (const CORBA::Any& value,
- CORBA::Environment &env);
- CORBA::Boolean get_boolean (CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
+ CORBA::Boolean get_boolean (CORBA::Environment &TAO_IN_ENV);
- CORBA::Octet get_octet (CORBA::Environment &env);
+ CORBA::Octet get_octet (CORBA::Environment &TAO_IN_ENV);
- CORBA::Char get_char (CORBA::Environment &env);
+ CORBA::Char get_char (CORBA::Environment &TAO_IN_ENV);
- CORBA::Short get_short (CORBA::Environment &env);
+ CORBA::Short get_short (CORBA::Environment &TAO_IN_ENV);
- CORBA::UShort get_ushort (CORBA::Environment &env);
+ CORBA::UShort get_ushort (CORBA::Environment &TAO_IN_ENV);
- CORBA::Long get_long (CORBA::Environment &env);
+ CORBA::Long get_long (CORBA::Environment &TAO_IN_ENV);
- CORBA::ULong get_ulong (CORBA::Environment &env);
+ CORBA::ULong get_ulong (CORBA::Environment &TAO_IN_ENV);
- CORBA::Float get_float (CORBA::Environment &env);
+ CORBA::Float get_float (CORBA::Environment &TAO_IN_ENV);
- CORBA::Double get_double (CORBA::Environment &env);
+ CORBA::Double get_double (CORBA::Environment &TAO_IN_ENV);
- char * get_string (CORBA::Environment &env);
+ char * get_string (CORBA::Environment &TAO_IN_ENV);
- CORBA::Object_ptr get_reference (CORBA::Environment &env);
+ CORBA::Object_ptr get_reference (CORBA::Environment &TAO_IN_ENV);
- CORBA::TypeCode_ptr get_typecode (CORBA::Environment &env);
+ CORBA::TypeCode_ptr get_typecode (CORBA::Environment &TAO_IN_ENV);
- CORBA::LongLong get_longlong (CORBA::Environment &env);
+ CORBA::LongLong get_longlong (CORBA::Environment &TAO_IN_ENV);
- CORBA::ULongLong get_ulonglong (CORBA::Environment &env);
+ CORBA::ULongLong get_ulonglong (CORBA::Environment &TAO_IN_ENV);
- CORBA::WChar get_wchar (CORBA::Environment &env);
+ CORBA::WChar get_wchar (CORBA::Environment &TAO_IN_ENV);
- CORBA::Any_ptr get_any (CORBA::Environment &env);
+ CORBA::Any_ptr get_any (CORBA::Environment &TAO_IN_ENV);
private:
CORBA::TypeCode_var type_;
@@ -175,5 +175,3 @@ private:
};
#endif /* TAO_DYNSTRUCT_I_H */
-
-
diff --git a/TAO/tao/DynUnion_i.h b/TAO/tao/DynUnion_i.h
index fa2789f2fdc..7edde848a9a 100644
--- a/TAO/tao/DynUnion_i.h
+++ b/TAO/tao/DynUnion_i.h
@@ -39,7 +39,7 @@ public:
// Functions specific to DynUnion
- CORBA::Boolean set_as_default (CORBA::Environment& env);
+ CORBA::Boolean set_as_default (CORBA::Environment &TAO_IN_ENV);
// Does union have a default member?
void set_as_default (CORBA::Boolean set_as_default,
@@ -49,122 +49,122 @@ public:
CORBA_DynAny_ptr discriminator (CORBA::Environment&);
// Returns the discriminator (which is a DynAny)
- CORBA::TCKind discriminator_kind (CORBA::Environment& env);
+ CORBA::TCKind discriminator_kind (CORBA::Environment &TAO_IN_ENV);
// Returns TCKind of discriminator
- CORBA_DynAny_ptr member (CORBA::Environment& env);
+ CORBA_DynAny_ptr member (CORBA::Environment &TAO_IN_ENV);
// Returns active member
// Get and set for member name
- char* member_name (CORBA::Environment& env);
+ char* member_name (CORBA::Environment &TAO_IN_ENV);
void member_name (const char* member_name,
- CORBA::Environment& env);
+ CORBA::Environment &TAO_IN_ENV);
- CORBA::TCKind member_kind (CORBA::Environment& env);
+ CORBA::TCKind member_kind (CORBA::Environment &TAO_IN_ENV);
// Returns TCKind of active member
// Functions common to all Dynamic Any types
void assign (CORBA_DynAny_ptr dyn_any,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
// Sets the value of the receiver to the value of the argument
- CORBA_DynAny_ptr copy (CORBA::Environment &env);
+ CORBA_DynAny_ptr copy (CORBA::Environment &TAO_IN_ENV);
// Creates a copy
- void destroy (CORBA::Environment &env);
+ void destroy (CORBA::Environment &TAO_IN_ENV);
// Makes sure the contents are disposed of correctly
void from_any (const CORBA::Any& any,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
// Assigns value from an Any argument
- CORBA::Any_ptr to_any (CORBA::Environment &env);
+ CORBA::Any_ptr to_any (CORBA::Environment &TAO_IN_ENV);
// Outputs contents as an Any
- CORBA::TypeCode_ptr type (CORBA::Environment &);
+ CORBA::TypeCode_ptr type (CORBA::Environment &TAO_IN_ENV);
// Returns the (constant) type
- CORBA_DynAny_ptr current_component (CORBA::Environment &env);
+ CORBA_DynAny_ptr current_component (CORBA::Environment &TAO_IN_ENV);
// Used in iterating through the contents
- CORBA::Boolean next (CORBA::Environment &);
+ CORBA::Boolean next (CORBA::Environment &TAO_IN_ENV);
// Returns next component
CORBA::Boolean seek (CORBA::Long index,
- CORBA::Environment &);
+ CORBA::Environment &TAO_IN_ENV);
// Jump to component at <index>
- void rewind (CORBA::Environment &);
+ void rewind (CORBA::Environment &TAO_IN_ENV);
// Makes first component the current one
// Insert and get functions
void insert_boolean (CORBA::Boolean value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_octet (CORBA::Octet value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_char (CORBA::Char value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_short (CORBA::Short value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_ushort (CORBA::UShort value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_long (CORBA::Long value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_ulong (CORBA::ULong value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_float (CORBA::Float value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_double (CORBA::Double value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_string (const char * value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_reference (CORBA::Object_ptr value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_typecode (CORBA::TypeCode_ptr value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_longlong (CORBA::LongLong value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_ulonglong (CORBA::ULongLong value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_wchar (CORBA::WChar value,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
void insert_any (const CORBA::Any& value,
- CORBA::Environment &env);
- CORBA::Boolean get_boolean (CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
+ CORBA::Boolean get_boolean (CORBA::Environment &TAO_IN_ENV);
- CORBA::Octet get_octet (CORBA::Environment &env);
+ CORBA::Octet get_octet (CORBA::Environment &TAO_IN_ENV);
- CORBA::Char get_char (CORBA::Environment &env);
+ CORBA::Char get_char (CORBA::Environment &TAO_IN_ENV);
- CORBA::Short get_short (CORBA::Environment &env);
+ CORBA::Short get_short (CORBA::Environment &TAO_IN_ENV);
- CORBA::UShort get_ushort (CORBA::Environment &env);
+ CORBA::UShort get_ushort (CORBA::Environment &TAO_IN_ENV);
- CORBA::Long get_long (CORBA::Environment &env);
+ CORBA::Long get_long (CORBA::Environment &TAO_IN_ENV);
- CORBA::ULong get_ulong (CORBA::Environment &env);
+ CORBA::ULong get_ulong (CORBA::Environment &TAO_IN_ENV);
- CORBA::Float get_float (CORBA::Environment &env);
+ CORBA::Float get_float (CORBA::Environment &TAO_IN_ENV);
- CORBA::Double get_double (CORBA::Environment &env);
+ CORBA::Double get_double (CORBA::Environment &TAO_IN_ENV);
- char * get_string (CORBA::Environment &env);
+ char * get_string (CORBA::Environment &TAO_IN_ENV);
- CORBA::Object_ptr get_reference (CORBA::Environment &env);
+ CORBA::Object_ptr get_reference (CORBA::Environment &TAO_IN_ENV);
- CORBA::TypeCode_ptr get_typecode (CORBA::Environment &env);
+ CORBA::TypeCode_ptr get_typecode (CORBA::Environment &TAO_IN_ENV);
- CORBA::LongLong get_longlong (CORBA::Environment &env);
+ CORBA::LongLong get_longlong (CORBA::Environment &TAO_IN_ENV);
- CORBA::ULongLong get_ulonglong (CORBA::Environment &env);
+ CORBA::ULongLong get_ulonglong (CORBA::Environment &TAO_IN_ENV);
- CORBA::WChar get_wchar (CORBA::Environment &env);
+ CORBA::WChar get_wchar (CORBA::Environment &TAO_IN_ENV);
- CORBA::Any_ptr get_any (CORBA::Environment &env);
+ CORBA::Any_ptr get_any (CORBA::Environment &TAO_IN_ENV);
private:
CORBA_DynAny_var member_;
@@ -208,11 +208,11 @@ private:
};
DU_Extractor_base* get_extractor (CORBA::TCKind kind,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
// Returns a pointer to the correct extractor class.
void set_from_any(const CORBA_Any& any,
- CORBA::Environment &env);
+ CORBA::Environment &TAO_IN_ENV);
// Code common to the constructor from an Any arg and the member
// function from_any().
};
diff --git a/TAO/tao/Environment.h b/TAO/tao/Environment.h
index 0a5e4e94047..0f610077637 100644
--- a/TAO/tao/Environment.h
+++ b/TAO/tao/Environment.h
@@ -66,7 +66,7 @@ public:
CORBA_Environment (const CORBA_Environment &env);
// Copy constructor
- CORBA_Environment &operator=(const CORBA_Environment& env);
+ CORBA_Environment &operator=(const CORBA_Environment &env);
// Assingment
~CORBA_Environment (void);
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index 1d25db38d41..d0777b57fa5 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -256,7 +256,7 @@ CORBA_UnknownUserException::_raise (void)
void
TAO_Exceptions::make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp,
- CORBA::Environment &env)
+ CORBA::Environment &TAO_IN_ENV)
{
// Create the TypeCode for the CORBA_UnknownUserException
TAO_OutputCDR stream;
@@ -269,18 +269,18 @@ TAO_Exceptions::make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp,
if (stream.write_octet (TAO_ENCAP_BYTE_ORDER) != 1
|| stream.encode (CORBA::_tc_string,
&interface_id, 0,
- env) != CORBA::TypeCode::TRAVERSE_CONTINUE
+ TAO_IN_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE
|| stream.encode (CORBA::_tc_string,
&name, 0,
- env) != CORBA::TypeCode::TRAVERSE_CONTINUE
+ TAO_IN_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE
|| stream.write_ulong (1L) != 1
|| stream.encode (CORBA::_tc_string,
&field_name, 0,
- env) != CORBA::TypeCode::TRAVERSE_CONTINUE
+ TAO_IN_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE
|| stream.encode (CORBA::_tc_TypeCode,
&CORBA::_tc_any, 0,
- env) != CORBA::TypeCode::TRAVERSE_CONTINUE)
- TAO_THROW_ENV (CORBA_INITIALIZE (CORBA::COMPLETED_NO), env);
+ TAO_IN_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE)
+ TAO_THROW (CORBA_INITIALIZE (CORBA::COMPLETED_NO));
tcp = new CORBA::TypeCode (CORBA::tk_except,
stream.length (),
@@ -294,7 +294,7 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp,
const char *name,
char *buffer,
size_t buflen,
- CORBA::Environment &env)
+ CORBA::Environment &TAO_IN_ENV)
{
// This function must only be called ONCE, and with a global lock
// held! The <CORBA::ORB_init> method is responsible for ensuring
@@ -327,24 +327,24 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp,
if (stream.write_octet (TAO_ENCAP_BYTE_ORDER) != 1
|| stream.encode (CORBA::_tc_string,
&strptr, 0,
- env) != CORBA::TypeCode::TRAVERSE_CONTINUE
+ TAO_IN_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE
|| stream.encode (CORBA::_tc_string,
&name, 0,
- env) != CORBA::TypeCode::TRAVERSE_CONTINUE
+ TAO_IN_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE
|| stream.write_ulong (2L) != 1
|| stream.encode (CORBA::_tc_string,
&minor, 0,
- env) != CORBA::TypeCode::TRAVERSE_CONTINUE
+ TAO_IN_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE
|| stream.encode (CORBA::_tc_TypeCode,
&CORBA::_tc_ulong, 0,
- env) != CORBA::TypeCode::TRAVERSE_CONTINUE
+ TAO_IN_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE
|| stream.encode (CORBA::_tc_string,
&completed, 0,
- env) != CORBA::TypeCode::TRAVERSE_CONTINUE
+ TAO_IN_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE
|| stream.encode (CORBA::_tc_TypeCode,
&TC_completion_status, 0,
- env) != CORBA::TypeCode::TRAVERSE_CONTINUE)
- TAO_THROW_ENV (CORBA_INITIALIZE (CORBA::COMPLETED_NO), env);
+ TAO_IN_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE)
+ TAO_THROW (CORBA_INITIALIZE (CORBA::COMPLETED_NO));
// OK, we stuffed the buffer we were given (or grew a bigger one;
// hope to avoid that during initialization). Now build and return
@@ -588,12 +588,12 @@ CORBA_ExceptionList::add_consume (CORBA::TypeCode_ptr tc)
CORBA::TypeCode_ptr
CORBA_ExceptionList::item (CORBA::ULong index,
- CORBA::Environment &env)
+ CORBA::Environment &TAO_IN_ENV)
{
CORBA::TypeCode_ptr *tc;
- env.clear ();
+ TAO_IN_ENV.clear ();
if (this->tc_list_.get (tc, index) == -1)
- TAO_THROW_ENV_RETURN (CORBA::TypeCode::Bounds (), env, 0);
+ TAO_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
else
{
return CORBA::TypeCode::_duplicate (*tc);
diff --git a/TAO/tao/IIOP_Object.h b/TAO/tao/IIOP_Object.h
index 6a1caa914cc..f6ea1ff8830 100644
--- a/TAO/tao/IIOP_Object.h
+++ b/TAO/tao/IIOP_Object.h
@@ -114,7 +114,7 @@ class TAO_Export IIOP_Object : public STUB_Object
// interpreter that let static stubs be very small. It's
// specific to objrefs with IIOP::Profile.
public:
- virtual void do_static_call (CORBA_Environment &env,
+ virtual void do_static_call (CORBA_Environment &TAO_IN_ENV,
const TAO_Call_Data *info,
void** args);
// SII-based "Stub interpreter" for static stubs. IDL compiler just
@@ -200,7 +200,7 @@ public:
// Reset the <handler_>. Usually used on errors.
protected:
- void put_params (CORBA_Environment &env,
+ void put_params (CORBA_Environment &TAO_IN_ENV,
const TAO_Call_Data *info,
TAO_GIOP_Invocation &call,
void** args);
diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp
index 0c3c2299d18..5a4b170c5ff 100644
--- a/TAO/tao/Invocation.cpp
+++ b/TAO/tao/Invocation.cpp
@@ -98,7 +98,7 @@ TAO_GIOP_Invocation::~TAO_GIOP_Invocation (void)
void
TAO_GIOP_Invocation::start (CORBA::Boolean is_roundtrip,
TAO_GIOP::Message_Type message_type,
- CORBA::Environment &env)
+ CORBA::Environment &TAO_IN_ENV)
{
ACE_FUNCTION_TIMEPROBE (TAO_GIOP_INVOCATION_START_ENTER);
@@ -123,7 +123,7 @@ TAO_GIOP_Invocation::start (CORBA::Boolean is_roundtrip,
// assert (this->data_ != 0);
if (this->data_ == 0)
- TAO_THROW_ENV_RETURN_VOID (CORBA::MARSHAL (CORBA::COMPLETED_NO), env);
+ TAO_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO));
// Get a pointer to the connector, which might be in thread-specific
// storage, depending on the concurrency model.
@@ -150,7 +150,7 @@ TAO_GIOP_Invocation::start (CORBA::Boolean is_roundtrip,
}
if (server_addr_p == 0)
- TAO_THROW_ENV_RETURN_VOID (CORBA::INTERNAL (CORBA::COMPLETED_NO), env);
+ TAO_THROW (CORBA::INTERNAL (CORBA::COMPLETED_NO));
// Establish the connection and get back a
// <Client_Connection_Handler>.
@@ -179,7 +179,7 @@ TAO_GIOP_Invocation::start (CORBA::Boolean is_roundtrip,
local_addr.get_port_number (),
"errno"));
- TAO_THROW_ENV_RETURN_VOID (CORBA::TRANSIENT (CORBA::COMPLETED_NO), env);
+ TAO_THROW (CORBA::TRANSIENT (CORBA::COMPLETED_NO));
}
}
else
@@ -198,7 +198,7 @@ TAO_GIOP_Invocation::start (CORBA::Boolean is_roundtrip,
server_addr_p->get_port_number (),
"errno"));
- TAO_THROW_ENV_RETURN_VOID (CORBA::TRANSIENT (CORBA::COMPLETED_NO), env);
+ TAO_THROW (CORBA::TRANSIENT (CORBA::COMPLETED_NO));
}
ACE_TIMEPROBE (TAO_GIOP_INVOCATION_START_CONNECT);
@@ -232,7 +232,7 @@ TAO_GIOP_Invocation::start (CORBA::Boolean is_roundtrip,
this->orb_core_);
if (bt != 1)
- TAO_THROW_ENV_RETURN_VOID (CORBA::MARSHAL (CORBA::COMPLETED_NO), env);
+ TAO_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO));
ACE_TIMEPROBE (TAO_GIOP_INVOCATION_START_START_MSG);
@@ -274,10 +274,10 @@ TAO_GIOP_Invocation::start (CORBA::Boolean is_roundtrip,
break;
default:
- TAO_THROW_ENV_RETURN_VOID (CORBA::INTERNAL (CORBA::COMPLETED_NO), env);
+ TAO_THROW (CORBA::INTERNAL (CORBA::COMPLETED_NO));
}
if (!this->out_stream_.good_bit ())
- TAO_THROW_ENV_RETURN_VOID (CORBA::MARSHAL (CORBA::COMPLETED_NO), env);
+ TAO_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO));
ACE_TIMEPROBE (TAO_GIOP_INVOCATION_START_REQUEST_HDR);
}
@@ -347,7 +347,7 @@ TAO_GIOP_Invocation::write_request_header
TAO_GIOP_ReplyStatusType
TAO_GIOP_Invocation::invoke (CORBA::Boolean is_roundtrip,
- CORBA::Environment &env)
+ CORBA::Environment &TAO_IN_ENV)
{
// Send Request, return on error or if we're done
@@ -372,7 +372,7 @@ TAO_GIOP_Invocation::invoke (CORBA::Boolean is_roundtrip,
// point in the code however! Some minor restructuring needs to
// happen.
//
- TAO_THROW_ENV_RETURN (CORBA::TRANSIENT (CORBA::COMPLETED_MAYBE), env, TAO_GIOP_SYSTEM_EXCEPTION);
+ TAO_THROW_RETURN (CORBA::TRANSIENT (CORBA::COMPLETED_MAYBE), TAO_GIOP_SYSTEM_EXCEPTION);
}
return TAO_GIOP_NO_EXCEPTION;
}
@@ -417,7 +417,7 @@ TAO_GIOP_Invocation::close_connection (void)
TAO_GIOP_ReplyStatusType
TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream,
- CORBA::Environment &env)
+ CORBA::Environment &TAO_IN_ENV)
{
// It can be assumed that the GIOP header and the reply header
// are already handled. Further it can be assumed that the
@@ -426,18 +426,18 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream,
CORBA::Object_ptr object_ptr = 0;
- TAO_TRY_VAR (env)
+ TAO_TRY_VAR (TAO_IN_ENV)
{
inp_stream.decode (CORBA::_tc_Object,
&(object_ptr),
0,
- env);
+ TAO_TRY_ENV);
TAO_CHECK_ENV;
}
TAO_CATCH (CORBA_SystemException, ex)
{
// Handle the exception for this level here and throw it out again.
- dexc (env, "invoke, location forward (decode)");
+ dexc (TAO_TRY_ENV, "invoke, location forward (decode)");
this->data_->handler ()->handle_close ();
TAO_RETHROW_SAME_ENV_RETURN (TAO_GIOP_SYSTEM_EXCEPTION);
}
@@ -452,7 +452,7 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream,
if (iiopobj == 0)
{
this->data_->handler ()->handle_close ();
- TAO_THROW_ENV_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_NO), env, TAO_GIOP_SYSTEM_EXCEPTION);
+ TAO_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_NO), TAO_GIOP_SYSTEM_EXCEPTION);
}
// Make a copy of the IIOP profile in the forwarded objref,
@@ -474,7 +474,7 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream,
// @@ Is this exception safe?
CORBA::release (object_ptr);
- env.clear ();
+ TAO_IN_ENV.clear ();
// We may not need to do this since TAO_GIOP_Invocations
// get created on a per-call basis. For now we'll play it safe.
@@ -486,11 +486,11 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream,
TAO_GIOP_ReplyStatusType
TAO_GIOP_Twoway_Invocation::invoke (CORBA::ExceptionList &exceptions,
- CORBA::Environment &env)
+ CORBA::Environment &TAO_IN_ENV)
{
TAO_GIOP_ReplyStatusType retval =
- TAO_GIOP_Invocation::invoke (1, env);
- TAO_CHECK_ENV_RETURN (env, retval);
+ TAO_GIOP_Invocation::invoke (1, TAO_IN_ENV);
+ TAO_CHECK_RETURN (retval);
ACE_UNUSED_ARG (retval);
// This blocks until the response is read. In the current version,
@@ -573,7 +573,7 @@ TAO_GIOP_Twoway_Invocation::invoke (CORBA::ExceptionList &exceptions,
case TAO_GIOP::EndOfFile:
// @@ This should only refer to "getting GIOP MessageError" message only.
this->data_->handler ()->handle_close ();
- TAO_THROW_ENV_RETURN (CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE), env, TAO_GIOP_SYSTEM_EXCEPTION);
+ TAO_THROW_RETURN (CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE), TAO_GIOP_SYSTEM_EXCEPTION);
}
// Process reply message. Again, due to the single threading in
@@ -608,7 +608,7 @@ TAO_GIOP_Twoway_Invocation::invoke (CORBA::ExceptionList &exceptions,
if (!this->inp_stream_.good_bit ())
{
this->data_->handler ()->handle_close ();
- TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), env, TAO_GIOP_SYSTEM_EXCEPTION);
+ TAO_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), TAO_GIOP_SYSTEM_EXCEPTION);
}
if (!this->inp_stream_.read_ulong (request_id)
@@ -618,7 +618,7 @@ TAO_GIOP_Twoway_Invocation::invoke (CORBA::ExceptionList &exceptions,
{
this->data_->handler ()->handle_close ();
ACE_DEBUG ((LM_DEBUG, "(%P|%t) bad Response header\n"));
- TAO_THROW_ENV_RETURN (CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE), env, TAO_GIOP_SYSTEM_EXCEPTION);
+ TAO_THROW_RETURN (CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE), TAO_GIOP_SYSTEM_EXCEPTION);
}
// If there was no exception, let the caller parse the normal
@@ -660,7 +660,7 @@ TAO_GIOP_Twoway_Invocation::invoke (CORBA::ExceptionList &exceptions,
if (this->inp_stream_.read_string (buf) == 0)
{
this->data_->handler ()->handle_close ();
- TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), env, TAO_GIOP_SYSTEM_EXCEPTION);
+ TAO_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), TAO_GIOP_SYSTEM_EXCEPTION);
}
}
@@ -669,17 +669,17 @@ TAO_GIOP_Twoway_Invocation::invoke (CORBA::ExceptionList &exceptions,
if (reply_status == TAO_GIOP_SYSTEM_EXCEPTION)
{
CORBA_Exception *exception =
- TAO_Exceptions::create_system_exception (buf_holder.in (), env);
- TAO_CHECK_ENV_RETURN (env, TAO_GIOP_SYSTEM_EXCEPTION);
+ TAO_Exceptions::create_system_exception (buf_holder.in (), TAO_IN_ENV);
+ TAO_CHECK_RETURN (TAO_GIOP_SYSTEM_EXCEPTION);
if (exception != 0)
{
this->inp_stream_.decode (exception->_type (),
&exception, 0,
- env);
- TAO_CHECK_ENV_RETURN (env, TAO_GIOP_SYSTEM_EXCEPTION)
+ TAO_IN_ENV);
+ TAO_CHECK_RETURN (TAO_GIOP_SYSTEM_EXCEPTION)
;
- env.exception (exception);
+ TAO_IN_ENV.exception (exception);
return TAO_GIOP_SYSTEM_EXCEPTION;
}
else
@@ -711,10 +711,10 @@ TAO_GIOP_Twoway_Invocation::invoke (CORBA::ExceptionList &exceptions,
int loop_continue = 0;
TAO_TRY
{
- tcp = exceptions.item (i, env);
+ tcp = exceptions.item (i, TAO_IN_ENV);
TAO_CHECK_ENV;
- const char *xid = tcp->id (env);
+ const char *xid = tcp->id (TAO_IN_ENV);
TAO_CHECK_ENV;
if (ACE_OS::strcmp (buf_holder.in (), xid) != 0)
@@ -734,7 +734,7 @@ TAO_GIOP_Twoway_Invocation::invoke (CORBA::ExceptionList &exceptions,
CORBA_Any any (tcp, cdr);
CORBA_Exception *exception =
new CORBA_UnknownUserException (any);
- env.exception (exception);
+ TAO_IN_ENV.exception (exception);
return TAO_GIOP_USER_EXCEPTION;
}
}
@@ -742,12 +742,12 @@ TAO_GIOP_Twoway_Invocation::invoke (CORBA::ExceptionList &exceptions,
// If we couldn't find the right exception, report it as
// CORBA::UNKNOWN.
- TAO_THROW_ENV_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_MAYBE), env, TAO_GIOP_SYSTEM_EXCEPTION);
+ TAO_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_MAYBE), TAO_GIOP_SYSTEM_EXCEPTION);
}
// NOTREACHED
case TAO_GIOP_LOCATION_FORWARD:
- return (this->location_forward (this->inp_stream_, env));
+ return (this->location_forward (this->inp_stream_, TAO_IN_ENV));
}
// All standard exceptions from here on in the call path know for
@@ -766,11 +766,11 @@ TAO_GIOP_Twoway_Invocation::invoke (CORBA::ExceptionList &exceptions,
TAO_GIOP_ReplyStatusType
TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts,
CORBA::ULong except_count,
- CORBA::Environment &env)
+ CORBA::Environment &TAO_IN_ENV)
{
TAO_GIOP_ReplyStatusType retval =
- TAO_GIOP_Invocation::invoke (1, env);
- TAO_CHECK_ENV_RETURN (env, retval);
+ TAO_GIOP_Invocation::invoke (1, TAO_IN_ENV);
+ TAO_CHECK_RETURN (retval);
ACE_UNUSED_ARG (retval);
// This blocks until the response is read. In the current version,
@@ -853,7 +853,7 @@ TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts,
case TAO_GIOP::EndOfFile:
// @@ This should only refer to "getting GIOP MessageError" message only.
this->data_->handler ()->handle_close ();
- TAO_THROW_ENV_RETURN (CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE), env, TAO_GIOP_SYSTEM_EXCEPTION);
+ TAO_THROW_RETURN (CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE), TAO_GIOP_SYSTEM_EXCEPTION);
}
// Process reply message. Again, due to the single threading in
@@ -888,7 +888,7 @@ TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts,
if (!this->inp_stream_.good_bit ())
{
this->data_->handler ()->handle_close ();
- TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), env, TAO_GIOP_SYSTEM_EXCEPTION);
+ TAO_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), TAO_GIOP_SYSTEM_EXCEPTION);
}
if (!this->inp_stream_.read_ulong (request_id)
@@ -898,7 +898,7 @@ TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts,
{
this->data_->handler ()->handle_close ();
ACE_DEBUG ((LM_DEBUG, "(%P|%t) bad Response header\n"));
- TAO_THROW_ENV_RETURN (CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE), env, TAO_GIOP_SYSTEM_EXCEPTION);
+ TAO_THROW_RETURN (CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE), TAO_GIOP_SYSTEM_EXCEPTION);
}
// If there was no exception, let the caller parse the normal
@@ -940,7 +940,7 @@ TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts,
if (this->inp_stream_.read_string (buf) == 0)
{
this->data_->handler ()->handle_close ();
- TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), env, TAO_GIOP_SYSTEM_EXCEPTION);
+ TAO_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), TAO_GIOP_SYSTEM_EXCEPTION);
}
}
@@ -958,19 +958,19 @@ TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts,
if (reply_status == TAO_GIOP_SYSTEM_EXCEPTION)
{
exception =
- TAO_Exceptions::create_system_exception (buf_holder.in (), env);
- TAO_CHECK_ENV_RETURN (env, TAO_GIOP_SYSTEM_EXCEPTION);
+ TAO_Exceptions::create_system_exception (buf_holder.in (), TAO_IN_ENV);
+ TAO_CHECK_RETURN (TAO_GIOP_SYSTEM_EXCEPTION);
if (exception != 0)
{
this->inp_stream_.decode (exception->_type (),
exception, 0,
- env);
- TAO_CHECK_ENV_RETURN (env, TAO_GIOP_SYSTEM_EXCEPTION);
+ TAO_IN_ENV);
+ TAO_CHECK_RETURN (TAO_GIOP_SYSTEM_EXCEPTION);
// @@ What do we do if an exception is raised while
// demarshaling an exception????
- env.exception (exception);
+ TAO_IN_ENV.exception (exception);
return TAO_GIOP_SYSTEM_EXCEPTION;
}
}
@@ -982,10 +982,10 @@ TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts,
i++)
{
int loop_continue = 0;
- TAO_TRY
+ TAO_TRY_VAR (TAO_IN_ENV)
{
tcp = excepts[i].tc;
- const char *xid = tcp->id (env);
+ const char *xid = tcp->id (TAO_TRY_ENV);
TAO_CHECK_ENV;
if (ACE_OS::strcmp (buf_holder.in (), (char *)xid) != 0)
@@ -997,7 +997,7 @@ TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts,
this->inp_stream_.decode (exception->_type (),
exception, 0,
- env);
+ TAO_TRY_ENV);
TAO_CHECK_ENV;
}
}
@@ -1010,7 +1010,7 @@ TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts,
if (loop_continue)
continue;
- env.exception (exception);
+ TAO_IN_ENV.exception (exception);
return TAO_GIOP_USER_EXCEPTION;
} // end of loop
}
@@ -1018,13 +1018,13 @@ TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts,
// If we couldn't find the right exception, report it as
// CORBA::UNKNOWN.
- env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_YES));
+ TAO_IN_ENV.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_YES));
return TAO_GIOP_SYSTEM_EXCEPTION;
}
// NOTREACHED
case TAO_GIOP_LOCATION_FORWARD:
- return (this->location_forward (this->inp_stream_, env));
+ return (this->location_forward (this->inp_stream_, TAO_IN_ENV));
}
// All standard exceptions from here on in the call path know for
@@ -1042,7 +1042,7 @@ TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts,
// Send request, block until any reply comes back
TAO_GIOP_ReplyStatusType
-TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &env)
+TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &TAO_IN_ENV)
{
// Send Request, return on error or if we're done
@@ -1053,7 +1053,7 @@ TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &env)
// send_request () closed the connection; we just set the
// handler to 0 here.
this->data_->reset_handler ();
- env.exception (new CORBA::TRANSIENT (CORBA::COMPLETED_MAYBE));
+ TAO_IN_ENV.exception (new CORBA::TRANSIENT (CORBA::COMPLETED_MAYBE));
return TAO_GIOP_SYSTEM_EXCEPTION;
}
@@ -1086,18 +1086,18 @@ TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &env)
this->data_->handler ()->handle_close ();
ACE_DEBUG ((LM_DEBUG,
"(%P|%t) bad Response header\n"));
- TAO_THROW_ENV_RETURN (CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE), env, TAO_GIOP_SYSTEM_EXCEPTION);
+ TAO_THROW_RETURN (CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE), TAO_GIOP_SYSTEM_EXCEPTION);
}
switch (locate_status)
{
case TAO_GIOP_UNKNOWN_OBJECT:
- TAO_THROW_ENV_RETURN (CORBA::OBJECT_NOT_EXIST (CORBA::COMPLETED_YES), env, TAO_GIOP_SYSTEM_EXCEPTION);
+ TAO_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (CORBA::COMPLETED_YES), TAO_GIOP_SYSTEM_EXCEPTION);
/* not reached */
case TAO_GIOP_OBJECT_HERE:
return TAO_GIOP_NO_EXCEPTION;
/* not reached */
case TAO_GIOP_OBJECT_FORWARD:
- return (this->location_forward (this->inp_stream_, env));
+ return (this->location_forward (this->inp_stream_, TAO_IN_ENV));
/* not reached */
}
/* not reached */
@@ -1125,7 +1125,7 @@ TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &env)
case TAO_GIOP::EndOfFile:
// @@ This should only refer to "getting GIOP MessageError" message only.
this->data_->handler ()->handle_close ();
- TAO_THROW_ENV_RETURN (CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE), env, TAO_GIOP_SYSTEM_EXCEPTION);
+ TAO_THROW_RETURN (CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE), TAO_GIOP_SYSTEM_EXCEPTION);
}
ACE_NOTREACHED (return TAO_GIOP_NO_EXCEPTION);
diff --git a/TAO/tao/Invocation.i b/TAO/tao/Invocation.i
index 6195b9db53a..bfe84ab2a55 100644
--- a/TAO/tao/Invocation.i
+++ b/TAO/tao/Invocation.i
@@ -6,9 +6,9 @@
ACE_INLINE void
TAO_GIOP_Invocation::put_param (CORBA::TypeCode_ptr tc,
void *value,
- CORBA::Environment &env)
+ CORBA::Environment &TAO_IN_ENV)
{
- (void) this->out_stream_.encode (tc, value, 0, env);
+ (void) this->out_stream_.encode (tc, value, 0, TAO_IN_ENV);
}
ACE_INLINE TAO_OutputCDR &
@@ -32,17 +32,17 @@ TAO_GIOP_Twoway_Invocation (IIOP_Object *data,
}
ACE_INLINE void
-TAO_GIOP_Twoway_Invocation::start (CORBA::Environment &env)
+TAO_GIOP_Twoway_Invocation::start (CORBA::Environment &TAO_IN_ENV)
{
- TAO_GIOP_Invocation::start (1, TAO_GIOP::Request, env);
+ TAO_GIOP_Invocation::start (1, TAO_GIOP::Request, TAO_IN_ENV);
}
ACE_INLINE void
TAO_GIOP_Twoway_Invocation::get_value (CORBA::TypeCode_ptr tc,
void *value,
- CORBA::Environment &env)
+ CORBA::Environment &TAO_IN_ENV)
{
- (void) this->inp_stream_.decode (tc, value, 0, env);
+ (void) this->inp_stream_.decode (tc, value, 0, TAO_IN_ENV);
}
ACE_INLINE TAO_InputCDR &
@@ -63,15 +63,15 @@ TAO_GIOP_Oneway_Invocation (IIOP_Object *data,
}
ACE_INLINE void
-TAO_GIOP_Oneway_Invocation::start (CORBA::Environment &env)
+TAO_GIOP_Oneway_Invocation::start (CORBA::Environment &TAO_IN_ENV)
{
- TAO_GIOP_Invocation::start (0, TAO_GIOP::Request, env);
+ TAO_GIOP_Invocation::start (0, TAO_GIOP::Request, TAO_IN_ENV);
}
ACE_INLINE TAO_GIOP_ReplyStatusType
-TAO_GIOP_Oneway_Invocation::invoke (CORBA::Environment &env)
+TAO_GIOP_Oneway_Invocation::invoke (CORBA::Environment &TAO_IN_ENV)
{
- return TAO_GIOP_Invocation::invoke (0, env);
+ return TAO_GIOP_Invocation::invoke (0, TAO_IN_ENV);
}
// ****************************************************************
@@ -86,10 +86,7 @@ TAO_GIOP_Locate_Request_Invocation (IIOP_Object *data,
}
ACE_INLINE void
-TAO_GIOP_Locate_Request_Invocation::start (CORBA::Environment &env)
+TAO_GIOP_Locate_Request_Invocation::start (CORBA::Environment &TAO_IN_ENV)
{
- TAO_GIOP_Invocation::start (1, TAO_GIOP::LocateRequest, env);
+ TAO_GIOP_Invocation::start (1, TAO_GIOP::LocateRequest, TAO_IN_ENV);
}
-
-
-
diff --git a/TAO/tao/Marshal.i b/TAO/tao/Marshal.i
index e66d1f263ce..1e79297c3c9 100644
--- a/TAO/tao/Marshal.i
+++ b/TAO/tao/Marshal.i
@@ -143,11 +143,11 @@ TAO_Marshal_WString::~TAO_Marshal_WString (void)
// the kind of the typecode.
ACE_INLINE TAO_Marshal_Object *
TAO_Marshal_Factory::make_marshal_object (CORBA::TypeCode_ptr tc,
- CORBA::Environment &env)
+ CORBA::Environment &TAO_IN_ENV)
{
if (tc && tc->kind_ >= 0 && tc->kind_ < CORBA::TC_KIND_COUNT)
return this->mobj_table_[tc->kind_].obj_;
- TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
+ TAO_THROW_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), 0);
}
// *************** deep_free methods ******************
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index f422d615fb1..482069d9d5f 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -738,7 +738,7 @@ public:
static ORB_ptr ORB_init (int &argc,
char *const *argv,
const char *orb_name = 0,
- Environment &env = CORBA_Environment::default_environment ());
+ Environment &TAO_IN_ENV = CORBA_Environment::default_environment ());
// ORB initialisation, per OMG document 94-9-46.
// = The following two methods are TAO-specific extensions.
@@ -1003,25 +1003,25 @@ public:
// Dynamic Any factory functions.
CORBA_DynAny_ptr create_dyn_any (const CORBA_Any& any,
- CORBA::Environment& env);
+ CORBA::Environment &TAO_IN_ENV);
CORBA_DynAny_ptr create_basic_dyn_any (CORBA_TypeCode_ptr tc,
- CORBA::Environment& env);
+ CORBA::Environment &TAO_IN_ENV);
CORBA_DynStruct_ptr create_dyn_struct (CORBA_TypeCode_ptr tc,
- CORBA::Environment& env);
+ CORBA::Environment &TAO_IN_ENV);
CORBA_DynSequence_ptr create_dyn_sequence (CORBA_TypeCode_ptr tc,
- CORBA::Environment& env);
+ CORBA::Environment &TAO_IN_ENV);
CORBA_DynArray_ptr create_dyn_array (CORBA_TypeCode_ptr tc,
- CORBA::Environment& env);
+ CORBA::Environment &TAO_IN_ENV);
CORBA_DynUnion_ptr create_dyn_union (CORBA_TypeCode_ptr tc,
- CORBA::Environment& env);
+ CORBA::Environment &TAO_IN_ENV);
CORBA_DynEnum_ptr create_dyn_enum (CORBA_TypeCode_ptr tc,
- CORBA::Environment& env);
+ CORBA::Environment &TAO_IN_ENV);
protected:
// We must be created via the <ORB_init> call.
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 13c9adcbf17..c8c5c518915 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -144,7 +144,7 @@ public:
TAO_POA *root_poa (const char *adapter_name = TAO_DEFAULT_ROOTPOA_NAME,
TAO_POA_Manager *poa_manager = 0,
const TAO_POA_Policies *policies = 0);
- PortableServer::POA_ptr root_poa_reference (CORBA::Environment &env = CORBA_Environment::default_environment (),
+ PortableServer::POA_ptr root_poa_reference (CORBA::Environment &TAO_IN_ENV = CORBA_Environment::default_environment (),
const char *adapter_name = TAO_DEFAULT_ROOTPOA_NAME,
TAO_POA_Manager *poa_manager = 0,
const TAO_POA_Policies *policies = 0);
diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i
index b285911c615..6b7494bd881 100644
--- a/TAO/tao/ORB_Core.i
+++ b/TAO/tao/ORB_Core.i
@@ -54,7 +54,7 @@ TAO_ORB_Core::root_poa (const char *adapter_name,
}
ACE_INLINE PortableServer::POA_ptr
-TAO_ORB_Core::root_poa_reference (CORBA::Environment &env,
+TAO_ORB_Core::root_poa_reference (CORBA::Environment &TAO_IN_ENV,
const char *adapter_name,
TAO_POA_Manager *poa_manager,
const TAO_POA_Policies *policies)
@@ -65,9 +65,8 @@ TAO_ORB_Core::root_poa_reference (CORBA::Environment &env,
poa_manager,
policies);
- this->root_poa_reference_ = poa->_this (env);
- if (env.exception () != 0)
- return PortableServer::POA::_nil ();
+ this->root_poa_reference_ = poa->_this (TAO_IN_ENV);
+ TAO_CHECK_RETURN (PortableServer::POA::_nil ());
}
return PortableServer::POA::_duplicate (this->root_poa_reference_.in ());
@@ -214,4 +213,3 @@ TAO_Resource_Factory::init (int argc, char *argv[])
}
// ****************************************************************
-
diff --git a/TAO/tao/Object.i b/TAO/tao/Object.i
index 3854497bcbf..52f88447702 100644
--- a/TAO/tao/Object.i
+++ b/TAO/tao/Object.i
@@ -69,17 +69,17 @@ CORBA_Object::_create_request (const CORBA::Char *operation,
CORBA::NamedValue_ptr result,
CORBA::Request_ptr &request,
CORBA::Flags req_flags,
- CORBA::Environment &env)
+ CORBA::Environment &TAO_IN_ENV)
{
- env.clear ();
+ TAO_IN_ENV.clear ();
request = new CORBA::Request (this, operation, arg_list, result, req_flags);
}
ACE_INLINE CORBA::Request_ptr
CORBA_Object::_request (const CORBA::Char *operation,
- CORBA::Environment &env)
+ CORBA::Environment &TAO_IN_ENV)
{
- env.clear ();
+ TAO_IN_ENV.clear ();
return new CORBA::Request (this, operation);
}
diff --git a/TAO/tao/POA_CORBA.h b/TAO/tao/POA_CORBA.h
index 91126170a5a..ecd79e75584 100644
--- a/TAO/tao/POA_CORBA.h
+++ b/TAO/tao/POA_CORBA.h
@@ -185,238 +185,238 @@ public:
virtual ~DynAny (void);
virtual CORBA::Boolean _is_a (
const char* logical_type_id,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void* _downcast (
const char* logical_type_id
);
virtual CORBA::TypeCode_ptr type (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual void assign (
CORBA_DynAny_ptr dyn_any,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual void from_any (
const CORBA::Any & value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual CORBA::Any * to_any (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual void destroy (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual CORBA_DynAny_ptr copy (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual void insert_boolean (
CORBA::Boolean value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual void insert_octet (
CORBA::Octet value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual void insert_char (
CORBA::Char value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual void insert_short (
CORBA::Short value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual void insert_ushort (
CORBA::UShort value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual void insert_long (
CORBA::Long value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual void insert_ulong (
CORBA::ULong value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual void insert_float (
CORBA::Float value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual void insert_double (
CORBA::Double value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual void insert_string (
const char * value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual void insert_reference (
CORBA::Object_ptr value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual void insert_typecode (
CORBA::TypeCode_ptr value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual void insert_longlong (
CORBA::LongLong value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual void insert_ulonglong (
CORBA::ULongLong value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual void insert_wchar (
CORBA::WChar value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual void insert_any (
const CORBA::Any & value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual CORBA::Boolean get_boolean (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual CORBA::Octet get_octet (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual CORBA::Char get_char (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual CORBA::Short get_short (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual CORBA::UShort get_ushort (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual CORBA::Long get_long (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual CORBA::ULong get_ulong (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual CORBA::Float get_float (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual CORBA::Double get_double (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual char * get_string (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual CORBA::Object_ptr get_reference (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual CORBA::TypeCode_ptr get_typecode (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual CORBA::LongLong get_longlong (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual CORBA::ULongLong get_ulonglong (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual CORBA::WChar get_wchar (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual CORBA::Any * get_any (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual CORBA_DynAny_ptr current_component (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual CORBA::Boolean next (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual CORBA::Boolean seek (
CORBA::Long index,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual void rewind (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
@@ -428,7 +428,7 @@ public:
);
CORBA_DynAny *_this (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual const char* _interface_repository_id (void) const;
@@ -448,194 +448,194 @@ public:
DynAny_ptr _get_servant (void) const;
virtual CORBA::Boolean _is_a (
const char *logical_type_id,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual CORBA::TypeCode_ptr type (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void assign (
CORBA_DynAny_ptr CORBA_Dyn_any,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void from_any (
const CORBA::Any & value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual CORBA::Any * to_any (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void destroy (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual CORBA_DynAny_ptr copy (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void insert_boolean (
CORBA::Boolean value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void insert_octet (
CORBA::Octet value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void insert_char (
CORBA::Char value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void insert_short (
CORBA::Short value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void insert_ushort (
CORBA::UShort value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void insert_long (
CORBA::Long value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void insert_ulong (
CORBA::ULong value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void insert_float (
CORBA::Float value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void insert_double (
CORBA::Double value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void insert_string (
const char * value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void insert_reference (
CORBA::Object_ptr value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void insert_typecode (
CORBA::TypeCode_ptr value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void insert_longlong (
CORBA::LongLong value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void insert_ulonglong (
CORBA::ULongLong value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void insert_wchar (
CORBA::WChar value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void insert_any (
const CORBA::Any & value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual CORBA::Boolean get_boolean (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual CORBA::Octet get_octet (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual CORBA::Char get_char (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual CORBA::Short get_short (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual CORBA::UShort get_ushort (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual CORBA::Long get_long (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual CORBA::ULong get_ulong (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual CORBA::Float get_float (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual CORBA::Double get_double (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual char * get_string (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual CORBA::Object_ptr get_reference (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual CORBA::TypeCode_ptr get_typecode (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual CORBA::LongLong get_longlong (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual CORBA::ULongLong get_ulonglong (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual CORBA::WChar get_wchar (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual CORBA::Any * get_any (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual CORBA_DynAny_ptr current_component (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual CORBA::Boolean next (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual CORBA::Boolean seek (
CORBA::Long index,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void rewind (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
@@ -659,31 +659,31 @@ public:
virtual ~DynEnum (void);
virtual CORBA::Boolean _is_a (
const char* logical_type_id,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void* _downcast (
const char* logical_type_id
);
virtual char * value_as_string (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual void value_as_string (
const char * value_as_string,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual CORBA::ULong value_as_ulong (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual void value_as_ulong (
CORBA::ULong value_as_ulong,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
@@ -695,7 +695,7 @@ public:
);
CORBA_DynEnum *_this (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual const char* _interface_repository_id (void) const;
@@ -716,25 +716,25 @@ public:
DynEnum_ptr _get_servant (void) const;
virtual CORBA::Boolean _is_a (
const char *logical_type_id,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual char * value_as_string (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void value_as_string (
const char * value_as_string,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual CORBA::ULong value_as_ulong (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void value_as_ulong (
CORBA::ULong value_as_ulong,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
@@ -757,30 +757,30 @@ public:
virtual ~DynStruct (void);
virtual CORBA::Boolean _is_a (
const char* logical_type_id,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void* _downcast (
const char* logical_type_id
);
virtual char * current_member_name (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual CORBA::TCKind current_member_kind (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual NameValuePairSeq * get_members (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual void set_members (
const NameValuePairSeq & value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
@@ -792,7 +792,7 @@ public:
);
CORBA_DynStruct *_this (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual const char* _interface_repository_id (void) const;
@@ -813,24 +813,24 @@ public:
DynStruct_ptr _get_servant (void) const;
virtual CORBA::Boolean _is_a (
const char *logical_type_id,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual char * current_member_name (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual CORBA::TCKind current_member_kind (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual NameValuePairSeq * get_members (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void set_members (
const NameValuePairSeq & value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
@@ -853,51 +853,51 @@ public:
virtual ~DynUnion (void);
virtual CORBA::Boolean _is_a (
const char* logical_type_id,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void* _downcast (
const char* logical_type_id
);
virtual CORBA::Boolean set_as_default (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual void set_as_default (
CORBA::Boolean set_as_default,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual CORBA_DynAny_ptr discriminator (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual CORBA::TCKind discriminator_kind (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual CORBA_DynAny_ptr member (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual char * member_name (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual void member_name (
const char * member_name,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual CORBA::TCKind member_kind (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
@@ -909,7 +909,7 @@ public:
);
CORBA_DynUnion *_this (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual const char* _interface_repository_id (void) const;
@@ -930,41 +930,41 @@ public:
DynUnion_ptr _get_servant (void) const;
virtual CORBA::Boolean _is_a (
const char *logical_type_id,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual CORBA::Boolean set_as_default (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void set_as_default (
CORBA::Boolean set_as_default,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual CORBA_DynAny_ptr discriminator (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual CORBA::TCKind discriminator_kind (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual CORBA_DynAny_ptr member (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual char * member_name (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void member_name (
const char * member_name,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual CORBA::TCKind member_kind (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
@@ -987,31 +987,31 @@ public:
virtual ~DynSequence (void);
virtual CORBA::Boolean _is_a (
const char* logical_type_id,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void* _downcast (
const char* logical_type_id
);
virtual CORBA::ULong length (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual void length (
CORBA::ULong length,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual AnySeq * get_elements (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual void set_elements (
const AnySeq & value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
@@ -1019,19 +1019,19 @@ public:
CORBA::ServerRequest &req,
void *obj,
void *context,
- CORBA::Environment &env =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void _dispatch (
CORBA::ServerRequest &_tao_req,
void *_tao_context,
- CORBA::Environment &_tao_env =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
CORBA_DynSequence *_this (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual const char* _interface_repository_id (void) const;
@@ -1052,25 +1052,25 @@ public:
DynSequence_ptr _get_servant (void) const;
virtual CORBA::Boolean _is_a (
const char *logical_type_id,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual CORBA::ULong length (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void length (
CORBA::ULong length,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual AnySeq * get_elements (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void set_elements (
const AnySeq & value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
@@ -1093,20 +1093,20 @@ public:
virtual ~DynArray (void);
virtual CORBA::Boolean _is_a (
const char* logical_type_id,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void* _downcast (
const char* logical_type_id
);
virtual AnySeq * get_elements (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
virtual void set_elements (
const AnySeq & value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
) = 0;
@@ -1118,7 +1118,7 @@ public:
);
CORBA_DynArray *_this (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual const char* _interface_repository_id (void) const;
@@ -1139,16 +1139,16 @@ public:
DynArray_ptr _get_servant (void) const;
virtual CORBA::Boolean _is_a (
const char *logical_type_id,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual AnySeq * get_elements (
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
virtual void set_elements (
const AnySeq & value,
- CORBA::Environment &_tao_environment =
+ CORBA::Environment &TAO_IN_ENV =
CORBA::Environment::default_environment ()
);
diff --git a/TAO/tao/Server_Request.h b/TAO/tao/Server_Request.h
index c5aa25c4b25..02f4e08c27c 100644
--- a/TAO/tao/Server_Request.h
+++ b/TAO/tao/Server_Request.h
@@ -281,14 +281,14 @@ public:
// get the exception type
private:
- void parse_header (CORBA::Environment &env);
+ void parse_header (CORBA::Environment &TAO_IN_ENV);
// Parse the request header and store the result on this object.
- void parse_header_std (CORBA::Environment &env);
+ void parse_header_std (CORBA::Environment &TAO_IN_ENV);
// Parse the standard IIOP request header and store the result on
// this object.
- void parse_header_lite (CORBA::Environment &env);
+ void parse_header_lite (CORBA::Environment &TAO_IN_ENV);
// Parse the lightweight version of the IIOP request header and
// store the result on this object.
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index 8b0cabfb710..d928e92b9d1 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -197,12 +197,12 @@ class TAO_Export STUB_Object
// The stub and DII interpreter APIs are member functions of this
// type.
public:
- virtual void do_static_call (CORBA_Environment &env,
+ virtual void do_static_call (CORBA_Environment &TAO_IN_ENV,
const TAO_Call_Data *info,
void** args) = 0;
// The "stub interpreter" method parameters are:
//
- // - env ... used for exception reporting
+ // - TAO_IN_ENV ... used for exception reporting
// - info ... describes the call
// - args parameters follow
//
@@ -240,7 +240,7 @@ public:
// - result ... result and its description
// - flags ... only one DII flag is legal
// - exceptions ... list of legal user-defined exceptions
- // - env ... used for exception reporting.
+ // - TAO_IN_ENV ... used for exception reporting.
CORBA::String_var type_id;
// All objref representations carry around a type ID.
diff --git a/TAO/tao/TAO.h b/TAO/tao/TAO.h
index 795a261c3e5..2f5cb38a772 100644
--- a/TAO/tao/TAO.h
+++ b/TAO/tao/TAO.h
@@ -70,7 +70,7 @@ public:
// servant_name. Users should call this to activate objects under
// the child_poa.
- int run (CORBA_Environment &env = CORBA_Environment::default_environment (),
+ int run (CORBA_Environment &TAO_IN_ENV = CORBA_Environment::default_environment (),
ACE_Time_Value *tv = 0);
// Run the ORB event loop with the specified <tv> time value Returns
// -1 on failure.
View Lorry Controller Status