generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

G M: Rename local variable from __except to avoid MSVC keyword clash.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@192072 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Howard Hinnant 2013-10-06 21:00:29 +00:00
parent 35a98a00b3
commit e064055942
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/ios
View File

@ -319,7 +319,7 @@ public:
_LIBCPP_INLINE_VISIBILITY bool bad() const; _LIBCPP_INLINE_VISIBILITY bool bad() const;
_LIBCPP_INLINE_VISIBILITY iostate exceptions() 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_badbit_and_consider_rethrow();
void __set_failbit_and_consider_rethrow(); void __set_failbit_and_consider_rethrow();
@ -553,9 +553,9 @@ ios_base::exceptions() const
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY
void void
ios_base::exceptions(iostate __except) ios_base::exceptions(iostate __iostate)
{ {
__exceptions_ = __except; __exceptions_ = __iostate;
clear(__rdstate_); clear(__rdstate_);
} }
@ -585,7 +585,7 @@ public:
_LIBCPP_ALWAYS_INLINE bool bad() const {return ios_base::bad();} _LIBCPP_ALWAYS_INLINE bool bad() const {return ios_base::bad();}
_LIBCPP_ALWAYS_INLINE iostate exceptions() const {return ios_base::exceptions();} _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: // 27.5.4.1 Constructor/destructor:
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY