ChangeLogTag:Sat Dec 6 23:42:13 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

6 files changed, 52 insertions, 372 deletions

diff --git a/TAO/tao/Utils/Auto_Functor.cpp b/TAO/tao/Utils/Auto_Functor.cpp
deleted file mode 100644
index 46bd44f5450..00000000000
--- a/TAO/tao/Utils/Auto_Functor.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef TAO_UTILS_AUTO_FUNCTOR_CPP
-#define TAO_UTILS_AUTO_FUNCTOR_CPP
-
-#include "Auto_Functor.h"
-
-#if !defined(__ACE_INLINE__)
-# include "Auto_Functor.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (Utils,
-           Auto_Functor,
-           "$Id$")
-
-template<typename X, typename Functor>
-TAO::Utils::Auto_Functor<X,Functor>::~Auto_Functor()
-  ACE_THROW_SPEC (())
-{
-  reset(0);
-}
-
-template<typename X, typename Functor> void
-TAO::Utils::Auto_Functor<X,Functor>::reset (X * p)
-  ACE_THROW_SPEC (())
-{
-  if(p_ != 0)
-  {
-    f_(p_);
-  }
-  p_ = p;
-}
-
-template<typename X, typename Functor>void
-TAO::Utils::Auto_Functor<X,Functor>::reset (X * p, Functor f)
-  ACE_THROW_SPEC (())
-{
-  reset(p);
-  f_ = f;
-}
-
-#endif /*TAO_UTILS_AUTO_FUNCTOR_CPP*/
diff --git a/TAO/tao/Utils/Auto_Functor.h b/TAO/tao/Utils/Auto_Functor.h
deleted file mode 100644
index 0bfd96ba241..00000000000
--- a/TAO/tao/Utils/Auto_Functor.h
+++ /dev/null
@@ -1,147 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- * @file Auto_Functor.h
- *
- * $Id$
- *
- * @author Carlos O'Ryan <coryan@atdesk.com>
- */
-//=============================================================================
-#ifndef TAO_UTILS_AUTO_FUNCTOR_H
-#define TAO_UTILS_AUTO_FUNCTOR_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Environment.h"
-#include "ace/Global_Macros.h"
-
-
-namespace TAO
-{
-  namespace Utils
-  {
-
-    /**
-     * @class Auto_Functor_Ref
-     *
-     * @brief Helper class to implement assignment and copy-construction
-     *        as expected
-     */
-    template<typename X, typename Functor>
-    struct Auto_Functor_Ref
-    {
-      X * p_;
-      Functor f_;
-
-      Auto_Functor_Ref(X * p, Functor f);
-    };
-
-    /**
-     * @class Auto_Functor
-     *
-     * @brief Helper template to implement auto_ptr<>-like classes, but
-     *    executing a functor in the destructor, instead of always
-     *    deleting things.
-     *
-     * The functor is called in the destructor, and it must implement:
-     *
-     * Functor() throw();<BR>
-     * Functor(Functor const &) throw();<BR>
-     * Functor & operator=(Functor const &) throw();<BR>
-     * void operator()(X * p) throw();<BR>
-     *
-     */
-    template<typename X, typename Functor>
-    class Auto_Functor
-    {
-    public:
-      typedef X element_type;
-      typedef Functor functor_type;
-
-      /// Constructor
-      explicit Auto_Functor (X * p = 0,
-                             Functor functor = Functor())
-        ACE_THROW_SPEC (());
-
-      Auto_Functor (Auto_Functor & rhs)
-        ACE_THROW_SPEC (());
-
-      Auto_Functor<X,Functor>& operator= (Auto_Functor & rhs)
-        ACE_THROW_SPEC (());
-
-#if !defined(ACE_LACKS_MEMBER_TEMPLATES)
-      template<typename Y>
-      Auto_Functor(Auto_Functor<Y,Functor>& rhs)
-        ACE_THROW_SPEC (());
-
-      template<typename Y>
-      Auto_Functor<X,Functor>& operator= (Auto_Functor<Y,Functor>& rhs)
-        ACE_THROW_SPEC (());
-#endif /* ACE_LACKS_MEMBER_TEMPLATES */
-
-      ~Auto_Functor()
-        ACE_THROW_SPEC (());
-
-      X & operator*() const
-        ACE_THROW_SPEC (());
-
-      X * operator->() const
-        ACE_THROW_SPEC (());
-
-      X * get()
-        ACE_THROW_SPEC (());
-
-      X * release()
-        ACE_THROW_SPEC (());
-
-      void reset (X * p = 0)
-        ACE_THROW_SPEC (());
-
-      void reset (X * p, Functor f)
-        ACE_THROW_SPEC (());
-
-      Functor const & functor() const
-        ACE_THROW_SPEC (());
-
-      Auto_Functor(Auto_Functor_Ref<X,Functor> rhs)
-        ACE_THROW_SPEC (());
-
-      Auto_Functor<X,Functor> & operator=(Auto_Functor_Ref<X,Functor> rhs)
-        ACE_THROW_SPEC (());
-
-#if !defined(ACE_LACKS_MEMBER_TEMPLATES)
-      template<typename Y> operator Auto_Functor_Ref<Y,Functor>()
-        ACE_THROW_SPEC (());
-
-      template<typename Y> operator Auto_Functor<Y,Functor>()
-        ACE_THROW_SPEC (());
-#else
-      operator Auto_Functor_Ref<X,Functor>()
-        ACE_THROW_SPEC (());
-#endif /* ACE_LACKS_MEMBER_TEMPLATES */
-
-    private:
-      X * p_;
-
-      Functor f_;
-    };
-
-  } // namespace Utils
-} // namespace TAO
-
-#if defined(__ACE_INLINE__)
-# include "Auto_Functor.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined(ACE_TEMPLATES_REQUIRE_SOURCE)
-# include "Auto_Functor.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_UTILS_AUTO_FUNCTOR_H*/
diff --git a/TAO/tao/Utils/Auto_Functor.inl b/TAO/tao/Utils/Auto_Functor.inl
deleted file mode 100644
index b880c94fd76..00000000000
--- a/TAO/tao/Utils/Auto_Functor.inl
+++ /dev/null
@@ -1,143 +0,0 @@
-// $Id$
-
-template<typename X, typename Functor> ACE_INLINE
-TAO::Utils::Auto_Functor_Ref<X,Functor>::
-Auto_Functor_Ref(X * p, Functor f)
-  : p_(p)
-  , f_(f)
-{
-}
-
-template<typename X, typename Functor> ACE_INLINE
-TAO::Utils::Auto_Functor<X,Functor>::Auto_Functor(X * p, Functor f)
-  ACE_THROW_SPEC (())
-  : p_(p)
-  , f_(f)
-{
-}
-
-template<typename X, typename Functor> ACE_INLINE
-TAO::Utils::Auto_Functor<X,Functor>::Auto_Functor(Auto_Functor & rhs)
-  ACE_THROW_SPEC (())
-  : p_(rhs.release())
-  , f_(rhs.f_)
-{
-}
-
-template<typename X, typename Functor>
-ACE_INLINE TAO::Utils::Auto_Functor<X,Functor>&
-TAO::Utils::Auto_Functor<X,Functor>:: operator=(Auto_Functor & rhs)
-  ACE_THROW_SPEC (())
-{
-  reset(rhs.release());
-  f_ = rhs.f_;
-  return *this;
-}
-
-#if !defined(ACE_LACKS_MEMBER_TEMPLATES)
-template<typename X, typename Functor> template<typename Y> ACE_INLINE
-TAO::Utils::Auto_Functor<X,Functor>::Auto_Functor(Auto_Functor<Y,Functor>& rhs)
-  ACE_THROW_SPEC (())
-  : p_(rhs.release())
-  , f_(rhs.f_)
-{
-}
-
-template<typename X, typename Functor> template<typename Y>
-ACE_INLINE TAO::Utils::Auto_Functor<X,Functor>&
-TAO::Utils::Auto_Functor<X,Functor>::operator=(Auto_Functor<Y,Functor>& rhs)
-  ACE_THROW_SPEC (())
-{
-  reset(rhs.release());
-  return *this;
-}
-#endif /* ACE_LACKS_MEMBER_TEMPLATES */
-
-template<typename X, typename Functor> ACE_INLINE X &
-TAO::Utils::Auto_Functor<X,Functor>::operator*() const
-  ACE_THROW_SPEC (())
-{
-  return *p_;
-}
-
-template<typename X, typename Functor>
-ACE_INLINE X *
-TAO::Utils::Auto_Functor<X,Functor>::operator->() const
-  ACE_THROW_SPEC (())
-{
-  return p_;
-}
-
-template<typename X, typename Functor>
-ACE_INLINE X *
-TAO::Utils::Auto_Functor<X,Functor>::get()
-  ACE_THROW_SPEC (())
-{
-  return p_;
-}
-
-template<typename X, typename Functor>
-ACE_INLINE X *
-TAO::Utils::Auto_Functor<X,Functor>::release()
-  ACE_THROW_SPEC (())
-{
-  X * tmp = p_;
-  p_ = 0;
-  return tmp;
-}
-
-template<typename X, typename Functor>
-ACE_INLINE Functor const &
-TAO::Utils::Auto_Functor<X,Functor>::functor() const
-  ACE_THROW_SPEC (())
-{
-  return f_;
-}
-
-template<typename X, typename Functor> ACE_INLINE
-TAO::Utils::Auto_Functor<X,Functor>::Auto_Functor(Auto_Functor_Ref<X,Functor> rhs)
-  ACE_THROW_SPEC (())
-  : p_(rhs.p_)
-  , f_(rhs.f_)
-{
-}
-
-template<typename X, typename Functor>
-ACE_INLINE TAO::Utils::Auto_Functor<X,Functor> &
-TAO::Utils::Auto_Functor<X,Functor>::operator=(Auto_Functor_Ref<X,Functor> rhs)
-  ACE_THROW_SPEC (())
-{
-  if(rhs.p_ != p_)
-  {
-    reset(rhs.p_);
-    f_ = rhs.f_;
-  }
-  return *this;
-}
-
-#if !defined(ACE_LACKS_MEMBER_TEMPLATES)
-
-template<typename X, typename Functor> template<typename Y> ACE_INLINE
-TAO::Utils::Auto_Functor<X,Functor>::operator TAO::Utils::Auto_Functor_Ref<Y,Functor>()
-  ACE_THROW_SPEC (())
-{
-  return TAO::Utils::Auto_Functor_Ref<Y,Functor>(release(), f_);
-}
-
-template<typename X, typename Functor> template<typename Y> ACE_INLINE
-TAO::Utils::Auto_Functor<X,Functor>::operator TAO::Utils::Auto_Functor<Y,Functor>()
-  ACE_THROW_SPEC (())
-{
-  return TAO::Utils::Auto_Functor<Y,Functor>(release(), f_);
-}
-
-#else
-
-template<typename X, typename Functor>ACE_INLINE
-TAO::Utils::Auto_Functor<X,Functor>::operator TAO::Utils::Auto_Functor_Ref<X,Functor>()
-  ACE_THROW_SPEC (())
-{
-  return TAO::Utils::Auto_Functor_Ref<X,Functor>(release(), f_);
-}
-
-#endif /* ACE_LACKS_MEMBER_TEMPLATES */
diff --git a/TAO/tao/Utils/Implicit_Deactivator.h b/TAO/tao/Utils/Implicit_Deactivator.h
index 34befe31259..8cdd14f753d 100644
--- a/TAO/tao/Utils/Implicit_Deactivator.h
+++ b/TAO/tao/Utils/Implicit_Deactivator.h
@@ -13,13 +13,13 @@
 #include /**/ "ace/pre.h"
 #include "utils_export.h"
 
