diff options
| author | Ehsan Akhgari <ehsan.akhgari@gmail.com> | 2012-01-27 15:02:10 -0500 |
|---|---|---|
| committer | Ehsan Akhgari <ehsan.akhgari@gmail.com> | 2012-01-27 15:02:10 -0500 |
| commit | 65febb8bf9e70ebacc252f75374c5c291befa6de (patch) | |
| tree | 12f601f70cef7844d3212b10b9505953e8d62120 /system/include/libcxx/string | |
| parent | 58d80ab53ea7c71b6e7dd0e56bee1335514a59f6 (diff) | |
| parent | fff86540c3c5147e745a038bffad034ea1058d22 (diff) | |
Merge branch 'handle_broken_lli' into glgears
Conflicts:
src/preamble.js
Diffstat (limited to 'system/include/libcxx/string')
| -rw-r--r-- | system/include/libcxx/string | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/system/include/libcxx/string b/system/include/libcxx/string index 4f3e0e76..2041510f 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>; /* XXX EMScripten: Comment to export the class */ +extern template class __basic_string_common<true>; 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>; /* XXX EMScripten: Comment to export the class */ -//extern template class basic_string<wchar_t>; /* XXX EMScripten: Comment to export the class */ +extern template class basic_string<char>; +extern template class basic_string<wchar_t>; extern template string |