diff options
author | KWSys Robot <kwrobot@kitware.com> | 2013-08-06 13:10:11 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2013-08-07 12:18:29 (GMT) |
commit | ce6eac8b58b0230cd1d8ee100a27973e5354a5c4 (patch) | |
tree | 3e190e65b187a9c70ac89786eee80259f0ae8d76 /hashtable.hxx.in | |
parent | 0a44fa4c6c87c76d2adfa1edf68b9f2cfe2096cb (diff) | |
download | CMake-ce6eac8b58b0230cd1d8ee100a27973e5354a5c4.zip CMake-ce6eac8b58b0230cd1d8ee100a27973e5354a5c4.tar.gz CMake-ce6eac8b58b0230cd1d8ee100a27973e5354a5c4.tar.bz2 |
KWSys 2013-08-06 (deec6b8a)
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ deec6b8a | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' beef6819..deec6b8a
Brad King (1):
e39f85e0 SystemTools: Activate EnableMSVCDebugHook under CTest
Burlen Loring (1):
1d882d4c SystemInformation : Better stack trace
Patrick Gansterer (2):
89e42c36 SystemTools: Remove duplicate code for parsing Windows registry keys
deec6b8a SystemTools: Add a function to get subkeys of a Windows registry key
Sean McBride (1):
4c4f8a9e Supress clang warnings about dynamic exception specifications
Change-Id: I37367dc5db58818d5954735e00c6d523a1dd1411
Diffstat (limited to 'hashtable.hxx.in')
-rw-r--r-- | hashtable.hxx.in | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/hashtable.hxx.in b/hashtable.hxx.in index db52fc8..62aa3f3 100644 --- a/hashtable.hxx.in +++ b/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 |