diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-01-13 18:25:13 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-01-13 18:25:13 +0000 |
| commit | a0f7252b0375a76c76f298093f001a9184512124 (patch) | |
| tree | 33a4078e83ba5913ca11184f89f0e53c024ef8da /libcxx/include/ios | |
| parent | 79fb07066cdfc1848fa271a4257ddbfa034527b5 (diff) | |
| download | bcm5719-llvm-a0f7252b0375a76c76f298093f001a9184512124.tar.gz bcm5719-llvm-a0f7252b0375a76c76f298093f001a9184512124.zip | |
Fix merge conflict caused by r291921
llvm-svn: 291925
Diffstat (limited to 'libcxx/include/ios')
| -rw-r--r-- | libcxx/include/ios | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/include/ios b/libcxx/include/ios index b05ee4c785a..49f0c01f985 100644 --- a/libcxx/include/ios +++ b/libcxx/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() {} }; |
