Sun Aug 13 23:30:02 UTC 2006 Yan Dai <dai_y@ociweb.com>

14 files changed, 108 insertions, 29 deletions

diff --git a/TAO/tao/EndpointPolicy.mpc b/TAO/tao/EndpointPolicy.mpc
index 81dd300ed24..fe00fe7a5b7 100644
--- a/TAO/tao/EndpointPolicy.mpc
+++ b/TAO/tao/EndpointPolicy.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, core, portableserver, pi, tao_versioning_idl_defaults, tao_no_iiop {
+project : taolib, core, portableserver, pi, tao_versioning_idl_defaults, tao_no_iiop, minimum_corba {
   sharedname   = TAO_EndpointPolicy
   dynamicflags = TAO_ENDPOINTPOLICY_BUILD_DLL
 
diff --git a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
index 06c7b2c22b2..eafd895d3a6 100644
--- a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
+++ b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
@@ -7,6 +7,7 @@ ACE_RCSID(PortableServer,
           Acceptor_Filter_Factory,
           "$Id$")
 
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -44,3 +45,8 @@ ACE_STATIC_SVC_DEFINE (TAO_Acceptor_Filter_Factory,
                        ACE_Service_Type::DELETE_THIS
                        | ACE_Service_Type::DELETE_OBJ,
                        0)
+
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */
+
+
diff --git a/TAO/tao/PortableServer/Acceptor_Filter_Factory.h b/TAO/tao/PortableServer/Acceptor_Filter_Factory.h
index ae855be04da..f84c13217b8 100644
--- a/TAO/tao/PortableServer/Acceptor_Filter_Factory.h
+++ b/TAO/tao/PortableServer/Acceptor_Filter_Factory.h
@@ -26,10 +26,13 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Versioned_Namespace.h"
+#include "tao/orbconf.h"
 
 #include "ace/Service_Object.h"
 #include "ace/Service_Config.h"
 
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_POA_Manager;
@@ -70,4 +73,6 @@ ACE_FACTORY_DECLARE (TAO_PortableServer, TAO_Acceptor_Filter_Factory)
 
 #include /**/ "ace/post.h"
 
+#endif /* #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)*/
+
 #endif /* TAO_ACCEPTOR_FILTER_FACTORY_H */
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index 3eae35d0ece..31315315f03 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -52,7 +52,7 @@ ACE_RCSID (PortableServer,
            Object_Adapter,
            "$Id$")
 
-#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 namespace PortableServer
 {
   class POAManagerFactory;
@@ -157,6 +157,9 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ
     non_servant_upcall_nesting_level_ (0),
     non_servant_upcall_thread_ (ACE_OS::NULL_thread),
     root_ (0),
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+    poa_manager_factory_ (0),
+#endif
     default_validator_ (orb_core),
     default_poa_policies_ ()
 {
@@ -609,7 +612,7 @@ TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL)
                TAO_Default_Servant_Dispatcher);
     }
 
-#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   ACE_NEW_THROW_EX (this->poa_manager_factory_,
                     TAO_POAManager_Factory (*this),
                     CORBA::NO_MEMORY ());
@@ -622,15 +625,13 @@ TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 #else
   PortableServer::POAManager_var poa_manager;
-  PortableServer::POAManager_ptr pm = PortableServer::POAManager::_nil ();
   ::CORBA::PolicyList policy_list;
