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 | c42617ccffc63691c7df589e6f49e36e16e1da89 (patch) | |
| tree | 5d494dd8d3e64dbe1a2ab56792b0152292efbecf | |
| parent | Merging r236299: (diff) | |
| download | llvm-project-c42617ccffc63691c7df589e6f49e36e16e1da89.tar.gz llvm-project-c42617ccffc63691c7df589e6f49e36e16e1da89.tar.bz2 llvm-project-c42617ccffc63691c7df589e6f49e36e16e1da89.zip | |
Fix merge conflict that resulted in bad preprocessor block
llvm-svn: 236872
| -rw-r--r-- | libcxxabi/src/private_typeinfo.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libcxxabi/src/private_typeinfo.cpp b/libcxxabi/src/private_typeinfo.cpp index f0ad29151548..307ffa1c1ff0 100644 --- a/libcxxabi/src/private_typeinfo.cpp +++ b/libcxxabi/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 |