aboutsummaryrefslogtreecommitdiff
path: root/system/include/libcxx
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2011-10-28 13:36:19 -0700
committerAlon Zakai <alonzakai@gmail.com>2011-10-28 13:36:19 -0700
commitb8ffc3d9016fe2eef894a6957bbb90ab97d54691 (patch)
tree6e46db1e79ef53199a2435ababe9558be96cb80e /system/include/libcxx
parent502fdced559a3d0d2ce8f46f98485bddb1dd611f (diff)
parentf2684dcf4c0a01bc7d278f734519ada4cb65eba7 (diff)
Merge pull request #106 from BenoitT/master
Fixed the function string is not exporting
Diffstat (limited to 'system/include/libcxx')
-rw-r--r--system/include/libcxx/streambuf9
-rw-r--r--system/include/libcxx/string6
2 files changed, 8 insertions, 7 deletions
diff --git a/system/include/libcxx/streambuf b/system/include/libcxx/streambuf
index feb62c7e..20ae24f3 100644
--- a/system/include/libcxx/streambuf
+++ b/system/include/libcxx/streambuf
@@ -111,6 +111,7 @@ protected:
#include <__config>
#include <iosfwd>
#include <ios>
+#include <__locale>
#pragma GCC system_header
@@ -551,11 +552,11 @@ basic_streambuf<_CharT, _Traits>::overflow(int_type __c)
return traits_type::eof();
}
-extern template class basic_streambuf<char>;
-extern template class basic_streambuf<wchar_t>;
+//extern template class basic_streambuf<char>; /* XXX EMScripten */
+//extern template class basic_streambuf<wchar_t>; /* XXX EMScripten */
-extern template class basic_ios<char>;
-extern template class basic_ios<wchar_t>;
+//extern template class basic_ios<char>; /* XXX EMScripten */
+//extern template class basic_ios<wchar_t>; /* XXX EMScripten */
_LIBCPP_END_NAMESPACE_STD
diff --git a/system/include/libcxx/string b/system/include/libcxx/string
index 2041510f..4f3e0e76 100644
--- a/system/include/libcxx/string
+++ b/system/include/libcxx/string
@@ -1021,7 +1021,7 @@ __basic_string_common<__b>::__throw_out_of_range() const
#endif
}
-extern template class __basic_string_common<true>;
+//extern template class __basic_string_common<true>; /* XXX EMScripten: Comment to export the class */
template<class _CharT, class _Traits, class _Allocator>
class _LIBCPP_VISIBLE basic_string
@@ -3965,8 +3965,8 @@ getline(basic_istream<_CharT, _Traits>&& __is,
#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-extern template class basic_string<char>;
-extern template class basic_string<wchar_t>;
+//extern template class basic_string<char>; /* XXX EMScripten: Comment to export the class */
+//extern template class basic_string<wchar_t>; /* XXX EMScripten: Comment to export the class */
extern template
string