From 7d800209767f5f4e8e638d79e85a07ad51dec362 Mon Sep 17 00:00:00 2001 From: rahuel Date: Wed, 26 Oct 2005 12:59:11 +0000 Subject: [PATCH] omniORB4 porting --- idl/SUPERV.idl | 4 ---- src/Supervision/Value_Impl.cxx | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/idl/SUPERV.idl b/idl/SUPERV.idl index 80ef176..f4502eb 100644 --- a/idl/SUPERV.idl +++ b/idl/SUPERV.idl @@ -282,10 +282,6 @@ Creates a value of any type which will be used for Input metho \param ior String parameter defining %IOR of the graph. */ SUPERV::StreamGraph getStreamGraph(in string ior); // get Graph from is IOR -/*! -Returns a duplicate of the object (omniORB4 problem). -*/ - Object ToObject( in Object anObject ) ; }; diff --git a/src/Supervision/Value_Impl.cxx b/src/Supervision/Value_Impl.cxx index aa2e249..42350a9 100644 --- a/src/Supervision/Value_Impl.cxx +++ b/src/Supervision/Value_Impl.cxx @@ -295,7 +295,11 @@ char * Value_Impl::ToString() { case CORBA::tk_objref: { CORBA::Object_ptr obj ; try { +#if OMNIORB_VERSION >= 4 + anAny >>= (CORBA::Any::to_object ) obj ; +#else anAny >>= obj ; +#endif retstr = _Orb->object_to_string( obj ); // MESSAGE( "ToString( object ) '" << retstr << "'" ); } -- 2.30.2