*** empty log message ***

1 files changed, 11 insertions, 199 deletions

diff --git a/TAO/tao/POAC.i b/TAO/tao/POAC.i
index 58b8246b725..55604f8e096 100644
--- a/TAO/tao/POAC.i
+++ b/TAO/tao/POAC.i
@@ -382,6 +382,8 @@ PortableServer::_tao_seq_Octet_out::operator[] (CORBA::ULong index)
 
 #endif // end #if !defined
 
+#if !defined (TAO_HAS_MINIMUM_CORBA)
+
 ACE_INLINE
 PortableServer::ThreadPolicy::ThreadPolicy(
                                            STUB_Object *objref,
@@ -505,7 +507,6 @@ PortableServer::ThreadPolicy_var::_retn (void)
 
 #endif // end #if !defined
 
-
 #if !defined (_PORTABLESERVER_THREADPOLICY___OUT_CI_)
 #define _PORTABLESERVER_THREADPOLICY___OUT_CI_
 
@@ -575,6 +576,8 @@ PortableServer::ThreadPolicy_out::operator-> (void)
 
 #endif // end #if !defined
 
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
 ACE_INLINE
 PortableServer::LifespanPolicy::LifespanPolicy(
                                                STUB_Object *objref,
@@ -1154,6 +1157,8 @@ PortableServer::IdAssignmentPolicy_out::operator-> (void)
 
 #endif // end #if !defined
 
+#if !defined (TAO_HAS_MINIMUM_CORBA)
+
 ACE_INLINE
 PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy(
                                                                    STUB_Object *objref,
@@ -1733,204 +1738,7 @@ PortableServer::RequestProcessingPolicy_out::operator-> (void)
 
 #endif // end #if !defined
 
-// **************************************************
-//
-// TAO spcific POA locking policy (non-standard)
-//
-// **************************************************
-
-ACE_INLINE
-PortableServer::SynchronizationPolicy::SynchronizationPolicy(
-                                                             STUB_Object *objref,
-                                                             TAO_ServantBase *servant,
-                                                             CORBA::Boolean collocated
-                                                             )
-  : ACE_CORBA_1 (Object) (objref, servant, collocated)
-{}
-
-ACE_INLINE
-PortableServer::SynchronizationPolicy::~SynchronizationPolicy (void) // destructor
-{}
-
-ACE_INLINE PortableServer::SynchronizationPolicy_ptr
-PortableServer::SynchronizationPolicy::_nil (void)
-{
-  return (PortableServer::SynchronizationPolicy_ptr)0;
-}
-
-
-#if !defined (_PORTABLESERVER_SYNCHRONIZATIONPOLICY___VAR_CI_)
-#define _PORTABLESERVER_SYNCHRONIZATIONPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::SynchronizationPolicy_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::SynchronizationPolicy_var::SynchronizationPolicy_var (void) // default constructor
-  : ptr_ (PortableServer::SynchronizationPolicy::_nil ())
-{}
-
-ACE_INLINE
-PortableServer::SynchronizationPolicy_var::SynchronizationPolicy_var (PortableServer::SynchronizationPolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE PortableServer::SynchronizationPolicy_ptr
-PortableServer::SynchronizationPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::SynchronizationPolicy_var::SynchronizationPolicy_var (const PortableServer::SynchronizationPolicy_var &p) // copy constructor
-  : ptr_ (PortableServer::SynchronizationPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::SynchronizationPolicy_var::~SynchronizationPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::SynchronizationPolicy_var &
-PortableServer::SynchronizationPolicy_var::operator= (PortableServer::SynchronizationPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::SynchronizationPolicy_var &
-PortableServer::SynchronizationPolicy_var::operator= (const PortableServer::SynchronizationPolicy_var &p)
-{
-  if (this != &p)
-    {
-      CORBA::release (this->ptr_);
-      this->ptr_ = PortableServer::SynchronizationPolicy::_duplicate (p.ptr ());
-    }
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::SynchronizationPolicy_var::operator const PortableServer::SynchronizationPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::SynchronizationPolicy_var::operator PortableServer::SynchronizationPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::SynchronizationPolicy_ptr
-PortableServer::SynchronizationPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::SynchronizationPolicy_ptr
-PortableServer::SynchronizationPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::SynchronizationPolicy_ptr &
-PortableServer::SynchronizationPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::SynchronizationPolicy_ptr &
-PortableServer::SynchronizationPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::SynchronizationPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::SynchronizationPolicy_ptr
-PortableServer::SynchronizationPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::SynchronizationPolicy_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::SynchronizationPolicy::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_PORTABLESERVER_SYNCHRONIZATIONPOLICY___OUT_CI_)
-#define _PORTABLESERVER_SYNCHRONIZATIONPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::SynchronizationPolicy_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::SynchronizationPolicy_out::SynchronizationPolicy_out (PortableServer::SynchronizationPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = PortableServer::SynchronizationPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::SynchronizationPolicy_out::SynchronizationPolicy_out (PortableServer::SynchronizationPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::SynchronizationPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::SynchronizationPolicy_out::SynchronizationPolicy_out (PortableServer::SynchronizationPolicy_out &p) // copy constructor
-  : ptr_ (p.ptr_)
-{}
-
-ACE_INLINE PortableServer::SynchronizationPolicy_out &
-PortableServer::SynchronizationPolicy_out::operator= (PortableServer::SynchronizationPolicy_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::SynchronizationPolicy_out &
-PortableServer::SynchronizationPolicy_out::operator= (const PortableServer::SynchronizationPolicy_var &p)
-{
-  this->ptr_ = PortableServer::SynchronizationPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::SynchronizationPolicy_out &
-PortableServer::SynchronizationPolicy_out::operator= (PortableServer::SynchronizationPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::SynchronizationPolicy_out::operator PortableServer::SynchronizationPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::SynchronizationPolicy_ptr &
-PortableServer::SynchronizationPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::SynchronizationPolicy_ptr
-PortableServer::SynchronizationPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
+#endif /* TAO_HAS_MINIMUM_CORBA */
 
 ACE_INLINE
 PortableServer::POAManager::POAManager(
@@ -2125,6 +1933,8 @@ PortableServer::POAManager_out::operator-> (void)
 
 #endif // end #if !defined
 
+#if !defined (TAO_HAS_MINIMUM_CORBA)
+
 ACE_INLINE
 PortableServer::AdapterActivator::AdapterActivator(
                                                    STUB_Object *objref,
@@ -2897,6 +2707,8 @@ PortableServer::ServantLocator_out::operator-> (void)
 
 #endif // end #if !defined
 
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
 ACE_INLINE
 PortableServer::POA::POA(
                          STUB_Object *objref,