diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2013-08-01 22:17:34 +0400 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2013-08-01 22:17:34 +0400 |
| commit | 0be8f64c44d2fe87fdf8feda175dc39d38a83906 (patch) | |
| tree | d690e336aa492ca6a7109bb6d4a8a6d26100f7ee /libcxx/include/string | |
| parent | 695bad54a89ab84591b5bc3211c77af0d5e675a4 (diff) | |
Nico Rieck: Currently _MSC_VER and _WIN32 are used to guard code which is
MSVC-specific, MSVCRT-specific, or Windows-specific. Because Clang can
also define _MSC_VER, and MSVCRT is not necessarily the only C runtime,
these macros should not be used interchangeably.
This patch divides all Windows-related bits into the aforementioned
categories. Two new macros are introduced:
- _LIBCPP_MSVC: Defined when compiling with MSVC. Detected using
_MSC_VER, excluding Clang.
- _LIBCPP_MSVCRT: Defined when using the Microsoft CRT. This is the default
when _WIN32 is defined.
This leaves _WIN32 for code using the Windows API.
This also corrects the spelling of _LIBCP_HAS_IS_BASE_OF to _LIBCPP_HAS_IS_BASE_OF.
Nico, please prepare a patch for CREDITS.TXT, thanks.
llvm-svn: 187593
Diffstat (limited to 'libcxx/include/string')
| -rw-r--r-- | libcxx/include/string | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libcxx/include/string b/libcxx/include/string index 88d32b1ca882..283be3a35bc1 100644 --- a/libcxx/include/string +++ b/libcxx/include/string @@ -1032,14 +1032,14 @@ __basic_string_common<__b>::__throw_out_of_range() const #endif } -#ifdef _MSC_VER +#ifdef _LIBCPP_MSVC #pragma warning( push ) #pragma warning( disable: 4231 ) -#endif // _MSC_VER +#endif // _LIBCPP_MSVC _LIBCPP_EXTERN_TEMPLATE(class __basic_string_common<true>) -#ifdef _MSC_VER +#ifdef _LIBCPP_MSVC #pragma warning( pop ) -#endif // _MSC_VER +#endif // _LIBCPP_MSVC #ifdef _LIBCPP_ALTERNATE_STRING_LAYOUT |