summaryrefslogtreecommitdiff
path: root/ACE
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2019-02-05 13:00:44 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2019-02-05 13:00:44 +0100
commitbdceaf08378e97439b4d920931c81beff6ca7530 (patch)
tree1769a139832ec1cb864ee93e44cbf77e649b8907 /ACE
parent3fceb27762f3d9386250c4b549a79579f095cbfc (diff)
downloadATCD-bdceaf08378e97439b4d920931c81beff6ca7530.tar.gz
Starter configuration file for Visual C++ 14.2 as going to be shipped as part of Visual Studio 2019
* ACE/ace/config-win32-msvc-142.h: Added. * ACE/ace/config-win32-msvc.h:
Diffstat (limited to 'ACE')
-rw-r--r--ACE/ace/config-win32-msvc-142.h29
-rw-r--r--ACE/ace/config-win32-msvc.h4
2 files changed, 32 insertions, 1 deletions
diff --git a/ACE/ace/config-win32-msvc-142.h b/ACE/ace/config-win32-msvc-142.h
new file mode 100644
index 00000000000..af47ad9f722
--- /dev/null
+++ b/ACE/ace/config-win32-msvc-142.h
@@ -0,0 +1,29 @@
+/* -*- C++ -*- */
+//=============================================================================
+/**
+ * @file config-win32-msvc-142.h
+ *
+ * @brief Microsoft Visual C++ 14.2 configuration file.
+ *
+ * This file is the ACE configuration file for Microsoft Visual C++ 14.2 (as released with Visual Studio 2019).
+ *
+ * @note Do not include this file directly, include config-win32.h instead.
+ */
+//=============================================================================
+
+#ifndef ACE_CONFIG_WIN32_MSVC_142_H
+#define ACE_CONFIG_WIN32_MSVC_142_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_VC142
+# define ACE_WIN32_VC142
+#endif
+
+#include "ace/config-win32-msvc-141.h"
+
+#include /**/ "ace/post.h"
+#endif /* ACE_CONFIG_WIN32_MSVC_142_H */
diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h
index 983d230f626..5736e56913a 100644
--- a/ACE/ace/config-win32-msvc.h
+++ b/ACE/ace/config-win32-msvc.h
@@ -38,7 +38,9 @@
#endif /* _WIN32_WCE */
//FUZZ: disable check_for_msc_ver
-#if (_MSC_VER >= 1910)
+#if (_MSC_VER >= 1920)
+# include "ace/config-win32-msvc-142.h"
+#elif (_MSC_VER >= 1910)
# include "ace/config-win32-msvc-141.h"
#elif (_MSC_VER >= 1900)
# include "ace/config-win32-msvc-14.h"