diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-06-22 13:31:29 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-06-22 13:31:29 +0200 |
| commit | 720ab6a2f37514830b7fce2aba179a1cf67016e9 (patch) | |
| tree | 1efd12b00fdfb76e20ed554fd862c7bf35cf4047 | |
| parent | 5e0d93921e50d796125c52e9ac63121d30fc2dbe (diff) | |
| download | ATCD-720ab6a2f37514830b7fce2aba179a1cf67016e9.tar.gz | |
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:
| -rw-r--r-- | ACE/ace/Auto_Ptr.h | 2 | ||||
| -rw-r--r-- | ACE/ace/config-win32-msvc-141.h | 8 |
2 files changed, 10 insertions, 0 deletions
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 <memory> #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 */ diff --git a/ACE/ace/config-win32-msvc-141.h b/ACE/ace/config-win32-msvc-141.h index 330df3e56f7..c6376395d13 100644 --- a/ACE/ace/config-win32-msvc-141.h +++ b/ACE/ace/config-win32-msvc-141.h @@ -25,5 +25,13 @@ #include "ace/config-win32-msvc-14.h" +#if _MSVC_LANG >= 201402L +# define ACE_HAS_CPP14 +#endif /* _MSVC_LANG >= 201402L */ + +#if _MSVC_LANG >= 201703L +# define ACE_HAS_CPP17 +#endif /* _MSVC_LANG >= 201703L */ + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_MSVC_141_H */ |