[libcxxabi] r236872 - Fix merge conflict that resulted in bad preprocessor block

[Eric Fiselier]

Author: ericwf
Date: Fri May  8 11:00:50 2015
New Revision: 236872

URL: http://llvm.org/viewvc/llvm-project?rev=236872&view=rev
Log:
Fix merge conflict that resulted in bad preprocessor block

Modified:
    libcxxabi/branches/release_36/src/private_typeinfo.cpp

Modified: libcxxabi/branches/release_36/src/private_typeinfo.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/branches/release_36/src/private_typeinfo.cpp?rev=236872&r1=236871&r2=236872&view=diff
==============================================================================
--- libcxxabi/branches/release_36/src/private_typeinfo.cpp (original)
+++ libcxxabi/branches/release_36/src/private_typeinfo.cpp Fri May  8 11:00:50 2015
@@ -500,7 +500,6 @@ bool __pointer_to_member_type_info::can_
     return true;
 }
 
-#ifdef __clang__
 #pragma clang diagnostic pop
 
 #pragma GCC visibility pop