-#include "Auto_Functor.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PortableServer/PortableServer.h"
+#include "tao/Auto_Functor.h"
 
 
 namespace TAO
diff --git a/TAO/tao/Utils/Makefile b/TAO/tao/Utils/Makefile
index 9b623eca08a..bd73570db5f 100644
--- a/TAO/tao/Utils/Makefile
+++ b/TAO/tao/Utils/Makefile
@@ -20,7 +20,6 @@ CPP_SRCS += \
   PolicyList_Destroyer
 
 TEMPLATE_FILES = \
-	Auto_Functor \
 	RIR_Narrow \
 	Servant_Var
 
@@ -57,17 +56,18 @@ CPPFLAGS += -I$(TAO_ROOT)
 
 
 .obj/ORB_Destroyer.o .obj/ORB_Destroyer.so .shobj/ORB_Destroyer.o .shobj/ORB_Destroyer.so: ORB_Destroyer.cpp ORB_Destroyer.h \
-  $(ACE_ROOT)/ace/pre.h \
-  utils_export.h \
+  $(ACE_ROOT)/ace/pre.h utils_export.h \
+  $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config.h \
+  $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/OS_main.h \
-  Auto_Functor.h \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
-  $(TAO_ROOT)/tao/Basic_Types.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/os_include/os_limits.h \
   $(ACE_ROOT)/ace/os_include/os_unistd.h \
