diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2002-07-13 20:27:20 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2002-07-13 20:27:20 +0000 |
| commit | a4abacfb9aab3a294984e08a96151cf1cc7fee9a (patch) | |
| tree | 24bfb0bbb12bccdcb58f0ed4cf4c8448acd26f47 | |
| parent | 5417a43a5f75bb99c4461ec12b45b732023eb46e (diff) | |
| download | ATCD-a4abacfb9aab3a294984e08a96151cf1cc7fee9a.tar.gz | |
ChangeLogTag: Sat Jul 13 15:26:33 2002 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/tao/Utils/Makefile | 13 | ||||
| -rw-r--r-- | TAO/tao/Utils/RIR_Narrow.cpp | 13 | ||||
| -rw-r--r-- | TAO/tao/Utils/RIR_Narrow.h | 15 |
4 files changed, 30 insertions, 16 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index b3d5a258257..7b580a97f51 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Sat Jul 13 15:26:33 2002 Balachandran Natarajan <bala@cs.wustl.edu> + + * tao/Utils/RIR_Narrow.cpp (narrow): + * tao/Utils/RIR_Narrow.h: Fixed some more fuzz errors. + Sat Jul 13 15:19:20 2002 Balachandran Natarajan <bala@cs.wustl.edu> * tests/RTCORBA/common_args.cpp (get_protocols): Fixed a compile diff --git a/TAO/tao/Utils/Makefile b/TAO/tao/Utils/Makefile index 7e6c790be5b..8fe7af65f9c 100644 --- a/TAO/tao/Utils/Makefile +++ b/TAO/tao/Utils/Makefile @@ -8,10 +8,9 @@ ifndef TAO_ROOT endif # ! TAO_ROOT MAKEFILE = Makefile -LIBNAME = libTAO_Utils -LIB = $(LIBNAME).a -SHLIB = $(LIBNAME).$(SOEXT) - +LIBNAME_UNCHECKED = libTAO_Utils +SHLIB = $(LIBNAME).$(SHARED_EXT) +LIB = $(LIBNAME).a ACE_SHLIBS = -lTAO_PortableServer -lTAO -lACE CPP_SRCS += \ @@ -33,8 +32,12 @@ LSRC = $(addsuffix .cpp,$(FILES)) #---------------------------------------------------------------------------- include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(TAO_ROOT)/rules.tao.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU +ifeq ($(exceptions),1) +LIBNAME=$(LIBNAME_UNCHECKED) +SHARED_EXT=$(SOEXT) +endif # exceptions +include $(TAO_ROOT)/rules.tao.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU diff --git a/TAO/tao/Utils/RIR_Narrow.cpp b/TAO/tao/Utils/RIR_Narrow.cpp index 692beebdd13..370f7540d6a 100644 --- a/TAO/tao/Utils/RIR_Narrow.cpp +++ b/TAO/tao/Utils/RIR_Narrow.cpp @@ -19,7 +19,7 @@ TAO::Utils::RIR_Narrow<T>::narrow (CORBA::ORB_ptr orb, { CORBA::Object_var object = orb->resolve_initial_references (id - ACE_ENV_ARG_DECL); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (T::_nil ()); return RIR_Narrow<T>::narrow_object (object.in () @@ -28,11 +28,16 @@ TAO::Utils::RIR_Narrow<T>::narrow (CORBA::ORB_ptr orb, template<class T> TAO::Utils::RIR_Narrow<T>::_ptr_type TAO::Utils::RIR_Narrow<T>::narrow (PortableInterceptor::ORBInitInfo_ptr info, - char const * id) + char const * id + ACE_ENV_ARG_DECL) { CORBA::Object_var object = - info->resolve_initial_references (id); - return RIR_Narrow<T>::narrow_object (object.in ()); + info->resolve_initial_references (id + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (T::_nil ()); + + return RIR_Narrow<T>::narrow_object (object.in () + ACE_ENV_ARG_PARAMETER); } template<class T> TAO::Utils::RIR_Narrow<T>::_ptr_type diff --git a/TAO/tao/Utils/RIR_Narrow.h b/TAO/tao/Utils/RIR_Narrow.h index 358fc450906..c8d42506532 100644 --- a/TAO/tao/Utils/RIR_Narrow.h +++ b/TAO/tao/Utils/RIR_Narrow.h @@ -31,19 +31,20 @@ public: /// Use resolve_initial_references to find an object and then /// narrow it. static _ptr_type narrow (CORBA::ORB_ptr orb, - char const * id, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()); + char const * id + ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_ + /// Use resolve_initial_references to find an object and then /// narrow it. static _ptr_type narrow (PortableInterceptor::ORBInitInfo_ptr orb, - char const * id); + char const * id + ACE_ENV_ARG_DECL_WITH_DEFAULTS); private: - static _ptr_type narrow_object (CORBA::Object_ptr object, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()); + static _ptr_type narrow_object (CORBA::Object_ptr object + ACE_ENV_ARG_DECL_WITH_DEFAULTS); }; } // namespace Utils |