diff options
author | Alon Zakai <alonzakai@gmail.com> | 2013-11-08 16:01:27 -0800 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2013-11-08 16:04:05 -0800 |
commit | b873dc778f52461129b1e28fb12dd3d4a309851c (patch) | |
tree | e82913bc549a83104ce8abfb518eca6cb6d8aa83 /system/include/libcxx/streambuf | |
parent | 140ea9e81feb09d8f2559995c73d49a39424ef5d (diff) | |
parent | e0268fa1035a718341c53921eee9318d4a8033cd (diff) |
Merge branch 'incoming' into f32
Conflicts:
src/parseTools.js
src/preamble.js
Diffstat (limited to 'system/include/libcxx/streambuf')
-rw-r--r-- | system/include/libcxx/streambuf | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/system/include/libcxx/streambuf b/system/include/libcxx/streambuf index 82615942..6adfc923 100644 --- a/system/include/libcxx/streambuf +++ b/system/include/libcxx/streambuf @@ -119,7 +119,7 @@ protected: _LIBCPP_BEGIN_NAMESPACE_STD template <class _CharT, class _Traits> -class _LIBCPP_TYPE_VIS basic_streambuf +class _LIBCPP_TYPE_VIS_ONLY basic_streambuf { public: // types: @@ -553,11 +553,11 @@ basic_streambuf<_CharT, _Traits>::overflow(int_type) return traits_type::eof(); } -_LIBCPP_EXTERN_TEMPLATE(class basic_streambuf<char>) -_LIBCPP_EXTERN_TEMPLATE(class basic_streambuf<wchar_t>) +_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS basic_streambuf<char>) +_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS basic_streambuf<wchar_t>) -_LIBCPP_EXTERN_TEMPLATE(class basic_ios<char>) -_LIBCPP_EXTERN_TEMPLATE(class basic_ios<wchar_t>) +_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS basic_ios<char>) +_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS basic_ios<wchar_t>) _LIBCPP_END_NAMESPACE_STD |