summaryrefslogtreecommitdiffstats
path: root/libcxx/test/support/msvc_stdlib_force_include.hpp
diff options
context:
space:
mode:
authorStephan T. Lavavej <stl@exchange.microsoft.com>2017-06-08 18:22:03 +0000
committerStephan T. Lavavej <stl@exchange.microsoft.com>2017-06-08 18:22:03 +0000
commitba8754ab09897da0f1d11c0dcdddefb990d9853f (patch)
tree9fa2420fc3de0b98283bfde3f250db94abee7f33 /libcxx/test/support/msvc_stdlib_force_include.hpp
parent2bd63dae21a25cc7ffdf004cc3b1a1995d6b6659 (diff)
downloadbcm5719-llvm-ba8754ab09897da0f1d11c0dcdddefb990d9853f.tar.gz
bcm5719-llvm-ba8754ab09897da0f1d11c0dcdddefb990d9853f.zip
[libcxx] [test] Update locale names for Windows.
locale.codecvt.byname/ctor_char.pass.cpp: This test used to use "en_US" as a plain string instead of using platform_support. Need to fix this because MS STL expects "en-US" instead. platform_support.h: These are the legacy Windows locale names. Should use IETF tags instead. I've also added en_US, since a test was using that as a locale string as well. msvc_stdlib_force_include.hpp: Remove _MSVC_STL_VER. The libraries will directly define _MSVC_STL_VERSION in the future. Fixes D29351. llvm-svn: 305000
Diffstat (limited to 'libcxx/test/support/msvc_stdlib_force_include.hpp')
-rw-r--r--libcxx/test/support/msvc_stdlib_force_include.hpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/libcxx/test/support/msvc_stdlib_force_include.hpp b/libcxx/test/support/msvc_stdlib_force_include.hpp
index e23e5fff986..954cf513ef2 100644
--- a/libcxx/test/support/msvc_stdlib_force_include.hpp
+++ b/libcxx/test/support/msvc_stdlib_force_include.hpp
@@ -28,11 +28,6 @@
#error This header may not be used when targeting libc++
#endif
-// Indicates that we are using the MSVC standard library.
-#ifndef _MSVC_STL_VER
- #define _MSVC_STL_VER 42
-#endif
-
#ifndef _LIBCXX_IN_DEVCRT
struct AssertionDialogAvoider {
AssertionDialogAvoider() {
OpenPOWER on IntegriCloud