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/ios | |
| parent | 58d80ab53ea7c71b6e7dd0e56bee1335514a59f6 (diff) | |
| parent | fff86540c3c5147e745a038bffad034ea1058d22 (diff) | |
Merge branch 'handle_broken_lli' into glgears
Conflicts:
src/preamble.js
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 |