diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-02-07 20:50:31 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-02-07 20:50:31 +0000 |
| commit | 71f7b9ab90603783d7e37479d5b87f27d890d035 (patch) | |
| tree | 24ab786b4574f3d50c4ad36fda986329dc294e03 /TAO/orbsvcs/IFR_Service | |
| parent | 7010bf65cc22e527dd72838bfe920965b33c9b21 (diff) | |
| download | ATCD-71f7b9ab90603783d7e37479d5b87f27d890d035.tar.gz | |
ChangeLogTag: Wed Feb 7 14:31:48 2001 Jeff Parsons <parsons@cs.wustl.edu>
Diffstat (limited to 'TAO/orbsvcs/IFR_Service')
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/IFR_Service.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/Makefile | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/Servant_Locator.cpp | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/IFR_Service/Servant_Locator.h | 4 |
4 files changed, 1 insertions, 16 deletions
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp index 3ba8e015e9c..483b243e994 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp @@ -234,15 +234,11 @@ IFR_Service::create_poas (CORBA::Environment &ACE_TRY_ENV) int IFR_Service::create_locator (CORBA::Environment &ACE_TRY_ENV) { -#if (TAO_HAS_MINIMUM_CORBA == 0) - ACE_NEW_THROW_EX (this->servant_locator_impl_, IFR_ServantLocator (this->repo_impl_), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (-1); -#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ - this->ir_object_poa_->set_servant_manager (this->servant_locator_impl_, ACE_TRY_ENV); ACE_CHECK_RETURN (-1); diff --git a/TAO/orbsvcs/IFR_Service/Makefile b/TAO/orbsvcs/IFR_Service/Makefile index 5ae839d65f8..f51c3102bd3 100644 --- a/TAO/orbsvcs/IFR_Service/Makefile +++ b/TAO/orbsvcs/IFR_Service/Makefile @@ -21,11 +21,7 @@ include $(TAO_ROOT)/rules.tao.GNU #---------------------------------------------------------------------------- # Define local rules and targets #--------------------------------------------------------------------------- -MKLIST = Makefile.TypeCodeFactory - -ifneq ($(ACE_HAS_GNUG_PRE_2_8),1) - MKLIST += Makefile.IFR_Service Makefile.tao_ifr -endif # ACE_HAS_GNUG_PRE_2_8 +MKLIST = Makefile.TypeCodeFactory Makefile.IFR_Service Makefile.tao_ifr all debug profile optimize install deinstall clean realclean clobber depend: ifeq (Windows,$(findstring Windows,$(OS))) diff --git a/TAO/orbsvcs/IFR_Service/Servant_Locator.cpp b/TAO/orbsvcs/IFR_Service/Servant_Locator.cpp index ce6903c9c57..bc1ec445067 100644 --- a/TAO/orbsvcs/IFR_Service/Servant_Locator.cpp +++ b/TAO/orbsvcs/IFR_Service/Servant_Locator.cpp @@ -5,8 +5,6 @@ ACE_RCSID(IFR_Service, Servant_Locator, "$Id$") -#if (TAO_HAS_MINIMUM_CORBA == 0) - IFR_ServantLocator::IFR_ServantLocator (TAO_Repository_i *repo) : repo_ (repo) { @@ -66,5 +64,4 @@ IFR_ServantLocator::postinvoke ( delete servant; } -#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/orbsvcs/IFR_Service/Servant_Locator.h b/TAO/orbsvcs/IFR_Service/Servant_Locator.h index 307db6b77c0..a0e631479f2 100644 --- a/TAO/orbsvcs/IFR_Service/Servant_Locator.h +++ b/TAO/orbsvcs/IFR_Service/Servant_Locator.h @@ -25,8 +25,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if (TAO_HAS_MINIMUM_CORBA == 0) - class IFR_ServantLocator : public PortableServer::ServantLocator { // = TITLE @@ -70,6 +68,4 @@ private: // Passed in to each created servant. }; -#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ - #endif /* IFR_SERVANT_LOCATOR_H */ |