diff options
| author | Adam Mitz <mitza@ociweb.com> | 2017-03-23 14:20:44 -0500 |
|---|---|---|
| committer | Adam Mitz <mitza@ociweb.com> | 2017-03-23 14:20:44 -0500 |
| commit | 1a8e284fa20a3cfb52ee75b7e3de2b6b01d9f11d (patch) | |
| tree | 95210d3a34bd90bdc15e8e6615be3184b8713f0b | |
| parent | 274d67cbdac1d696d8924d97f81ff27e88202dbf (diff) | |
| download | ATCD-1a8e284fa20a3cfb52ee75b7e3de2b6b01d9f11d.tar.gz | |
ACE config file updates for VS2017
| -rw-r--r-- | ACE/ace/config-win32-msvc-141.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/ACE/ace/config-win32-msvc-141.h b/ACE/ace/config-win32-msvc-141.h index 1067638a7bf..330df3e56f7 100644 --- a/ACE/ace/config-win32-msvc-141.h +++ b/ACE/ace/config-win32-msvc-141.h @@ -1,30 +1,29 @@ /* -*- C++ -*- */ //============================================================================= /** - * @file config-win32-msvc-15.h + * @file config-win32-msvc-141.h * - * @brief Microsoft Visual C++ 15.0 configuration file. + * @brief Microsoft Visual C++ 14.1 configuration file. * - * This file is the ACE configuration file for Microsoft Visual C++ version 2017. + * This file is the ACE configuration file for Microsoft Visual C++ 14.1 (as released with Visual Studio 2017). * * @note Do not include this file directly, include config-win32.h instead. */ //============================================================================= -#ifndef ACE_CONFIG_WIN32_MSVC_15_H -#define ACE_CONFIG_WIN32_MSVC_15_H +#ifndef ACE_CONFIG_WIN32_MSVC_141_H +#define ACE_CONFIG_WIN32_MSVC_141_H #include /**/ "ace/pre.h" #ifndef ACE_CONFIG_WIN32_H #error Use config-win32.h in config.h instead of this header #endif /* ACE_CONFIG_WIN32_H */ -#ifndef ACE_WIN32_VC15 -# define ACE_WIN32_VC15 +#ifndef ACE_WIN32_VC141 +# define ACE_WIN32_VC141 #endif -// Until we have specific msvc15 settings, include the msvc12 file #include "ace/config-win32-msvc-14.h" #include /**/ "ace/post.h" -#endif /* ACE_CONFIG_WIN32_MSVC_15_H */ +#endif /* ACE_CONFIG_WIN32_MSVC_141_H */ |