-  ACE_NEW_THROW_EX (pm,
-                    TAO_POA_Manager (*this, 0, policy_list, 0),
+  ACE_NEW_THROW_EX (poa_manager,
+                    TAO_POA_Manager (*this, TAO_DEFAULT_ROOTPOAMANAGER_NAME),
                     CORBA::NO_MEMORY
                     (CORBA::SystemException::_tao_minor_code (0, ENOMEM),
                       CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (::PortableServer::POAManager::_nil ());
-  poa_manager = pm;
+  ACE_CHECK;
 #endif
 
   // This makes sure that the default resources are open when the Root
@@ -714,17 +715,22 @@ TAO_Object_Adapter::close (int wait_for_completion
   // etherealizations have finished and root POA has been destroyed
   // (implying that all descendent POAs have also been destroyed).
   TAO_Root_POA *root = 0;
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   TAO_POAManager_Factory* factory = 0;
+#endif
   {
     ACE_GUARD (ACE_Lock, ace_mon, this->lock ());
     if (this->root_ == 0)
       return;
     root = this->root_;
     this->root_ = 0;
+
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
     if (this->poa_manager_factory_ == 0)
       return;
     factory = this->poa_manager_factory_;
     this->poa_manager_factory_ = 0;
+#endif
   }
   CORBA::Boolean etherealize_objects = 1;
   root->destroy (etherealize_objects,
@@ -732,7 +738,7 @@ TAO_Object_Adapter::close (int wait_for_completion
                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   ::CORBA::release (root);
-#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   ::CORBA::release (factory);
 #endif
 }
diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h
index 910dec673e2..e70ac6edeb9 100644
--- a/TAO/tao/PortableServer/Object_Adapter.h
+++ b/TAO/tao/PortableServer/Object_Adapter.h
@@ -494,8 +494,10 @@ private:
   /// The Root POA
   TAO_Root_POA *root_;
 
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   /// The POAManager factory.
   TAO_POAManager_Factory *poa_manager_factory_;
+#endif
 
   /// The default validator and the beginning of the chain of
   /// policy validators.
diff --git a/TAO/tao/PortableServer/POA.pidl b/TAO/tao/PortableServer/POA.pidl
index 43a0791f165..c9cebdd32b1 100644
--- a/TAO/tao/PortableServer/POA.pidl
+++ b/TAO/tao/PortableServer/POA.pidl
@@ -173,7 +173,7 @@ module PortableServer
     readonly attribute POAList      the_children;
 #       endif
     readonly attribute POAManager   the_POAManager;
-#   if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO)
+#   if (TAO_HAS_MINIMUM_POA == 0) && ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO)
     readonly attribute POAManagerFactory   the_POAManagerFactory;
 #endif
 #       if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO) && !defined (TAO_HAS_MINIMUM_POA)
diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp
index da2b09558cc..344495551a1 100644
--- a/TAO/tao/PortableServer/POAManager.cpp
+++ b/TAO/tao/PortableServer/POAManager.cpp
@@ -20,27 +20,34 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_POA_Manager::TAO_POA_Manager (
   TAO_Object_Adapter &object_adapter,
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   const char * id,
   const ::CORBA::PolicyList &policies,
   PortableServer::POAManagerFactory_ptr poa_manager_factory)
+#else
+  const char * id)
+#endif
   : state_ (PortableServer::POAManager::HOLDING),
     lock_ (object_adapter.lock ()),
     poa_collection_ (),
     object_adapter_ (object_adapter),
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
     id_ (id == 0 ? this->generate_manager_id () : CORBA::string_dup (id)),
-#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
     poa_manager_factory_ (* dynamic_cast <TAO_POAManager_Factory*> (poa_manager_factory)),
-#endif
     policies_ (policies)
 {
-#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   poa_manager_factory_._add_ref ();
-#endif
 }
+#else
+    id_ (id == 0 ? this->generate_manager_id () : CORBA::string_dup (id))
+{
+}
+#endif
+
 
 TAO_POA_Manager::~TAO_POA_Manager (void)
 {
-#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   poa_manager_factory_._remove_ref ();
 #endif
 }
@@ -315,16 +322,21 @@ TAO_POA_Manager::remove_poa (TAO_Root_POA *poa)
 {
   int const result = this->poa_collection_.remove (poa);
 
+  // The #if really only needs to go around the 
+  // "this->poa_manager_factory_.remove_poamanager (this);" line, but it's 
+  // moved out as an optimization for now.  If additional non-CORBA/e and 
+  // non-minimum POA code needs to go in that clause the #if would have to 
+  // move back in.
+
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   if (result == 0)
     {
       if (this->poa_collection_.is_empty ())
         {
-#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
           this->poa_manager_factory_.remove_poamanager (this);
-#endif
         }
     }
-
+#endif
   return result;
 }
 
diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h
index 64b9d71e8d4..386f008e10c 100644
--- a/TAO/tao/PortableServer/POAManager.h
+++ b/TAO/tao/PortableServer/POAManager.h
@@ -42,6 +42,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // Forward decl.
 class TAO_Root_POA;
 class TAO_Object_Adapter;
+
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 class TAO_POAManager_Factory;
 
 namespace PortableServer
@@ -49,6 +51,7 @@ namespace PortableServer
   class POAManagerFactory;
   typedef POAManagerFactory *POAManagerFactory_ptr;
 }
+#endif
 
 class TAO_PortableServer_Export TAO_POA_Manager :
   public PortableServer::POAManager,
@@ -90,9 +93,13 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   TAO_POA_Manager (TAO_Object_Adapter &object_adapter,
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
                    const char * id,
                    const ::CORBA::PolicyList & policies,
                    PortableServer::POAManagerFactory_ptr poa_manager_factory);
+#else
+                   const char * id);
+#endif
 
   ~TAO_POA_Manager (void);
 
@@ -106,7 +113,9 @@ public:
       ACE_ENV_SINGLE_ARG_DECL
     );
 
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   CORBA::PolicyList& get_policies ();
+#endif
 
 protected:
 
@@ -160,11 +169,13 @@ protected:
 
   CORBA::String_var id_;
 
-#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+  
   TAO_POAManager_Factory& poa_manager_factory_;
+  CORBA::PolicyList policies_;
+
 #endif
 
-  CORBA::PolicyList policies_;
 
 private :
 
diff --git a/TAO/tao/PortableServer/POAManager.inl b/TAO/tao/PortableServer/POAManager.inl
index 5dad4c14de5..9c47eea1ba6 100644
--- a/TAO/tao/PortableServer/POAManager.inl
+++ b/TAO/tao/PortableServer/POAManager.inl
@@ -127,11 +127,16 @@ TAO_POA_Manager::generate_manager_id (void) const
   return buf;
 }
 
