diff options
Diffstat (limited to 'libstdc++-v3/include/tr1')
| -rw-r--r-- | libstdc++-v3/include/tr1/cmath | 1 | ||||
| -rw-r--r-- | libstdc++-v3/include/tr1/functional_hash.h | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/tr1/hashtable | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/libstdc++-v3/include/tr1/cmath b/libstdc++-v3/include/tr1/cmath index 8d231445b73..36845bb124f 100644 --- a/libstdc++-v3/include/tr1/cmath +++ b/libstdc++-v3/include/tr1/cmath @@ -36,6 +36,7 @@ #include <bits/c++config.h> #include <bits/stl_algobase.h> +#include <limits> #include <cmath> #include <tr1/common.h> diff --git a/libstdc++-v3/include/tr1/functional_hash.h b/libstdc++-v3/include/tr1/functional_hash.h index 9c6f69a3f51..f692308e137 100644 --- a/libstdc++-v3/include/tr1/functional_hash.h +++ b/libstdc++-v3/include/tr1/functional_hash.h @@ -208,7 +208,7 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1) __ldval = __ldval < 0.0l ? -(__ldval + 0.5l) : __ldval; const long double __mult = - std::numeric_limits<std::size_t>::max() + 1.0l; + __gnu_cxx::__numeric_traits<std::size_t>::__max + 1.0l; __ldval *= __mult; // Try to use all the bits of the mantissa (really necessary only @@ -217,8 +217,7 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1) __ldval = (__ldval - (long double)__hibits) * __mult; const std::size_t __coeff = - (std::numeric_limits<std::size_t>::max() - / std::numeric_limits<long double>::max_exponent); + __gnu_cxx::__numeric_traits<std::size_t>::__max / __LDBL_MAX_EXP__; __result = __hibits + (std::size_t)__ldval + __coeff * __exponent; diff --git a/libstdc++-v3/include/tr1/hashtable b/libstdc++-v3/include/tr1/hashtable index 7fa9ea11789..526ebf82e27 100644 --- a/libstdc++-v3/include/tr1/hashtable +++ b/libstdc++-v3/include/tr1/hashtable @@ -53,9 +53,10 @@ #define _TR1_HASHTABLE 1 #include <utility> // For std::pair -#include <iterator> #include <cstddef> #include <cmath> +#include <bits/stl_iterator_base_types.h> +#include <bits/stl_iterator_base_funcs.h> #include <bits/allocator.h> #include <bits/functexcept.h> #include <tr1/type_traits> // For true_type and false_type |