@@ -85,12 +85,7 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/os_include/os_ucontext.h \
   $(ACE_ROOT)/ace/os_include/sys/os_resource.h \
   $(ACE_ROOT)/ace/os_include/sys/os_time.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
-  $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  $(TAO_ROOT)/tao/CORBA_methods.h \
-  $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/os_include/os_errno.h \
@@ -98,18 +93,15 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/Synch_Traits.h \
   $(ACE_ROOT)/ace/Lock.h \
   $(ACE_ROOT)/ace/Lock.inl \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/default_environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  Auto_Functor.inl Auto_Functor.cpp \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SStringfwd.h \
   $(ACE_ROOT)/ace/iosfwd.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/Basic_Types.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
   $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
@@ -122,12 +114,19 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
   $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/default_environment.h \
   $(TAO_ROOT)/tao/Sequence.i \
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
   $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/CORBA_methods.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Array_VarOut_T.h \
@@ -147,6 +146,7 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/os_include/os_string.h \
   $(ACE_ROOT)/ace/os_include/os_ctype.h \
   $(ACE_ROOT)/ace/OS_NS_wchar.inl \
+  $(ACE_ROOT)/ace/os_include/os_search.h \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/Seq_Var_T.h \
   $(TAO_ROOT)/tao/Seq_Var_T.inl \
