Merge pull request #264 from mitza-oci/master

24 files changed, 25 insertions, 9 deletions

diff --git a/ACE/ace/DLL_Manager.cpp b/ACE/ace/DLL_Manager.cpp
index 9d13cb43b09..048787ca657 100644
--- a/ACE/ace/DLL_Manager.cpp
+++ b/ACE/ace/DLL_Manager.cpp
@@ -1,5 +1,6 @@
 #include "ace/DLL_Manager.h"
 
+#include "ace/Auto_Ptr.h"
 #include "ace/Log_Category.h"
 #include "ace/ACE.h"
 #include "ace/Framework_Component.h"
diff --git a/ACE/ace/DLL_Manager.h b/ACE/ace/DLL_Manager.h
index 7ef3002a8de..b9876d7a1b6 100644
--- a/ACE/ace/DLL_Manager.h
+++ b/ACE/ace/DLL_Manager.h
@@ -18,7 +18,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Auto_Ptr.h"
 #include "ace/Containers_T.h"
 #include "ace/SString.h"
 #include "ace/os_include/os_dlfcn.h"
diff --git a/ACE/ace/Intrusive_Auto_Ptr.h b/ACE/ace/Intrusive_Auto_Ptr.h
index 61c52dd871c..3448080f853 100644
--- a/ACE/ace/Intrusive_Auto_Ptr.h
+++ b/ACE/ace/Intrusive_Auto_Ptr.h
@@ -15,7 +15,6 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/Auto_Ptr.h"
 #include "ace/Atomic_Op.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/ACE/ace/Parse_Node.h b/ACE/ace/Parse_Node.h
index 8afa6f025c4..34625229188 100644
--- a/ACE/ace/Parse_Node.h
+++ b/ACE/ace/Parse_Node.h
@@ -22,6 +22,7 @@
 
 #if (ACE_USES_CLASSIC_SVC_CONF == 1)
 
+#include "ace/Auto_Ptr.h"
 #include "ace/DLL.h"
 #include "ace/SString.h"
 #include "ace/Svc_Conf.h"
diff --git a/ACE/ace/SString.cpp b/ACE/ace/SString.cpp
index 6cdcca616d1..1d678159c63 100644
--- a/ACE/ace/SString.cpp
+++ b/ACE/ace/SString.cpp
@@ -1,7 +1,6 @@
 #include "ace/Malloc_T.h"
 #include "ace/OS_Memory.h"
 #include "ace/SString.h"
-#include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_string.h"
 #include "ace/Numeric_Limits.h"
 
diff --git a/ACE/ace/Service_Gestalt.h b/ACE/ace/Service_Gestalt.h
index fc2854652f6..aae3b398124 100644
--- a/ACE/ace/Service_Gestalt.h
+++ b/ACE/ace/Service_Gestalt.h
@@ -20,7 +20,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
 #include "ace/Unbounded_Queue.h"
 #include "ace/Unbounded_Set.h"
diff --git a/ACE/ace/String_Base.cpp b/ACE/ace/String_Base.cpp
index 4f4545a6b05..b12d8c4caaa 100644
--- a/ACE/ace/String_Base.cpp
+++ b/ACE/ace/String_Base.cpp
@@ -4,7 +4,6 @@
 #include "ace/ACE.h"
 #include "ace/Malloc_Base.h"
 #include "ace/String_Base.h"
-#include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_string.h"
 
 #include <algorithm>  // For std::swap<>
diff --git a/ACE/ace/Tokenizer_T.cpp b/ACE/ace/Tokenizer_T.cpp
index 7c2924e0377..5be90545efa 100644
--- a/ACE/ace/Tokenizer_T.cpp
+++ b/ACE/ace/Tokenizer_T.cpp
@@ -4,7 +4,6 @@
 #include "ace/ACE.h"
 #include "ace/Malloc_Base.h"
 #include "ace/String_Base.h"
-#include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_string.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/protocols/ace/HTBP/HTBP_Channel.cpp b/ACE/protocols/ace/HTBP/HTBP_Channel.cpp
index 48d897875b0..4547109ab46 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Channel.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Channel.cpp
@@ -16,6 +16,7 @@
 #include "HTBP_Session.h"
 #include "HTBP_Filter_Factory.h"
 
+#include "ace/Auto_Ptr.h"
 #include "ace/Message_Block.h"
 #include "ace/Reactor.h"
 #include "ace/os_include/netinet/os_tcp.h"
diff --git a/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp b/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp
index 82cf2d324ad..6e7e81b1316 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp
@@ -1,4 +1,5 @@
 // ACE_HTBP_Filter.cpp
+#include "ace/Auto_Ptr.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdio.h"
 #include "HTBP_Session.h"
diff --git a/ACE/protocols/ace/HTBP/HTBP_Session.cpp b/ACE/protocols/ace/HTBP/HTBP_Session.cpp
index 8bda293fe52..8bb83f3b66f 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Session.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Session.cpp
@@ -5,6 +5,8 @@
 #include "ace/SOCK_Connector.h"
 #include "ace/Event_Handler.h"
 #include "ace/os_include/netinet/os_tcp.h"
+#include "ace/Auto_Ptr.h"
+
 #include "HTBP_Filter.h"
 #include "HTBP_ID_Requestor.h"
 
diff --git a/TAO/examples/Simple/grid/Grid_i.cpp b/TAO/examples/Simple/grid/Grid_i.cpp
index df8733c3027..7dc8050e1aa 100644
--- a/TAO/examples/Simple/grid/Grid_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_i.cpp
@@ -1,6 +1,5 @@
 // -*- C++ -*-
 #include "Grid_i.h"
