Commit c42617cc authored by Eric Fiselier's avatar Eric Fiselier
Browse files

Fix merge conflict that resulted in bad preprocessor block 

llvm-svn: 236872
parent adf9c878

libcxxabi/src/private_typeinfo.cpp

+0 −1
Original line number Diff line number Diff line
@@ -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