git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Define __cpp_lib_generic_associative_lookup feature-test macro 

* include/bits/stl_function.h: Remove commented-out macro.
	* include/bits/stl_tree.h (__cpp_lib_generic_associative_lookup):
	Define feature-test macro.
	* testsuite/experimental/feat-cxx14.cc: Add tests for more macros.

From-SVN: r239084
This commit is contained in:
Jonathan Wakely 2016-08-03 17:42:31 +01:00 committed by Jonathan Wakely
parent 3af8a0a810
commit 0bd9bdb4db
4 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,10 @@
2016-08-03 Jonathan Wakely <jwakely@redhat.com> 2016-08-03 Jonathan Wakely <jwakely@redhat.com>
* include/bits/stl_function.h: Remove commented-out macro.
* include/bits/stl_tree.h (__cpp_lib_generic_associative_lookup):
Define feature-test macro.
* testsuite/experimental/feat-cxx14.cc: Add tests for more macros.
* include/bits/c++config (_GLIBCXX_USE_STD_SPEC_FUNCS): Define for * include/bits/c++config (_GLIBCXX_USE_STD_SPEC_FUNCS): Define for
C++17, or for C++11/C++14 when __STDCPP_WANT_MATH_SPEC_FUNCS__ is C++17, or for C++11/C++14 when __STDCPP_WANT_MATH_SPEC_FUNCS__ is
true. true.

1
libstdc++-v3/include/bits/stl_function.h
View File

@ -225,7 +225,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#if __cplusplus > 201103L #if __cplusplus > 201103L
#define __cpp_lib_transparent_operators 201210 #define __cpp_lib_transparent_operators 201210
//#define __cpp_lib_generic_associative_lookup 201304
template<> template<>
struct plus<void> struct plus<void>

4
libstdc++-v3/include/bits/stl_tree.h
View File

@ -73,6 +73,10 @@ namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_BEGIN_NAMESPACE_VERSION
#if __cplusplus > 201103L
# define __cpp_lib_generic_associative_lookup 201304
#endif
// Red-black tree class, designed for use in implementing STL // Red-black tree class, designed for use in implementing STL
// associative containers (set, multiset, map, and multimap). The // associative containers (set, multiset, map, and multimap). The
// insertion and deletion algorithms are based on those in Cormen, // insertion and deletion algorithms are based on those in Cormen,

24
libstdc++-v3/testsuite/experimental/feat-cxx14.cc
View File

@ -11,6 +11,8 @@
#include <complex> #include <complex>
#include <iomanip> #include <iomanip>
#include <shared_mutex> #include <shared_mutex>
#include <map>
#include <set>
#ifndef __cpp_lib_integer_sequence #ifndef __cpp_lib_integer_sequence
# error "__cpp_lib_integer_sequence" # error "__cpp_lib_integer_sequence"
@ -78,11 +80,11 @@
# error "__cpp_lib_complex_udls != 201309" # error "__cpp_lib_complex_udls != 201309"
#endif #endif
//#ifndef __cpp_lib_generic_associative_lookup #ifndef __cpp_lib_generic_associative_lookup
//# error "__cpp_lib_generic_associative_lookup" # error "__cpp_lib_generic_associative_lookup"
//#elif __cpp_lib_generic_associative_lookup != 201304 #elif __cpp_lib_generic_associative_lookup != 201304
//# error "__cpp_lib_generic_associative_lookup != 201304" # error "__cpp_lib_generic_associative_lookup != 201304"
//#endif #endif
//#ifndef __cpp_lib_null_iterators //#ifndef __cpp_lib_null_iterators
//# error "__cpp_lib_null_iterators" //# error "__cpp_lib_null_iterators"
@ -119,3 +121,15 @@
#elif __cpp_lib_is_final != 201402 #elif __cpp_lib_is_final != 201402
# error "__cpp_lib_is_final != 201402" # error "__cpp_lib_is_final != 201402"
#endif #endif
#ifndef __cpp_lib_is_null_pointer
# error "__cpp_lib_is_null_pointer"
#elif __cpp_lib_is_null_pointer != 201309
# error "__cpp_lib_is_null_pointer != 201309"
#endif
#ifndef __cpp_lib_make_reverse_iterator
# error "__cpp_lib_make_reverse_iterator"
#elif __cpp_lib_make_reverse_iterator != 201402
# error "__cpp_lib_make_reverse_iterator != 201402"
#endif