| commit | a0f7252b0375a76c76f298093f001a9184512124 | [log] [tgz] |
|---|---|---|
| author | Eric Fiselier <eric@efcs.ca> | Fri Jan 13 18:25:13 2017 +0000 |
| committer | Eric Fiselier <eric@efcs.ca> | Fri Jan 13 18:25:13 2017 +0000 |
| tree | 33a4078e83ba5913ca11184f89f0e53c024ef8da | |
| parent | 79fb07066cdfc1848fa271a4257ddbfa034527b5 [diff] [blame] |
Fix merge conflict caused by r291921 llvm-svn: 291925
diff --git a/libcxx/include/ios b/libcxx/include/ios index b05ee4c..49f0c01 100644 --- a/libcxx/include/ios +++ b/libcxx/include/ios
@@ -573,7 +573,7 @@ } #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() {} };