summaryrefslogtreecommitdiffstats
path: root/include/fstream
diff options
context:
space:
mode:
authortheraven <theraven@FreeBSD.org>2012-03-13 14:09:15 +0000
committertheraven <theraven@FreeBSD.org>2012-03-13 14:09:15 +0000
commitbaa75b9984d33ea49ffb76a73507b64d879166cc (patch)
tree491848d33dbdf1751fd52f321d3fbf70a8e616f2 /include/fstream
parentd8f28ec8a2faabad3aabb9f7a26755971424ef05 (diff)
downloadFreeBSD-src-baa75b9984d33ea49ffb76a73507b64d879166cc.zip
FreeBSD-src-baa75b9984d33ea49ffb76a73507b64d879166cc.tar.gz
Import new version of libc++ into vendor branch.
Approved by: dim (mentor)
Diffstat (limited to 'include/fstream')
-rw-r--r--include/fstream4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/fstream b/include/fstream
index b6a2ab0..8e1b1fb 100644
--- a/include/fstream
+++ b/include/fstream
@@ -171,6 +171,8 @@ typedef basic_fstream<wchar_t> wfstream;
#include <__locale>
#include <cstdio>
+#include <__undef_min_max>
+
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
#endif
@@ -547,7 +549,7 @@ basic_filebuf<_CharT, _Traits>::close()
{
__rt = this;
unique_ptr<FILE, int(*)(FILE*)> __h(__file_, fclose);
- if ((__cm_ & ios_base::out) && sync())
+ if (sync())
__rt = 0;
if (fclose(__h.release()) == 0)
__file_ = 0;
OpenPOWER on IntegriCloud