-#include "ace/Auto_Ptr.h"
 
 // Solaris and some Windows compilers don't have min in std namespaces
 // moreover on Windows 'min' is a macro, so we have to avoid using it literally.
diff --git a/TAO/examples/Simple/grid/Grid_i.h b/TAO/examples/Simple/grid/Grid_i.h
index 5386a640d70..b5ca51d374e 100644
--- a/TAO/examples/Simple/grid/Grid_i.h
+++ b/TAO/examples/Simple/grid/Grid_i.h
@@ -13,7 +13,8 @@
 #define GRID_I_H
 
 #include "GridS.h"
-#include <ace/Vector_T.h>
+#include "ace/Vector_T.h"
+#include "ace/Auto_Ptr.h"
 
 /**
  * @class Grid_i:
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp
index 3612005ea7b..d104c0691ba 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp
@@ -2,6 +2,8 @@
 #include "orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h"
 #include "orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h"
 
+#include "ace/Auto_Ptr.h"
+
 #if !defined (__ACE_INLINE__)
 # include "orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.cpp
index d38369a853d..546e326f80a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.cpp
@@ -15,6 +15,8 @@
 #include "tao/Storable_Factory.h"
 #include "tao/Storable_File_Guard.h"
 
+#include "ace/Auto_Ptr.h"
+
 #include <algorithm>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp b/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp
index 15a23d002cf..98172797c7b 100644
--- a/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Timeout/TimeoutTestMain.cpp
@@ -4,6 +4,7 @@
 #include "orbsvcs/CosEventChannelAdminC.h"
 #include "orbsvcs/CosNamingC.h"
 
+#include "ace/Auto_Ptr.h"
 #include "ace/Task.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_strings.h"
diff --git a/TAO/tao/DynamicAny/DynAnyUtils_T.cpp b/TAO/tao/DynamicAny/DynAnyUtils_T.cpp
index 797851a1e5c..7e96685a962 100644
--- a/TAO/tao/DynamicAny/DynAnyUtils_T.cpp
+++ b/TAO/tao/DynamicAny/DynAnyUtils_T.cpp
@@ -26,6 +26,8 @@
 
 #include "tao/DynamicAny/DynAnyFactory.h"
 
+#include "ace/Auto_Ptr.h"
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/Messaging/ExceptionHolder_i.cpp b/TAO/tao/Messaging/ExceptionHolder_i.cpp
index af570186111..d96e916f00c 100644
--- a/TAO/tao/Messaging/ExceptionHolder_i.cpp
+++ b/TAO/tao/Messaging/ExceptionHolder_i.cpp
@@ -5,6 +5,8 @@
 #include "tao/Exception_Data.h"
 #include "tao/CDR.h"
 
+#include "ace/Auto_Ptr.h"
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 5b2ba9f0ccd..6832bac73a7 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -35,8 +35,9 @@
 #include "tao/Adapter_Registry.h"
 #include "tao/ORB_Core_TSS_Resources.h"
 #include "tao/Service_Context_Handler_Registry.h"
-#include "ace/Array_Map.h"
 
+#include "ace/Array_Map.h"
+#include "ace/Auto_Ptr.h"
 #include "ace/Thread_Manager.h"
 #include "ace/Lock_Adapter_T.h"
 #include "ace/TSS_T.h"
diff --git a/TAO/tao/Resource_Factory.h b/TAO/tao/Resource_Factory.h
index d24c9fb6fca..8aa7157ca9c 100644
--- a/TAO/tao/Resource_Factory.h
+++ b/TAO/tao/Resource_Factory.h
@@ -23,6 +23,7 @@
 #include /**/ "tao/Versioned_Namespace.h"
 #include "tao/Basic_Types.h"
 
+#include "ace/Auto_Ptr.h"
 #include "ace/Service_Object.h"
 #include "ace/Unbounded_Set.h"
 #include "ace/SString.h"
diff --git a/TAO/tao/Storable_FlatFileStream.cpp b/TAO/tao/Storable_FlatFileStream.cpp
index eb007308e00..a95c5063fc0 100644
--- a/TAO/tao/Storable_FlatFileStream.cpp
+++ b/TAO/tao/Storable_FlatFileStream.cpp
@@ -12,6 +12,7 @@
 
 #include "tao/Storable_FlatFileStream.h"
 
+#include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_sys_stat.h"
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h
index 7bb3eb4318a..bb952ea1fca 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h
@@ -19,6 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Auto_Ptr.h"
 #include "ace/Task.h"
 #include "ace/ARGV.h"
 #include "ace/String_Base.h"
diff --git a/TAO/tests/Oneway_Send_Timeouts/Client.cpp b/TAO/tests/Oneway_Send_Timeouts/Client.cpp
index f80506b0c0d..cfb0e0875cf 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Client.cpp
+++ b/TAO/tests/Oneway_Send_Timeouts/Client.cpp
@@ -1,6 +1,7 @@
 #include "tao/Messaging/Messaging.h"
 #include "tao/AnyTypeCode/Any.h"
 
+#include "ace/Auto_Ptr.h"
 #include "ace/Get_Opt.h"
 #include "ace/Time_Value.h"
 #include "ace/OS_NS_unistd.h"
diff --git a/TAO/tests/Storable/Savable.cpp b/TAO/tests/Storable/Savable.cpp
index 45fd111d431..11aad54585a 100644
--- a/TAO/tests/Storable/Savable.cpp
+++ b/TAO/tests/Storable/Savable.cpp
@@ -3,6 +3,8 @@
 #include "tao/Storable_Factory.h"
 #include "tao/Storable_File_Guard.h"
 
+#include "ace/Auto_Ptr.h"
+
 const int Savable::bytes_size_max = 128;
 
 class Savable_File_Guard: public TAO::Storable_File_Guard