@@ -228,18 +228,26 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/RW_Mutex.inl \
   $(ACE_ROOT)/ace/RW_Thread_Mutex.inl \
   $(ACE_ROOT)/ace/Guard_T.cpp \
-  $(TAO_ROOT)/tao/ORB.i
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Auto_Functor.h \
+  $(TAO_ROOT)/tao/Auto_Functor.inl \
+  $(TAO_ROOT)/tao/Auto_Functor.cpp
 
 .obj/Implicit_Deactivator.o .obj/Implicit_Deactivator.so .shobj/Implicit_Deactivator.o .shobj/Implicit_Deactivator.so: Implicit_Deactivator.cpp Implicit_Deactivator.h \
-  $(ACE_ROOT)/ace/pre.h \
-  utils_export.h \
+  $(ACE_ROOT)/ace/pre.h utils_export.h \
+  $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config.h \
+  $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/OS_main.h \
-  Auto_Functor.h \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
   $(TAO_ROOT)/tao/Basic_Types.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -259,10 +267,14 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/os_include/os_ucontext.h \
   $(ACE_ROOT)/ace/os_include/sys/os_resource.h \
   $(ACE_ROOT)/ace/os_include/sys/os_time.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/CORBA_methods.h \
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Global_Macros.h \
@@ -277,15 +289,6 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
   $(TAO_ROOT)/tao/default_environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  Auto_Functor.inl Auto_Functor.cpp \
-  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
-  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
   $(TAO_ROOT)/tao/Exception.h \
   $(ACE_ROOT)/ace/SStringfwd.h \
@@ -322,6 +325,7 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/os_include/os_string.h \
   $(ACE_ROOT)/ace/os_include/os_ctype.h \
   $(ACE_ROOT)/ace/OS_NS_wchar.inl \
+  $(ACE_ROOT)/ace/os_include/os_search.h \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/Seq_Var_T.h \
   $(TAO_ROOT)/tao/Seq_Var_T.inl \
@@ -365,6 +369,9 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/Auto_Functor.h \
+  $(TAO_ROOT)/tao/Auto_Functor.inl \
+  $(TAO_ROOT)/tao/Auto_Functor.cpp \
   $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
   $(TAO_ROOT)/tao/Collocation_Strategy.h \
@@ -416,12 +423,15 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/PortableServer/Servant_Base.i
 
 .obj/PolicyList_Destroyer.o .obj/PolicyList_Destroyer.so .shobj/PolicyList_Destroyer.o .shobj/PolicyList_Destroyer.so: PolicyList_Destroyer.cpp PolicyList_Destroyer.h \
-  $(ACE_ROOT)/ace/pre.h \
-  utils_export.h \
+  $(ACE_ROOT)/ace/pre.h utils_export.h \
+  $(ACE_ROOT)/ace/config-all.h \
+  $(ACE_ROOT)/ace/config.h \
+  $(ACE_ROOT)/ace/$(ACE_PLATFORM_CONFIG) \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/OS_main.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
@@ -451,7 +461,6 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/os_include/os_ucontext.h \
   $(ACE_ROOT)/ace/os_include/sys/os_resource.h \
   $(ACE_ROOT)/ace/os_include/sys/os_time.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/CDR_Base.inl \
@@ -499,6 +508,7 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/os_include/os_string.h \
   $(ACE_ROOT)/ace/os_include/os_ctype.h \
   $(ACE_ROOT)/ace/OS_NS_wchar.inl \
+  $(ACE_ROOT)/ace/os_include/os_search.h \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/Seq_Var_T.h \
   $(TAO_ROOT)/tao/Seq_Var_T.inl \
diff --git a/TAO/tao/Utils/ORB_Destroyer.h b/TAO/tao/Utils/ORB_Destroyer.h
index 4a51a2b835b..3b6d1de8393 100644
--- a/TAO/tao/Utils/ORB_Destroyer.h
+++ b/TAO/tao/Utils/ORB_Destroyer.h
@@ -12,13 +12,13 @@
 #define TAO_UTILS_ORB_DESTROYER_H
 #include /**/ "ace/pre.h"
 #include "utils_export.h"
-#include "Auto_Functor.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/ORB.h"
+#include "tao/Auto_Functor.h"
 
 namespace TAO
 {