exception (uncaught_exceptions): Add comment.

* libsupc++/exception (uncaught_exceptions): Add comment. Reorder #if.
	* testsuite/18_support/uncaught_exceptions/uncaught_exceptions.cc:
	Use -std=gnu++1z. Check feature-test macro.

From-SVN: r222523
This commit is contained in:
Jonathan Wakely 2015-04-28 13:07:40 +01:00 committed by Jonathan Wakely
parent bd1eb5e092
commit 196e0493cb
3 changed files with 13 additions and 2 deletions

View File

@ -1,5 +1,9 @@
2015-04-28 Jonathan Wakely <jwakely@redhat.com>
* libsupc++/exception (uncaught_exceptions): Add comment. Reorder #if.
* testsuite/18_support/uncaught_exceptions/uncaught_exceptions.cc:
Use -std=gnu++1z. Check feature-test macro.
* include/std/type_traits (void_t): Add.
* testsuite/20_util/void_t/1.cc: New.

View File

@ -126,8 +126,9 @@ namespace std
*/
bool uncaught_exception() _GLIBCXX_USE_NOEXCEPT __attribute__ ((__pure__));
#if !defined(__STRICT_ANSI__) || __cplusplus > 201402L
#if __cplusplus > 201402L || !defined(__STRICT_ANSI__) // c++1z or gnu++98
#define __cpp_lib_uncaught_exceptions 201411
/// The number of uncaught exceptions.
int uncaught_exceptions() _GLIBCXX_USE_NOEXCEPT __attribute__ ((__pure__));
#endif

View File

@ -15,12 +15,18 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-options "-std=gnu++11" }
// { dg-options "-std=gnu++1z" }
#include <cassert>
#include <exception>
#include <testsuite_hooks.h>
#ifndef __cpp_lib_uncaught_exceptions
# error "Feature-test macro for uncaught_exceptions missing"
#elif __cpp_lib_uncaught_exceptions != 201411
# error "Feature-test macro for uncaught_exceptions has wrong value"
#endif
struct UncaughtVerifier
{
int expected_count_ = 0;