diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2017-05-18 15:36:15 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2017-05-18 15:36:15 +0100 |
| commit | 8a44a4366ebb9472f2a09a5899d43868027b4947 (patch) | |
| tree | 917f22a0dd482943e7a7dc27d8fbf05a85d6265e /libstdc++-v3 | |
| parent | 3bed500d5a0e040bb18f8a872a9c05e1ec052c3c (diff) | |
| download | gcc-8a44a4366ebb9472f2a09a5899d43868027b4947.tar.gz | |
Don't include internal header in libstdc++ tests
Backport from mainline
2016-04-18 Jonathan Wakely <jwakely@redhat.com>
* testsuite/experimental/memory_resource/null_memory_resource.cc:
Don't include internal header.
* testsuite/experimental/type_erased_allocator/2.cc: Likewise.
* testsuite/experimental/type_erased_allocator/uses_allocator.cc:
Likewise. Add licence and change to compile-only test.
From-SVN: r248220
Diffstat (limited to 'libstdc++-v3')
4 files changed, 32 insertions, 14 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 89faf85a99b..27548e67714 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,6 +1,15 @@ 2017-05-18 Jonathan Wakely <jwakely@redhat.com> Backport from mainline + 2016-04-18 Jonathan Wakely <jwakely@redhat.com> + + * testsuite/experimental/memory_resource/null_memory_resource.cc: + Don't include internal header. + * testsuite/experimental/type_erased_allocator/2.cc: Likewise. + * testsuite/experimental/type_erased_allocator/uses_allocator.cc: + Likewise. Add licence and change to compile-only test. + + Backport from mainline 2016-08-01 Jonathan Wakely <jwakely@redhat.com> * testsuite/27_io/ios_base/types/fmtflags/case_label.cc: Make test diff --git a/libstdc++-v3/testsuite/experimental/memory_resource/null_memory_resource.cc b/libstdc++-v3/testsuite/experimental/memory_resource/null_memory_resource.cc index 09d9af0ba8c..3fc42a464ef 100644 --- a/libstdc++-v3/testsuite/experimental/memory_resource/null_memory_resource.cc +++ b/libstdc++-v3/testsuite/experimental/memory_resource/null_memory_resource.cc @@ -1,4 +1,4 @@ -// { dg-options "-std=gnu++14" } +// { dg-do run { target c++14 } } // Copyright (C) 2016 Free Software Foundation, Inc. // @@ -18,7 +18,6 @@ // <http://www.gnu.org/licenses/>. #include <experimental/memory_resource> -#include <bits/uses_allocator.h> #include <testsuite_hooks.h> using std::experimental::pmr::memory_resource; diff --git a/libstdc++-v3/testsuite/experimental/type_erased_allocator/2.cc b/libstdc++-v3/testsuite/experimental/type_erased_allocator/2.cc index fb927dc27af..8f7d0b5d24b 100644 --- a/libstdc++-v3/testsuite/experimental/type_erased_allocator/2.cc +++ b/libstdc++-v3/testsuite/experimental/type_erased_allocator/2.cc @@ -20,7 +20,6 @@ #include <memory> #include <experimental/memory_resource> #include <experimental/utility> -#include <bits/uses_allocator.h> #include <testsuite_hooks.h> #include <testsuite_allocator.h> diff --git a/libstdc++-v3/testsuite/experimental/type_erased_allocator/uses_allocator.cc b/libstdc++-v3/testsuite/experimental/type_erased_allocator/uses_allocator.cc index fc8acf16dcd..d3d53ee566a 100644 --- a/libstdc++-v3/testsuite/experimental/type_erased_allocator/uses_allocator.cc +++ b/libstdc++-v3/testsuite/experimental/type_erased_allocator/uses_allocator.cc @@ -1,7 +1,25 @@ -#include <bits/uses_allocator.h> +// Copyright (C) 2015-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 +// <http://www.gnu.org/licenses/>. + +// { dg-do compile { target c++14 } } + #include <vector> -#include <experimental/utility> #include <memory> +#include <experimental/utility> using std::vector; using std::allocator; @@ -11,12 +29,5 @@ struct A { using allocator_type = std::experimental::erased_type; }; -void test01() { - static_assert(uses_allocator<vector<int>, allocator<int>>()); - static_assert(uses_allocator<A, allocator<A>>()); -} - -int main() { - test01(); - return 0; -} +static_assert(uses_allocator<vector<int>, allocator<int>>(), ""); +static_assert(uses_allocator<A, allocator<A>>(), ""); |