diff options
| author | BenoitT <benoit.tremblay@frimastudio.com> | 2011-10-20 10:30:21 -0300 |
|---|---|---|
| committer | BenoitT <benoit.tremblay@frimastudio.com> | 2011-10-20 10:30:21 -0300 |
| commit | 6e2cdd2d59fdf7597ccd1c113f2028a264c77748 (patch) | |
| tree | ec40bcd37ae8603e0edc7d126ef7d89ed936d8ab /system/include/libcxx | |
| parent | 6e2379b7c86236ed4c7059e6a8a979fa9d4df7d6 (diff) | |
The variable __except was causing problems with the keyword with the same name. Renamed it. See issue #100
Diffstat (limited to 'system/include/libcxx')
| -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 e2f2b6fd..1ed7bb40 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); + _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) +ios_base::exceptions(iostate except) { - __exceptions_ = __except; + __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);} + _LIBCPP_ALWAYS_INLINE void exceptions(iostate except) {ios_base::exceptions(except);} // 27.5.4.1 Constructor/destructor: _LIBCPP_INLINE_VISIBILITY |