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 | 15da97cb66c806b3b7e57a5601f3dae7fdbd56d5 (patch) | |
| tree | 3c64ba6986247e1e6c293dbf88e71c6e2f7933a6 | |
| parent | f1dab6865e955e0a025780f80f64dfc5218e821e (diff) | |
| download | external_libcxx-15da97cb66c806b3b7e57a5601f3dae7fdbd56d5.tar.gz external_libcxx-15da97cb66c806b3b7e57a5601f3dae7fdbd56d5.tar.bz2 external_libcxx-15da97cb66c806b3b7e57a5601f3dae7fdbd56d5.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.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@297330 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/__config | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/__config b/include/__config index 606d2199a..d6c4f9194 100644 --- a/include/__config +++ b/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) |