diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2013-10-06 21:00:29 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2013-10-06 21:00:29 +0000 |
| commit | 04c63bdb3634cfeb7a424d0e59580ed1531a9d67 (patch) | |
| tree | 4f09ef08217b88d65b2aa1da80b2a98e13f12535 /libcxx/include/ios | |
| parent | 32f9a776fb8c4b6acb8f0ecc233d456472c9da7c (diff) | |
| download | bcm5719-llvm-04c63bdb3634cfeb7a424d0e59580ed1531a9d67.tar.gz bcm5719-llvm-04c63bdb3634cfeb7a424d0e59580ed1531a9d67.zip | |
G M: Rename local variable from __except to avoid MSVC keyword clash.
llvm-svn: 192072
Diffstat (limited to 'libcxx/include/ios')
| -rw-r--r-- | libcxx/include/ios | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libcxx/include/ios b/libcxx/include/ios index f3d4840278f..5c96a9543e0 100644 --- a/libcxx/include/ios +++ b/libcxx/include/ios @@ -319,7 +319,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 __iostate); 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 __iostate) { - __exceptions_ = __except; + __exceptions_ = __iostate; clear(__rdstate_); } @@ -585,7 +585,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 __iostate) {ios_base::exceptions(__iostate);} // 27.5.4.1 Constructor/destructor: _LIBCPP_INLINE_VISIBILITY |
