diff options
| author | Shoaib Meenai <smeenai@fb.com> | 2017-03-09 00:18:00 +0000 |
|---|---|---|
| committer | Shoaib Meenai <smeenai@fb.com> | 2017-03-09 00:18:00 +0000 |
| commit | 5e5d8672a7d648417d50e2cde81659ebda2c8161 (patch) | |
| tree | fd5eed93f3f7baf28e5e12ffc4d0f47535c10acf | |
| parent | 9661f40c93a6be7a9db05717c147b9768e890644 (diff) | |
| download | bcm5719-llvm-5e5d8672a7d648417d50e2cde81659ebda2c8161.tar.gz bcm5719-llvm-5e5d8672a7d648417d50e2cde81659ebda2c8161.zip | |
[libc++] Avoid double defining macro on Windows
Put proper guards around _LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS.
No functional change on non-Windows. Avoids incorrect macro redefinition
on Windows.
llvm-svn: 297330
| -rw-r--r-- | libcxx/include/__config | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libcxx/include/__config b/libcxx/include/__config index 606d2199a1d..d6c4f919441 100644 --- a/libcxx/include/__config +++ b/libcxx/include/__config @@ -615,8 +615,14 @@ namespace std { #endif #endif +#ifndef _LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS +#if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS) // The inline should be removed once PR32114 is resolved #define _LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS inline _LIBCPP_HIDDEN +#else +#define _LIBCPP_METHOD_TEMPLATE_IMPLICIT_INSTANTIATION_VIS +#endif +#endif #ifndef _LIBCPP_FUNC_VIS #if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS) |
