From 9f19138cf5eae37cf353460e2d77aaf61569111c Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 12 Dec 2016 16:36:30 +0000 Subject: [PATCH] Improve tests for contents of header Backport from mainline 2016-12-07 Jonathan Wakely * testsuite/18_support/headers/new/synopsis.cc: Add C++14 declarations. * testsuite/18_support/headers/new/synopsis_cxx98.cc: New test. From-SVN: r243565 --- libstdc++-v3/ChangeLog | 8 ++++ .../18_support/headers/new/synopsis.cc | 19 ++++++-- .../18_support/headers/new/synopsis_cxx98.cc | 43 +++++++++++++++++++ 3 files changed, 66 insertions(+), 4 deletions(-) create mode 100644 libstdc++-v3/testsuite/18_support/headers/new/synopsis_cxx98.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c08ce926139f..9e5134aa4497 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2016-12-12 Jonathan Wakely + + Backport from mainline + 2016-12-07 Jonathan Wakely + + * testsuite/18_support/headers/new/synopsis.cc: Add C++14 declarations. + * testsuite/18_support/headers/new/synopsis_cxx98.cc: New test. + 2016-12-12 Jonathan Wakely Backport from mainline diff --git a/libstdc++-v3/testsuite/18_support/headers/new/synopsis.cc b/libstdc++-v3/testsuite/18_support/headers/new/synopsis.cc index c7a7163902e3..cdf06eb9f15f 100644 --- a/libstdc++-v3/testsuite/18_support/headers/new/synopsis.cc +++ b/libstdc++-v3/testsuite/18_support/headers/new/synopsis.cc @@ -22,18 +22,19 @@ namespace std { class bad_alloc; + class bad_array_new_length; struct nothrow_t; extern const nothrow_t nothrow; typedef void (*new_handler)(); - new_handler set_new_handler(new_handler new_p) throw(); new_handler get_new_handler() noexcept; + new_handler set_new_handler(new_handler new_p) noexcept; } -void* operator new(std::size_t size) throw(std::bad_alloc); -void* operator new(std::size_t size, const std::nothrow_t&) throw(); +void* operator new(std::size_t size); +void* operator new(std::size_t size, const std::nothrow_t&) noexcept; void operator delete(void* ptr) throw(); void operator delete(void* ptr, const std::nothrow_t&) throw(); -void* operator new[](std::size_t size) throw(std::bad_alloc); +void* operator new[](std::size_t size); void* operator new[](std::size_t size, const std::nothrow_t&) throw(); void operator delete[](void* ptr) throw(); void operator delete[](void* ptr, const std::nothrow_t&) throw(); @@ -42,3 +43,13 @@ void* operator new (std::size_t size, void* ptr) throw(); void* operator new[](std::size_t size, void* ptr) throw(); void operator delete (void* ptr, void*) throw(); void operator delete[](void* ptr, void*) throw(); + +#if __cplusplus >= 201402L +// C++14 sized deallocation functions +void operator delete(void* ptr, std::size_t size) noexcept; +void operator delete(void* ptr, std::size_t size, + const std::nothrow_t&) noexcept; +void operator delete[](void* ptr, std::size_t size) noexcept; +void operator delete[](void* ptr, std::size_t size, + const std::nothrow_t&) noexcept; +#endif diff --git a/libstdc++-v3/testsuite/18_support/headers/new/synopsis_cxx98.cc b/libstdc++-v3/testsuite/18_support/headers/new/synopsis_cxx98.cc new file mode 100644 index 000000000000..2b2abd2bbdc2 --- /dev/null +++ b/libstdc++-v3/testsuite/18_support/headers/new/synopsis_cxx98.cc @@ -0,0 +1,43 @@ +// { dg-options "-std=gnu++98" } +// { dg-do compile } + +// Copyright (C) 2007-2016 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include + +namespace std { + class bad_alloc; + struct nothrow_t; + extern const nothrow_t nothrow; + typedef void (*new_handler)(); + new_handler set_new_handler(new_handler new_p) throw(); +} + +void* operator new(std::size_t size) throw(std::bad_alloc); +void* operator new(std::size_t size, const std::nothrow_t&) throw(); +void operator delete(void* ptr) throw(); +void operator delete(void* ptr, const std::nothrow_t&) throw(); +void* operator new[](std::size_t size) throw(std::bad_alloc); +void* operator new[](std::size_t size, const std::nothrow_t&) throw(); +void operator delete[](void* ptr) throw(); +void operator delete[](void* ptr, const std::nothrow_t&) throw(); + +void* operator new (std::size_t size, void* ptr) throw(); +void* operator new[](std::size_t size, void* ptr) throw(); +void operator delete (void* ptr, void*) throw(); +void operator delete[](void* ptr, void*) throw(); -- 2.47.2