diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-12-17 22:05:48 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-12-17 22:05:48 +0000 |
| commit | 1a43c355bbd12987536b2634e161e4912409daea (patch) | |
| tree | cdc327b6b32da508c5dca325fe35fdc9f86d6cd2 | |
| parent | b0c83a40ff0ce32c20b2261eaed223ab2135b0e1 (diff) | |
| download | ATCD-1a43c355bbd12987536b2634e161e4912409daea.tar.gz | |
ChangeLogTag: Tue Dec 17 15:36:19 2002 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 12 | ||||
| -rw-r--r-- | TAO/tao/Any_T.inl | 3 | ||||
| -rw-r--r-- | TAO/tao/Messaging/MessagingS.cpp | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 83e6c132d58..21df0e98ebf 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,15 @@ +Tue Dec 17 15:36:19 2002 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tao/Any_T.inl(demarshal_value): + + Replaced forany temporary with a local variable instantiation. + Many compilers don't like the temporary. + + * tao/Messaging/MessagingS.cpp: + + Replaced an occurrence of CORBA_InterfaceDef with + CORBA::InterfaceDef. + Tue Dec 17 13:06:06 2002 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/be/be_visitor_array/cdr_op_ci.cpp: diff --git a/TAO/tao/Any_T.inl b/TAO/tao/Any_T.inl index 8332f234b7d..e3a030c25dc 100644 --- a/TAO/tao/Any_T.inl +++ b/TAO/tao/Any_T.inl @@ -30,7 +30,8 @@ TAO::Any_Array_Impl_T<T, T_forany>::marshal_value (TAO_OutputCDR &cdr) template<typename T, typename T_forany> ACE_INLINE CORBA::Boolean TAO::Any_Array_Impl_T<T, T_forany>::demarshal_value (TAO_InputCDR &cdr) { - return (cdr >> T_forany (this->value_)); + T_forany tmp (this->value_); + return (cdr >> tmp); } template<typename T, typename T_forany> ACE_INLINE const void * diff --git a/TAO/tao/Messaging/MessagingS.cpp b/TAO/tao/Messaging/MessagingS.cpp index 9d3fb058c60..cb0d3d1370a 100644 --- a/TAO/tao/Messaging/MessagingS.cpp +++ b/TAO/tao/Messaging/MessagingS.cpp @@ -387,7 +387,7 @@ void POA_Messaging::ReplyHandler::_interface_skel ( ) { POA_Messaging::ReplyHandler *_tao_impl = (POA_Messaging::ReplyHandler *) _tao_servant; - CORBA_InterfaceDef_ptr _tao_retval = 0; + CORBA::InterfaceDef_ptr _tao_retval = 0; CORBA::Boolean _tao_result = 0; TAO_IFR_Client_Adapter *_tao_adapter = |