diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2017-06-01 20:59:10 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2017-06-01 20:59:10 +0000 |
commit | edb11085302f80f38c9d976f003aa1c9002c7abb (patch) | |
tree | edfe9dcac670e9f47ee7fdee893130fcf86ba196 /include/fstream | |
parent | 10a0bef720b6882fce588a10b07b0584d62eac76 (diff) | |
download | src-edb11085302f80f38c9d976f003aa1c9002c7abb.tar.gz src-edb11085302f80f38c9d976f003aa1c9002c7abb.zip |
Vendor import of libc++ trunk r304460:vendor/libc++/libc++-trunk-r304460
Notes
Notes:
svn path=/vendor/libc++/dist/; revision=319467
svn path=/vendor/libc++/libc++-trunk-r304460/; revision=319468; tag=vendor/libc++/libc++-trunk-r304460
Diffstat (limited to 'include/fstream')
-rw-r--r-- | include/fstream | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/fstream b/include/fstream index 5ec42bd13407..e41a53af4a0c 100644 --- a/include/fstream +++ b/include/fstream @@ -171,12 +171,14 @@ 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 +_LIBCPP_PUSH_MACROS +#include <__undef_macros> + + _LIBCPP_BEGIN_NAMESPACE_STD template <class _CharT, class _Traits> @@ -1476,4 +1478,6 @@ basic_fstream<_CharT, _Traits>::close() _LIBCPP_END_NAMESPACE_STD +_LIBCPP_POP_MACROS + #endif // _LIBCPP_FSTREAM |