From 1669d3dac5597466fc8754537013dce8aa8843cd Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Fri, 13 Jan 2017 18:25:13 +0000 Subject: [PATCH] Fix merge conflict caused by r291921 git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@291925 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/ios | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ios b/include/ios index b05ee4c78..49f0c01f9 100644 --- a/include/ios +++ b/include/ios @@ -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() {} };