OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PR libstdc++/79433 no #error for including headers with wrong -std

Browse Source 
Backport from mainline
2017-09-12  Jonathan Wakely  <jwakely@redhat.com>

	PR libstdc++/79433
	* doc/xml/manual/status_cxx2017.xml: Update feature-test macros.
	* doc/html/*: Regenerate.
	* include/Makefile.am: Remove <bits/c++17_warning.h>.
	* include/Makefile.in: Regenerate.
	* include/bits/c++17_warning.h: Remove.
	* include/bits/string_view.tcc: Do not include <bits/c++17_warning.h>
	for pre-C++17 modes.
	* include/std/any: Likewise.
	(__cpp_lib_any): Define.
	* include/std/mutex (__cpp_lib_scoped_lock): Adjust value as per new
	SD-6 draft.
	* include/std/numeric (__cpp_lib_gcd_lcm): Define as per new SD-6
	draft.
	* include/std/optional: Do not include <bits/c++17_warning.h>.
	(__cpp_lib_optional): Define.
	* include/std/shared_mutex: Do not include <bits/c++14_warning.h>.
	* include/std/string_view: Do not include <bits/c++17_warning.h>.
	(__cpp_lib_string_view): Define.
	* include/std/variant: Do not include <bits/c++17_warning.h>.
	(__cpp_lib_variant): Define.
	* testsuite/20_util/optional/cons/value_neg.cc: Adjust dg-error line
	numbers.
	* testsuite/26_numerics/gcd/1.cc: Test for __cpp_lib_gcd_lcm.
	* testsuite/26_numerics/gcd/gcd_neg.cc: Adjust dg-error line
	numbers.
	* testsuite/26_numerics/lcm/1.cc: Test for __cpp_lib_gcd_lcm.
	* testsuite/26_numerics/lcm/lcm_neg.cc: Adjust dg-error line
	numbers.
	* testsuite/30_threads/scoped_lock/requirements/typedefs.cc: Adjust
	expected value of __cpp_lib_scoped_lock.

From-SVN: r253943
This commit is contained in:
Jonathan Wakely 2017-10-20 16:14:29 +01:00 committed by Jonathan Wakely
parent 24aeb1b939
commit 7759a387e2
19 changed files with 93 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,40 @@
2017-10-20 Jonathan Wakely <jwakely@redhat.com> 2017-10-20 Jonathan Wakely <jwakely@redhat.com>
Backport from mainline
2017-09-12 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/79433
* doc/xml/manual/status_cxx2017.xml: Update feature-test macros.
* doc/html/*: Regenerate.
* include/Makefile.am: Remove <bits/c++17_warning.h>.
* include/Makefile.in: Regenerate.
* include/bits/c++17_warning.h: Remove.
* include/bits/string_view.tcc: Do not include <bits/c++17_warning.h>
for pre-C++17 modes.
* include/std/any: Likewise.
(__cpp_lib_any): Define.
* include/std/mutex (__cpp_lib_scoped_lock): Adjust value as per new
SD-6 draft.
* include/std/numeric (__cpp_lib_gcd_lcm): Define as per new SD-6
draft.
* include/std/optional: Do not include <bits/c++17_warning.h>.
(__cpp_lib_optional): Define.
* include/std/shared_mutex: Do not include <bits/c++14_warning.h>.
* include/std/string_view: Do not include <bits/c++17_warning.h>.
(__cpp_lib_string_view): Define.
* include/std/variant: Do not include <bits/c++17_warning.h>.
(__cpp_lib_variant): Define.
* testsuite/20_util/optional/cons/value_neg.cc: Adjust dg-error line
numbers.
* testsuite/26_numerics/gcd/1.cc: Test for __cpp_lib_gcd_lcm.
* testsuite/26_numerics/gcd/gcd_neg.cc: Adjust dg-error line
numbers.
* testsuite/26_numerics/lcm/1.cc: Test for __cpp_lib_gcd_lcm.
* testsuite/26_numerics/lcm/lcm_neg.cc: Adjust dg-error line
numbers.
* testsuite/30_threads/scoped_lock/requirements/typedefs.cc: Adjust
expected value of __cpp_lib_scoped_lock.
Backport from mainline Backport from mainline
2017-10-19 Jonathan Wakely <jwakely@redhat.com> 2017-10-19 Jonathan Wakely <jwakely@redhat.com>

28
libstdc++-v3/doc/xml/manual/status_cxx2017.xml
View File

@ -98,7 +98,9 @@ Feature-testing recommendations for C++</link>.
</link> </link>
</entry> </entry>
<entry align="center"> 7 </entry> <entry align="center"> 7 </entry>
<entry> <code>__has_include(&lt;variant&gt;)</code> </entry> <entry> <code>__has_include(&lt;variant&gt;)</code>,
<code>__cpp_lib_variant >= 201603</code>
</entry>
</row> </row>
<row> <row>
@ -109,7 +111,9 @@ Feature-testing recommendations for C++</link>.
</link> </link>
</entry> </entry>
<entry align="center"> 7 </entry> <entry align="center"> 7 </entry>
<entry> <code>__has_include(&lt;optional&gt;)</code> </entry> <entry> <code>__has_include(&lt;optional&gt;)</code>,
<code>__cpp_lib_optional >= 201603</code>
</entry>
</row> </row>
<row> <row>
@ -120,7 +124,9 @@ Feature-testing recommendations for C++</link>.
</link> </link>
</entry> </entry>
<entry align="center"> 7 </entry> <entry align="center"> 7 </entry>
<entry> <code>__has_include(&lt;any&gt;)</code> </entry> <entry> <code>__has_include(&lt;any&gt;)</code>,
<code>__cpp_lib_any >= 201603</code>
</entry>
</row> </row>
<row> <row>
@ -131,7 +137,9 @@ Feature-testing recommendations for C++</link>.
</link> </link>
</entry> </entry>
<entry align="center"> 7 </entry> <entry align="center"> 7 </entry>
<entry> <code>__has_include(&lt;string_view&gt;)</code> </entry> <entry> <code>__has_include(&lt;string_view&gt;)</code>,
<code>__cpp_lib_string_view >= 201603</code>
</entry>
</row> </row>
<row> <row>
@ -143,7 +151,9 @@ Feature-testing recommendations for C++</link>.
</link> </link>
</entry> </entry>
<entry align="center"> No </entry> <entry align="center"> No </entry>
<entry> <code>__has_include(&lt;memory_resource&gt;)</code> </entry> <entry> <code>__has_include(&lt;memory_resource&gt;)</code>,
<code>__cpp_lib_memory_resource >= 201603</code>
</entry>
</row> </row>
<row> <row>
@ -616,7 +626,9 @@ Feature-testing recommendations for C++</link>.
</entry> </entry>
<entry align="center"> No </entry> <entry align="center"> No </entry>
<entry><code> __has_include(&lt;execution&gt;) </code>, <entry><code> __has_include(&lt;execution&gt;) </code>,
<code> __cpp_lib_parallel_algorithm >= 201603 </code></entry> <code> __cpp_lib_execution >= 201603 </code>,
<code> __cpp_lib_parallel_algorithm >= 201603 </code>
</entry>
</row> </row>
<row> <row>
@ -638,9 +650,7 @@ Feature-testing recommendations for C++</link>.
</link> </link>
</entry> </entry>
<entry align="center"> 7 </entry> <entry align="center"> 7 </entry>
<entry><code> __cpp_lib_gcd >= 201606 </code>, <entry><code> __cpp_lib_gcd_lcm >= 201606 </code></entry>
<code> __cpp_lib_lcm >= 201606 </code>
</entry>
</row> </row>
<row> <row>

1
libstdc++-v3/include/Makefile.am
View File

@ -96,7 +96,6 @@ bits_headers = \
${bits_srcdir}/boost_concept_check.h \ ${bits_srcdir}/boost_concept_check.h \
${bits_srcdir}/c++0x_warning.h \ ${bits_srcdir}/c++0x_warning.h \
${bits_srcdir}/c++14_warning.h \ ${bits_srcdir}/c++14_warning.h \
${bits_srcdir}/c++17_warning.h \
${bits_srcdir}/char_traits.h \ ${bits_srcdir}/char_traits.h \
${bits_srcdir}/codecvt.h \ ${bits_srcdir}/codecvt.h \
${bits_srcdir}/concept_check.h \ ${bits_srcdir}/concept_check.h \

1
libstdc++-v3/include/Makefile.in
View File

@ -389,7 +389,6 @@ bits_headers = \
${bits_srcdir}/boost_concept_check.h \ ${bits_srcdir}/boost_concept_check.h \
${bits_srcdir}/c++0x_warning.h \ ${bits_srcdir}/c++0x_warning.h \
${bits_srcdir}/c++14_warning.h \ ${bits_srcdir}/c++14_warning.h \
${bits_srcdir}/c++17_warning.h \
${bits_srcdir}/char_traits.h \ ${bits_srcdir}/char_traits.h \
${bits_srcdir}/codecvt.h \ ${bits_srcdir}/codecvt.h \
${bits_srcdir}/concept_check.h \ ${bits_srcdir}/concept_check.h \

37
libstdc++-v3/include/bits/c++17_warning.h
View File

@ -1,37 +0,0 @@
// Copyright (C) 2016-2017 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.
// Under Section 7 of GPL version 3, you are granted additional
// permissions described in the GCC Runtime Library Exception, version
// 3.1, as published by the Free Software Foundation.
// You should have received a copy of the GNU General Public License and
// a copy of the GCC Runtime Library Exception along with this program;
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
// <http://www.gnu.org/licenses/>.
/** @file bits/c++17_warning.h
* This is an internal header file, included by other library headers.
* Do not attempt to use it directly. @headername{iosfwd}
*/
#ifndef _CXX17_WARNING_H
#define _CXX17_WARNING_H 1
#if __cplusplus <= 201402L
#error This file requires compiler and library support \
for the ISO C++ 2017 standard. This support must be enabled \
with the -std=c++17 or -std=gnu++17 compiler options.
#endif
#endif

