From 7767d0dd86da1d81ebe619f02e5716cac1ea4987 Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Fri, 17 Jun 2016 09:16:49 -0500 Subject: Removed include of ace/Auto_Ptr.h where not needed GCC 6.1 by default issues warnings when seeing std::auto_ptr --- ACE/ace/DLL_Manager.cpp | 1 + ACE/ace/DLL_Manager.h | 1 - ACE/ace/Intrusive_Auto_Ptr.h | 1 - ACE/ace/Parse_Node.h | 1 + ACE/ace/SString.cpp | 1 - ACE/ace/Service_Gestalt.h | 1 - ACE/ace/String_Base.cpp | 1 - ACE/ace/Tokenizer_T.cpp | 1 - ACE/protocols/ace/HTBP/HTBP_Channel.cpp | 1 + ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp | 1 + ACE/protocols/ace/HTBP/HTBP_Session.cpp | 2 ++ TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.cpp | 2 ++ TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.cpp | 2 ++ TAO/tao/Messaging/ExceptionHolder_i.cpp | 2 ++ TAO/tao/ORB_Core.h | 3 ++- TAO/tao/Resource_Factory.h | 1 + TAO/tao/Storable_FlatFileStream.cpp | 1 + 17 files changed, 16 insertions(+), 7 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 // 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/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 TAO_BEGIN_VERSIONED_NAMESPACE_DECL 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" -- cgit v1.2.1