diff options
| author | Brad King <brad.king@kitware.com> | 2013-08-07 12:18:32 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-08-07 12:18:32 (GMT) |
| commit | 09b147b3a7c864c3d9c044d970235a49f3d69b7a (patch) | |
| tree | d8381f3dd2fe35ba7622e007ee951062d4bcee32 /Source/kwsys/hashtable.hxx.in | |
| parent | 726fa61b59c20ea657091fa870bf7eba77dfaa75 (diff) | |
| parent | ce6eac8b58b0230cd1d8ee100a27973e5354a5c4 (diff) | |
| download | CMake-09b147b3a7c864c3d9c044d970235a49f3d69b7a.zip CMake-09b147b3a7c864c3d9c044d970235a49f3d69b7a.tar.gz CMake-09b147b3a7c864c3d9c044d970235a49f3d69b7a.tar.bz2 | |
Merge branch 'upstream-kwsys' into update-kwsys
Diffstat (limited to 'Source/kwsys/hashtable.hxx.in')
| -rw-r--r-- | Source/kwsys/hashtable.hxx.in | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/Source/kwsys/hashtable.hxx.in b/Source/kwsys/hashtable.hxx.in index c835503..651de82 100644 --- a/Source/kwsys/hashtable.hxx.in +++ b/Source/kwsys/hashtable.hxx.in @@ -62,6 +62,17 @@ # pragma set woff 3970 /* pointer to int conversion */ 3321 3968 #endif +// In C++11, clang will warn about using dynamic exception specifications +// as they are deprecated. But as this class is trying to faithfully +// mimic unordered_set and unordered_map, we want to keep the 'throw()' +// decorations below. So we suppress the warning. +#if defined(__clang__) && defined(__has_warning) +# if __has_warning("-Wdeprecated") +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-Wdeprecated" +# endif +#endif + #if @KWSYS_NAMESPACE@_STL_HAS_ALLOCATOR_TEMPLATE # define @KWSYS_NAMESPACE@_HASH_DEFAULT_ALLOCATOR(T) @KWSYS_NAMESPACE@_stl::allocator< T > #elif @KWSYS_NAMESPACE@_STL_HAS_ALLOCATOR_NONTEMPLATE @@ -1268,6 +1279,13 @@ using @KWSYS_NAMESPACE@::operator==; using @KWSYS_NAMESPACE@::operator!=; #endif +// Undo warning suppression. +#if defined(__clang__) && defined(__has_warning) +# if __has_warning("-Wdeprecated") +# pragma clang diagnostic pop +# endif +#endif + #if defined(_MSC_VER) # pragma warning (pop) #endif |