commit e0640559427cab817159d91439bd83e66bce0192
author Howard Hinnant <hhinnant@apple.com> Sun Oct 06 21:00:29 2013 +0000
committer Howard Hinnant <hhinnant@apple.com> Sun Oct 06 21:00:29 2013 +0000
tree 46d1cf74513c79f9627d4ac361816ca61d06b3dc
parent 35a98a00b37ee94471d7bcd4b4222572c07e958b

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

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@192072 91177308-0d34-0410-b5e6-96231b3b80d8

include/ios

diff --git a/include/ios b/include/ios
index f3d4840..5c96a95 100644
--- a/include/ios
+++ b/include/ios
@@ -319,7 +319,7 @@
     _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 @@
 
 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 @@
     _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