+
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+
 ACE_INLINE 
 CORBA::PolicyList& TAO_POA_Manager::get_policies ()
 {
   return this->policies_;
 }
 
+#endif
+
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/POAManagerFactory.cpp b/TAO/tao/PortableServer/POAManagerFactory.cpp
index 261094af3a9..311e18fdf0a 100644
--- a/TAO/tao/PortableServer/POAManagerFactory.cpp
+++ b/TAO/tao/PortableServer/POAManagerFactory.cpp
@@ -9,7 +9,7 @@ ACE_RCSID (PortableServer,
            POAManagerFactory,
            "$Id$")
 
-#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/PortableServer/POAManagerFactory.h b/TAO/tao/PortableServer/POAManagerFactory.h
index ab2b6da2b19..24c7c43c4ab 100644
--- a/TAO/tao/PortableServer/POAManagerFactory.h
+++ b/TAO/tao/PortableServer/POAManagerFactory.h
@@ -34,7 +34,7 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/PortableServer/POAManagerFactory.pidl b/TAO/tao/PortableServer/POAManagerFactory.pidl
index 56d5315bcba..502b8727168 100644
--- a/TAO/tao/PortableServer/POAManagerFactory.pidl
+++ b/TAO/tao/PortableServer/POAManagerFactory.pidl
@@ -21,7 +21,7 @@
 
 #pragma prefix "omg.org"
 
-#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 module PortableServer
 {
diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp
index 5e7121a0806..31e240c2006 100644
--- a/TAO/tao/PortableServer/Root_POA.cpp
+++ b/TAO/tao/PortableServer/Root_POA.cpp
@@ -219,7 +219,11 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name,
                             ACE_ENV_ARG_DECL)
   : name_ (name),
     poa_manager_ (* (dynamic_cast <TAO_POA_Manager*> (poa_manager))),
+
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
     poa_manager_factory_ (* (object_adapter->poa_manager_factory_)),
+#endif
+
     tagged_component_ (),
     tagged_component_id_ (),
     profile_id_array_ (0),
@@ -243,7 +247,11 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name,
     wait_for_completion_pending_ (0),
     waiting_destruction_ (0),
     servant_deactivation_condition_ (thread_lock),
+
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
     filter_factory_ (0),
+#endif 
+
     caller_key_to_object_ (0),
     servant_for_key_to_object_ (0)
 {
@@ -417,7 +425,8 @@ TAO_Root_POA::create_POA_i (const char *adapter_name,
 
   if (CORBA::is_nil (poa_manager))
     {
-#if !defined (CORBA_E_COMPACT)
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) 
+
       PortableServer::POA_var poa = PortableServer::POA::_duplicate (this);
       PortableServer::POA_var root_poa;
 
@@ -442,8 +451,14 @@ TAO_Root_POA::create_POA_i (const char *adapter_name,
         = tao_poa_manager_factory->create_POAManager (0,
                                                       empty_policies
                                                       ACE_ENV_ARG_PARAMETER);
+#else
+  
+      ACE_NEW_THROW_EX (the_poa_manager,
+                        TAO_POA_Manager (this->object_adapter (), 0),
+                        CORBA::NO_MEMORY ());
+#endif /* TAO_HAS_MINIMUM_POA == 0 && ! CORBA_E_COMPACT) */
+
       ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-#endif /* !CORBA_E_COMPACT */
     }
   else
     {
@@ -2289,13 +2304,21 @@ TAO_Root_POA::key_to_stub_i (const TAO::ObjectKey &key,
     this->client_exposed_policies (priority
                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
+  
+  TAO_Acceptor_Filter* filter = 0;
 
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   if (this->filter_factory_ == 0)
     this->filter_factory_
       = ACE_Dynamic_Service<TAO_Acceptor_Filter_Factory>::instance ("TAO_Acceptor_Filter_Factory");
 
-  TAO_Acceptor_Filter* filter =
+  filter =
     this->filter_factory_->create_object (this->poa_manager_);
+#else
+  ACE_NEW_RETURN (filter,
+                  TAO_Default_Acceptor_Filter (),
+                  0);
+#endif
 
   // Give ownership to the auto pointer.
   auto_ptr<TAO_Acceptor_Filter> new_filter (filter);
@@ -2910,7 +2933,7 @@ TAO_Root_POA::the_POAManager (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   return PortableServer::POAManager::_duplicate (&this->poa_manager_);
 }
 
-#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 PortableServer::POAManagerFactory_ptr
 TAO_Root_POA::the_POAManagerFactory (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
diff --git a/TAO/tao/PortableServer/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h
index ba87151912f..d4166ebfc5c 100644
--- a/TAO/tao/PortableServer/Root_POA.h
+++ b/TAO/tao/PortableServer/Root_POA.h
@@ -68,11 +68,15 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Forward Declaration
 class TAO_Acceptor_Filter;
+
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 class TAO_Acceptor_Filter_Factory;
+class TAO_POAManager_Factory;
+#endif
+
 class TAO_Acceptor_Registry;
 class TAO_IORInfo;
 class TAO_Regular_POA;
-class TAO_POAManager_Factory;
 
 namespace PortableInterceptor
 {
@@ -215,7 +219,7 @@ public:
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   PortableServer::POAManagerFactory_ptr the_POAManagerFactory (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -891,8 +895,11 @@ protected:
 
   /// Reference to the POAManager that this poa assicuates with.
   TAO_POA_Manager &poa_manager_;
+
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   /// Reference to the POAManagerFactory that generate the POAManager.
   TAO_POAManager_Factory& poa_manager_factory_;
+#endif
 
   IOP::TaggedComponentList tagged_component_;
 
@@ -952,7 +959,9 @@ protected:
 
   TAO_SYNCH_CONDITION servant_deactivation_condition_;
 
+#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   TAO_Acceptor_Filter_Factory * filter_factory_;
+#endif
 
 public:
     // @todo Temporarily for servant retention