diff options
| author | Edward Smith-Rowland <3dw4rd@verizon.net> | 2016-07-22 16:54:49 +0000 |
|---|---|---|
| committer | Edward Smith-Rowland <3dw4rd@verizon.net> | 2016-07-22 16:54:49 +0000 |
| commit | 514339a7c73732a79109e5940e33456e67eebb99 (patch) | |
| tree | 545930df25c9bc38aa7fdbada6498a0d6942032c /libstdc++-v3/include | |
| parent | 29915d206bc81f0cda23e2576396d1cf5ca2c114 (diff) | |
Revert accidental changes made to libstdc++-v3/include/bits/specfun.h libstdc++-v3/include/c_compatibility/math.h libstdc++-v3/include/c_global/cmath
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/tr29124@238654 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include')
| -rw-r--r-- | libstdc++-v3/include/bits/specfun.h | 8 | ||||
| -rw-r--r-- | libstdc++-v3/include/c_compatibility/math.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/c_global/cmath | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/libstdc++-v3/include/bits/specfun.h b/libstdc++-v3/include/bits/specfun.h index f52e085a14a..9f7bb87d2d3 100644 --- a/libstdc++-v3/include/bits/specfun.h +++ b/libstdc++-v3/include/bits/specfun.h @@ -42,13 +42,9 @@ # error include <cmath> and define __STDCPP_WANT_MATH_SPEC_FUNCS__ #endif -#include <limits> #include <bits/stl_algobase.h> -#if __cplusplus >= 201103L -# include <type_traits> -#else -# include <tr1/type_traits> -#endif +#include <limits> +#include <type_traits> #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 12d1be728a6..1f579ee594c 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 __cplusplus > 201402L || __STDCPP_WANT_MATH_SPEC_FUNCS__ == 1 +#if __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 2e871834651..6a24ebfec5b 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 __cplusplus > 201402L || __STDCPP_WANT_MATH_SPEC_FUNCS__ == 1 +#if __STDCPP_WANT_MATH_SPEC_FUNCS__ == 1 # include <bits/specfun.h> #endif |