From 720ab6a2f37514830b7fce2aba179a1cf67016e9 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 22 Jun 2018 13:31:29 +0200 Subject: When using Visual Studio 2017 we can enable C++14 and C++17 compliance, with C++17 we don't have auto_ptr so shouldn't do a using * ACE/ace/Auto_Ptr.h: * ACE/ace/config-win32-msvc-141.h: --- ACE/ace/Auto_Ptr.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ACE/ace/Auto_Ptr.h') diff --git a/ACE/ace/Auto_Ptr.h b/ACE/ace/Auto_Ptr.h index e06eb21b4a8..ad71242e978 100644 --- a/ACE/ace/Auto_Ptr.h +++ b/ACE/ace/Auto_Ptr.h @@ -76,7 +76,9 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include #if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \ (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0) +#if !defined (ACE_HAS_CPP17) using std::auto_ptr; +#endif /* !ACE_HAS_CPP17 */ #endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ #else /* ACE_HAS_STANDARD_CPP_LIBRARY */ -- cgit v1.2.1