4
libstdc++-v3/include/bits/string_view.tcc
View File

@ -36,9 +36,7 @@
#pragma GCC system_header #pragma GCC system_header
#if __cplusplus <= 201402L #if __cplusplus >= 201703L
# include <bits/c++17_warning.h>
#else
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {

6
libstdc++-v3/include/std/any
View File

@ -31,9 +31,7 @@
#pragma GCC system_header #pragma GCC system_header
#if __cplusplus <= 201402L #if __cplusplus >= 201703L
# include <bits/c++17_warning.h>
#else
#include <typeinfo> #include <typeinfo>
#include <new> #include <new>
@ -68,6 +66,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#endif #endif
} }
#define __cpp_lib_any 201603
/** /**
* @brief A type-safe container of any type. * @brief A type-safe container of any type.
* *

4
libstdc++-v3/include/std/mutex
View File

@ -556,8 +556,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
} }
#if __cplusplus > 201402L #if __cplusplus >= 201703L
#define __cpp_lib_scoped_lock 201707 #define __cpp_lib_scoped_lock 201703
/** @brief A scoped lock type for multiple lockable objects. /** @brief A scoped lock type for multiple lockable objects.
* *
* A scoped_lock controls mutex ownership within a scope, releasing * A scoped_lock controls mutex ownership within a scope, releasing

5
libstdc++-v3/include/std/numeric
View File

@ -125,7 +125,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#if __cplusplus > 201402L #if __cplusplus > 201402L
#define __cpp_lib_gcd_lcm 201606
// These were used in drafts of SD-6:
#define __cpp_lib_gcd 201606 #define __cpp_lib_gcd 201606
#define __cpp_lib_lcm 201606
/// Greatest common divisor /// Greatest common divisor
template<typename _Mn, typename _Nn> template<typename _Mn, typename _Nn>
constexpr common_type_t<_Mn, _Nn> constexpr common_type_t<_Mn, _Nn>
@ -138,7 +142,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return __detail::__gcd(__m, __n); return __detail::__gcd(__m, __n);
} }
#define __cpp_lib_lcm 201606
/// Least common multiple /// Least common multiple
template<typename _Mn, typename _Nn> template<typename _Mn, typename _Nn>
constexpr common_type_t<_Mn, _Nn> constexpr common_type_t<_Mn, _Nn>

8
libstdc++-v3/include/std/optional
View File

@ -29,9 +29,9 @@
#ifndef _GLIBCXX_OPTIONAL #ifndef _GLIBCXX_OPTIONAL
#define _GLIBCXX_OPTIONAL 1 #define _GLIBCXX_OPTIONAL 1
#if __cplusplus <= 201402L #pragma GCC system_header
# include <bits/c++17_warning.h>
#else #if __cplusplus >= 201703L
#include <utility> #include <utility>
#include <type_traits> #include <type_traits>
@ -51,6 +51,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
* @{ * @{
*/ */
#define __cpp_lib_optional 201603
template<typename _Tp> template<typename _Tp>
class optional; class optional;

