diff options
| author | Edward Smith-Rowland <3dw4rd@verizon.net> | 2016-03-10 02:45:57 +0000 |
|---|---|---|
| committer | Edward Smith-Rowland <3dw4rd@verizon.net> | 2016-03-10 02:45:57 +0000 |
| commit | f71841d8cc81510f345d972dff7a9bea3f6ca212 (patch) | |
| tree | 17596b663213e94be1560ca6dd520cf7a2a81e0c /libstdc++-v3/include | |
| parent | 5a7001adec5f69d43a2e841a80cef6d810b58d2d (diff) | |
Merged revisions r232323 through r234097 to the branch
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/tr29124@234098 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include')
| -rw-r--r-- | libstdc++-v3/include/bits/specfun.h | 18 | ||||
| -rw-r--r-- | libstdc++-v3/include/c_compatibility/math.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/c_global/cmath | 2 |
3 files changed, 14 insertions, 8 deletions
diff --git a/libstdc++-v3/include/bits/specfun.h b/libstdc++-v3/include/bits/specfun.h index 28c9d30e5be..4821189f502 100644 --- a/libstdc++-v3/include/bits/specfun.h +++ b/libstdc++-v3/include/bits/specfun.h @@ -1,6 +1,6 @@ // Mathematical Special Functions for -*- C++ -*- -// Copyright (C) 2006-2015 Free Software Foundation, Inc. +// Copyright (C) 2006-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 @@ -34,15 +34,21 @@ #include <bits/c++config.h> -#if __STDCPP_WANT_MATH_SPEC_FUNCS__ == 0 +#define __STDCPP_MATH_SPEC_FUNCS__ 201003L + +#define __cpp_lib_math_special_functions 201603L + +#if __cplusplus <= 201402L && __STDCPP_WANT_MATH_SPEC_FUNCS__ == 0 # error include <cmath> and define __STDCPP_WANT_MATH_SPEC_FUNCS__ #endif -#define __STDCPP_MATH_SPEC_FUNCS__ 201003L - -#include <bits/stl_algobase.h> #include <limits> -#include <type_traits> +#include <bits/stl_algobase.h> +#if __cplusplus >= 201103L +# include <type_traits> +#else +# include <tr1/type_traits> +#endif #include <tr1/gamma.tcc> #include <tr1/bessel_function.tcc> diff --git a/libstdc++-v3/include/c_compatibility/math.h b/libstdc++-v3/include/c_compatibility/math.h index 1f579ee594c..12d1be728a6 100644 --- a/libstdc++-v3/include/c_compatibility/math.h +++ b/libstdc++-v3/include/c_compatibility/math.h @@ -111,7 +111,7 @@ using std::tgamma; using std::trunc; #endif // C++11 && _GLIBCXX_USE_C99_MATH_TR1 -#if __STDCPP_WANT_MATH_SPEC_FUNCS__ == 1 +#if __cplusplus > 201402L || __STDCPP_WANT_MATH_SPEC_FUNCS__ == 1 using std::assoc_laguerref; using std::assoc_laguerrel; using std::assoc_laguerre; diff --git a/libstdc++-v3/include/c_global/cmath b/libstdc++-v3/include/c_global/cmath index 6a24ebfec5b..2e871834651 100644 --- a/libstdc++-v3/include/c_global/cmath +++ b/libstdc++-v3/include/c_global/cmath @@ -1790,7 +1790,7 @@ _GLIBCXX_END_NAMESPACE_VERSION #endif // C++11 -#if __STDCPP_WANT_MATH_SPEC_FUNCS__ == 1 +#if __cplusplus > 201402L || __STDCPP_WANT_MATH_SPEC_FUNCS__ == 1 # include <bits/specfun.h> #endif |