diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2012-01-16 16:25:08 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2012-01-16 16:25:08 -0800 |
| commit | 1cb0ec225dd97470208cc9e3b59cf35d8f4e3a0b (patch) | |
| tree | 4cd531366cc90a7521d363e5561c25e9e5328b20 /system/include/libcxx/ios | |
| parent | cf5947187de4390ad0440940f323470b37befbc8 (diff) | |
restore libcxx to pristine state, undoing all our hacks, and work towards fixing test_exceptions given that
Diffstat (limited to 'system/include/libcxx/ios')
| -rw-r--r-- | system/include/libcxx/ios | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/system/include/libcxx/ios b/system/include/libcxx/ios index 29bda558..e2f2b6fd 100644 --- a/system/include/libcxx/ios +++ b/system/include/libcxx/ios @@ -317,7 +317,7 @@ public: _LIBCPP_INLINE_VISIBILITY bool bad() const; _LIBCPP_INLINE_VISIBILITY iostate exceptions() const; - _LIBCPP_INLINE_VISIBILITY void exceptions(iostate except); /* XXX Emscripten: renammed __except to except because it is a reserved keyword */ + _LIBCPP_INLINE_VISIBILITY void exceptions(iostate __except); void __set_badbit_and_consider_rethrow(); void __set_failbit_and_consider_rethrow(); @@ -553,9 +553,9 @@ ios_base::exceptions() const inline _LIBCPP_INLINE_VISIBILITY void -ios_base::exceptions(iostate except) /* XXX Emscripten: renammed __except to except because it is a reserved keyword */ +ios_base::exceptions(iostate __except) { - __exceptions_ = except; /* XXX Emscripten: renammed __except to except because it is a reserved keyword */ + __exceptions_ = __except; clear(__rdstate_); } @@ -584,7 +584,7 @@ public: _LIBCPP_ALWAYS_INLINE bool bad() const {return ios_base::bad();} _LIBCPP_ALWAYS_INLINE iostate exceptions() const {return ios_base::exceptions();} - _LIBCPP_ALWAYS_INLINE void exceptions(iostate except) {ios_base::exceptions(except);} /* XXX Emscripten: renammed __except to except because it is a reserved keyword */ + _LIBCPP_ALWAYS_INLINE void exceptions(iostate __except) {ios_base::exceptions(__except);} // 27.5.4.1 Constructor/destructor: _LIBCPP_INLINE_VISIBILITY |