diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2015-05-08 09:26:51 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2015-05-08 09:26:51 +0200 |
| commit | 68e94809286173bf801cf81e4e636943af9b1542 (patch) | |
| tree | 02c288f2a8b0908f32792923bc0f044fb94db11f | |
| parent | 541dc7f089619c59447020906764783a0acea1d3 (diff) | |
| parent | 5a13bf268fc4f3502d289a613d3e90f7b9f19883 (diff) | |
| download | ATCD-68e94809286173bf801cf81e4e636943af9b1542.tar.gz | |
Merge pull request #75 from jwillemsen/master
Enabled ACE_HAS_CPP11 for Visual Studio 2015 (msvc14)
| -rw-r--r-- | ACE/NEWS | 3 | ||||
| -rw-r--r-- | ACE/ace/config-win32-msvc-14.h | 3 | ||||
| -rw-r--r-- | ACE/tests/Compiler_Features_27_Test.cpp | 4 |
3 files changed, 10 insertions, 0 deletions
@@ -1,6 +1,9 @@ USER VISIBLE CHANGES BETWEEN ACE-6.3.2 and ACE-6.3.3 ==================================================== +. Visual Studio 2015 has adequate C++11 support, because of this + ACE_HAS_CPP11 is now defined with this compiler + USER VISIBLE CHANGES BETWEEN ACE-6.3.1 and ACE-6.3.2 ==================================================== diff --git a/ACE/ace/config-win32-msvc-14.h b/ACE/ace/config-win32-msvc-14.h index 7aeaf75d5bf..0670cb292cf 100644 --- a/ACE/ace/config-win32-msvc-14.h +++ b/ACE/ace/config-win32-msvc-14.h @@ -38,5 +38,8 @@ // Visual Studio 2015 has 3 parameter wcstok #define ACE_HAS_3_PARAM_WCSTOK +// Visual Studio 2015 has adequate C++11 support +#define ACE_HAS_CPP11 + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_WIN32_MSVC_14_H */ diff --git a/ACE/tests/Compiler_Features_27_Test.cpp b/ACE/tests/Compiler_Features_27_Test.cpp index 33961efb54a..97e31fbdae5 100644 --- a/ACE/tests/Compiler_Features_27_Test.cpp +++ b/ACE/tests/Compiler_Features_27_Test.cpp @@ -24,8 +24,12 @@ run_main (int, ACE_TCHAR *[]) { ACE_START_TEST (ACE_TEXT("Compiler_Features_27_Test")); + // Visual Studio 2015 has a small issue with this construct, will reenable + // when the final release is available +#if !defined (ACE_WIN32_VC14) Foo any; any <<= std::move("abc"); +#endif ACE_END_TEST; |