Author: ericwf
Date: Fri Jan 13 12:25:13 2017
New Revision: 291925
URL: http://llvm.org/viewvc/llvm-project?rev=291925&view=rev
Log:
Fix merge conflict caused by r291921
Modified:
libcxx/trunk/include/ios
Modified: libcxx/trunk/include/ios
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/ios?rev=291925&r1=291924&r2=291925&view=diff
==============================================================================
--- libcxx/trunk/include/ios (original)
+++ libcxx/trunk/include/ios Fri Jan 13 12:25:13 2017
@@ -573,7 +573,7 @@ ios_base::exceptions(iostate __iostate)
}
#if defined(_LIBCPP_CXX03_LANG)
-struct _LIBCPP_TYPE_VIS_ONLY __cxx03_bool {
+struct _LIBCPP_TYPE_VIS __cxx03_bool {
typedef void (__cxx03_bool::*__bool_type)();
void __true_value() {}
};
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
