diff options
author | Howard Hinnant <hhinnant@apple.com> | 2012-03-08 19:34:58 +0000 |
---|---|---|
committer | Howard Hinnant <hhinnant@apple.com> | 2012-03-08 19:34:58 +0000 |
commit | f2ebd5904c06ebca3c759d0b8ca877ffaee62daf (patch) | |
tree | 24d28e39d59e60960e1d7114933325d2af0a7e53 | |
parent | 3e5c7d0cdb8e17531d5d09f5df1d4ed85d84f356 (diff) |
Enable/silence -Wshadow.
git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@152325 91177308-0d34-0410-b5e6-96231b3b80d8
-rwxr-xr-x | lib/buildit | 2 | ||||
-rw-r--r-- | src/cxa_handlers.cpp | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/lib/buildit b/lib/buildit index 342543a..8ebae2d 100755 --- a/lib/buildit +++ b/lib/buildit @@ -28,7 +28,7 @@ then fi EXTRA_FLAGS="-std=c++0x -stdlib=libc++ -fstrict-aliasing -Wstrict-aliasing=2 \ - -Wsign-conversion -Wnewline-eof" + -Wsign-conversion -Wshadow -Wnewline-eof" case $TRIPLE in *-apple-*) diff --git a/src/cxa_handlers.cpp b/src/cxa_handlers.cpp index ab41db4..bd3f6f4 100644 --- a/src/cxa_handlers.cpp +++ b/src/cxa_handlers.cpp @@ -177,10 +177,7 @@ terminate() _NOEXCEPT (unwind_exception->exception_class & get_vendor_and_language) == (kOurExceptionClass & get_vendor_and_language); if (native_exception) - { - __cxa_exception* exception_header = (__cxa_exception*)(unwind_exception+1) - 1; __terminate(exception_header->terminateHandler); - } } } __terminate(get_terminate()); |