diff options
-rw-r--r-- | TAO/ChangeLog | 9 | ||||
-rw-r--r-- | TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 64c15f4809e..5141bb295bb 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Fri May 24 07:55:00 UTC 2013 Simon Massey <simon dot massey at prismtech dot com> + + * tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp: + * orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp: + + Add .in () accessor to vars being duplicated. This stops some older + compilers issuing warnings about which pointer accessor they are + automatically selecting. + Wed May 22 15:15:34 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp: diff --git a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp index da6f545cdd7..dcb26d34621 100644 --- a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp +++ b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp @@ -19,7 +19,7 @@ Gateway_ObjRef_Factory::_copy_value (void) ACE_NEW_THROW_EX ( ret_val, Gateway_ObjRef_Factory ( - gateway_object_factory_, + gateway_object_factory_.in (), old_factory_ ), ::CORBA::NO_MEMORY () diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp index f41d376c0db..d4380e4e8bb 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp @@ -36,7 +36,7 @@ namespace TAO server_id_, orb_id_, adapter_name_, - poa_ + poa_.in () ), ::CORBA::NO_MEMORY () ); |