Author: ericwf
Date: Fri Jan 13 12:42:41 2017
New Revision: 291935
URL: http://llvm.org/viewvc/llvm-project?rev=291935&view=rev
Log:
Fix merge error caused by r291922
Modified:
libcxx/branches/release_40/include/ios
Modified: libcxx/branches/release_40/include/ios
URL:
http://llvm.org/viewvc/llvm-project/libcxx/branches/release_40/include/ios?rev=291935&r1=291934&r2=291935&view=diff
==============================================================================
--- libcxx/branches/release_40/include/ios (original)
+++ libcxx/branches/release_40/include/ios Fri Jan 13 12:42:41 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() {}
};
@@ -592,9 +592,6 @@ public:
typedef typename traits_type::pos_type pos_type;
typedef typename traits_type::off_type off_type;
- // __true_value will generate undefined references when linking unless
- // we give it internal linkage.
-
#if defined(_LIBCPP_CXX03_LANG)
_LIBCPP_ALWAYS_INLINE
operator __cxx03_bool::__bool_type() const {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
