diff options
| author | Eric Fiselier <eric@efcs.ca> | 2015-05-08 16:00:50 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2015-05-08 16:00:50 +0000 |
| commit | e4916e1b5e606c3980a0012dbefb622a97a2fc3e (patch) | |
| tree | 942fac1dd17e57bec2ba5cc94fa44646cb6d0047 | |
| parent | 3c242ec04ef694245d37075cac1ebe0927c723d2 (diff) | |
Fix merge conflict that resulted in bad preprocessor blockrelease_36
git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/branches/release_36@236872 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | src/private_typeinfo.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/private_typeinfo.cpp b/src/private_typeinfo.cpp index f0ad291..307ffa1 100644 --- a/src/private_typeinfo.cpp +++ b/src/private_typeinfo.cpp @@ -500,7 +500,6 @@ bool __pointer_to_member_type_info::can_catch_nested( return true; } -#ifdef __clang__ #pragma clang diagnostic pop #pragma GCC visibility pop |