6
libstdc++-v3/include/std/shared_mutex
View File

@ -31,9 +31,7 @@
#pragma GCC system_header #pragma GCC system_header
#if __cplusplus <= 201103L #if __cplusplus >= 201402L
# include <bits/c++14_warning.h>
#else
#include <bits/c++config.h> #include <bits/c++config.h>
#include <condition_variable> #include <condition_variable>
@ -51,7 +49,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifdef _GLIBCXX_USE_C99_STDINT_TR1 #ifdef _GLIBCXX_USE_C99_STDINT_TR1
#ifdef _GLIBCXX_HAS_GTHREADS #ifdef _GLIBCXX_HAS_GTHREADS
#if __cplusplus > 201402L #if __cplusplus >= 201703L
#define __cpp_lib_shared_mutex 201505 #define __cpp_lib_shared_mutex 201505
class shared_mutex; class shared_mutex;
#endif #endif

6
libstdc++-v3/include/std/string_view
View File

@ -35,9 +35,7 @@
#pragma GCC system_header #pragma GCC system_header
#if __cplusplus <= 201402L #if __cplusplus >= 201703L
# include <bits/c++17_warning.h>
#else
#include <limits> #include <limits>
#include <iosfwd> #include <iosfwd>
@ -49,6 +47,8 @@ namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_BEGIN_NAMESPACE_VERSION
#define __cpp_lib_string_view 201603
/** /**
* @class basic_string_view <string_view> * @class basic_string_view <string_view>
* @brief A non-owning reference to a string. * @brief A non-owning reference to a string.

6
libstdc++-v3/include/std/variant
View File

@ -31,9 +31,7 @@
#pragma GCC system_header #pragma GCC system_header
#if __cplusplus <= 201402L #if __cplusplus >= 201703L
# include <bits/c++17_warning.h>
#else
#include <type_traits> #include <type_traits>
#include <utility> #include <utility>
@ -73,6 +71,8 @@ _GLIBCXX_END_NAMESPACE_VERSION
_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_BEGIN_NAMESPACE_VERSION
#define __cpp_lib_variant 201603
template<typename... _Types> class tuple; template<typename... _Types> class tuple;
template<typename... _Types> class variant; template<typename... _Types> class variant;
template <typename> struct hash; template <typename> struct hash;

6
libstdc++-v3/testsuite/20_util/optional/cons/value_neg.cc
View File

@ -37,8 +37,8 @@ int main()
std::optional<std::unique_ptr<int>> oup2 = new int; // { dg-error "conversion" } std::optional<std::unique_ptr<int>> oup2 = new int; // { dg-error "conversion" }
struct U { explicit U(std::in_place_t); }; struct U { explicit U(std::in_place_t); };
std::optional<U> ou(std::in_place); // { dg-error "no matching" } std::optional<U> ou(std::in_place); // { dg-error "no matching" }
// { dg-error "no type" "" { target { *-*-* } } 488 } // { dg-error "no type" "" { target { *-*-* } } 490 }
// { dg-error "no type" "" { target { *-*-* } } 498 } // { dg-error "no type" "" { target { *-*-* } } 500 }
// { dg-error "no type" "" { target { *-*-* } } 555 } // { dg-error "no type" "" { target { *-*-* } } 557 }
} }
} }

4
libstdc++-v3/testsuite/26_numerics/gcd/1.cc
View File

@ -20,9 +20,9 @@
#include <numeric> #include <numeric>
#ifndef __cpp_lib_gcd #ifndef __cpp_lib_gcd_lcm
# error "Feature-test macro for gcd missing" # error "Feature-test macro for gcd missing"
#elif __cpp_lib_gcd != 201606 #elif __cpp_lib_gcd_lcm != 201606
# error "Feature-test macro for gcd has wrong value" # error "Feature-test macro for gcd has wrong value"
#endif #endif

8
libstdc++-v3/testsuite/26_numerics/gcd/gcd_neg.cc
View File

@ -31,9 +31,9 @@ test01()
std::gcd(0.1, 0.1); // { dg-error "from here" } std::gcd(0.1, 0.1); // { dg-error "from here" }
} }
// { dg-error "integers" "" { target *-*-* } 134 } // { dg-error "integers" "" { target *-*-* } 138 }
// { dg-error "integers" "" { target *-*-* } 135 } // { dg-error "integers" "" { target *-*-* } 139 }
// { dg-error "not bools" "" { target *-*-* } 136 } // { dg-error "not bools" "" { target *-*-* } 140 }
// { dg-error "not bools" "" { target *-*-* } 137 } // { dg-error "not bools" "" { target *-*-* } 141 }
// { dg-prune-output "deleted function" } // { dg-prune-output "deleted function" }
// { dg-prune-output "invalid operands" } // { dg-prune-output "invalid operands" }

4
libstdc++-v3/testsuite/26_numerics/lcm/1.cc
View File

@ -20,9 +20,9 @@
#include <numeric> #include <numeric>
#ifndef __cpp_lib_lcm #ifndef __cpp_lib_gcd_lcm
# error "Feature-test macro for lcm missing" # error "Feature-test macro for lcm missing"
#elif __cpp_lib_lcm != 201606 #elif __cpp_lib_gcd_lcm != 201606
# error "Feature-test macro for lcm has wrong value" # error "Feature-test macro for lcm has wrong value"
#endif #endif

8
libstdc++-v3/testsuite/26_numerics/lcm/lcm_neg.cc
View File

@ -31,9 +31,9 @@ test01()
std::lcm(0.1, 0.1); // { dg-error "from here" } std::lcm(0.1, 0.1); // { dg-error "from here" }
} }
// { dg-error "integers" "" { target *-*-* } 147 } // { dg-error "integers" "" { target *-*-* } 150 }
// { dg-error "integers" "" { target *-*-* } 148 } // { dg-error "integers" "" { target *-*-* } 151 }
// { dg-error "not bools" "" { target *-*-* } 149 } // { dg-error "not bools" "" { target *-*-* } 152 }
// { dg-error "not bools" "" { target *-*-* } 150 } // { dg-error "not bools" "" { target *-*-* } 153 }
// { dg-prune-output "deleted function" } // { dg-prune-output "deleted function" }
// { dg-prune-output "invalid operands" } // { dg-prune-output "invalid operands" }

2
libstdc++-v3/testsuite/30_threads/scoped_lock/requirements/typedefs.cc
View File

@ -27,7 +27,7 @@
#ifndef __cpp_lib_scoped_lock #ifndef __cpp_lib_scoped_lock
# error "Feature-test macro for scoped_lock missing" # error "Feature-test macro for scoped_lock missing"
#elif __cpp_lib_scoped_lock != 201707 #elif __cpp_lib_scoped_lock != 201703
# error "Feature-test macro for scoped_lock has wrong value" # error "Feature-test macro for scoped_lock has wrong value"
#endif #endif