aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3/testsuite/util/performance/assoc/multimap_common_type.hpp
diff options
context:
space:
mode:
authorBenjamin Kosnik <bkoz@redhat.com>2006-09-18 13:30:56 +0000
committerBenjamin Kosnik <bkoz@gcc.gnu.org>2006-09-18 13:30:56 +0000
commit105c6331b2b4a1e573bf237eaf9c572e18f8147c (patch)
tree45a99e66079ad8c76c24028341e6552ea91cf361 /libstdc++-v3/testsuite/util/performance/assoc/multimap_common_type.hpp
parentbcc4a44f6b929d0640370f1dd6aafccba481527c (diff)
downloadgcc-105c6331b2b4a1e573bf237eaf9c572e18f8147c.zip
gcc-105c6331b2b4a1e573bf237eaf9c572e18f8147c.tar.gz
gcc-105c6331b2b4a1e573bf237eaf9c572e18f8147c.tar.bz2
type_traits.h: New.
2006-09-18 Benjamin Kosnik <bkoz@redhat.com> Peter Doerfler <gcc@pdoerfler.com> Paolo Carlini <pcarlini@suse.de> * include/ext/type_traits.h: New. (__conditional_type): New. (__numeric_traits): New. (__add_unsigned): New. (__remove_unsigned): New. (__enable_if): New. * include/Makefile.am: Add. * include/Makefile.in: Regenerate. * include/ext/pb_ds/detail/type_utils.hpp: Use ext include, remove duplicates. * include/tr1/hashtable_policy.h (IF): Use __conditional_type. (_Max_digits10): Same. (identity): Use _Identity. (extract1st): Use _Select1st. * include/tr1/random (_Select): Use __conditional_type. (_To_Unsigned_Type): Use __add_unsigned. Linebreak fixups. * include/bits/locale_facets.tcc (__to_unsigned_type): Remove, use __add_unsigned. * include/tr1/random.tcc: Fixups as above. * include/tr1/unordered_map: Same. * include/tr1/hashtable: Same. * include/tr1/unordered_set: Same. * include/ext/pb_ds/detail/gp_hash_table_map_/ standard_policies.hpp: Same. * include/ext/pb_ds/detail/standard_policies.hpp: Same. * include/ext/pb_ds/detail/typelist/typelist_filter.hpp: Same. * include/ext/pb_ds/detail/binary_heap_/binary_heap_.hpp: Same. * include/ext/pb_ds/detail/type_utils.hpp: Same. * include/ext/pb_ds/trie_policy.hpp: Same. * docs/html/ext/pb_ds/string_trie_e_access_traits.html: Same. * include/bits/cpp_type_traits.h (__enable_if): Move to ext, make boolean argument first. * include/bits/locale_facets.h: Fixups for __enable_if argument and namespace switch. * include/bits/stl_algobase.h: Same. * include/bits/stl_algo.h: Same. * include/bits/stl_iterator.h: Same. * include/bits/streambuf_iterator.h: Same. * include/debug/safe_iterator.h: Same. * include/tr1/hashtable_policy.h: Same. * include/tr1/cmath: Same. * include/tr1/functional: Same. * include/tr1/functional_iterate.h: Same. * include/std/std_streambuf.h: Same. * include/c_std/std_cmath.h: Same. * testsuite/util/testsuite_tr1.h: Same. * testsuite/util/performance/assoc/multimap_common_type.hpp: Same. Co-Authored-By: Paolo Carlini <pcarlini@suse.de> Co-Authored-By: Peter Doerfler <gcc@pdoerfler.com> From-SVN: r117024
Diffstat (limited to 'libstdc++-v3/testsuite/util/performance/assoc/multimap_common_type.hpp')
-rw-r--r--libstdc++-v3/testsuite/util/performance/assoc/multimap_common_type.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/multimap_common_type.hpp b/libstdc++-v3/testsuite/util/performance/assoc/multimap_common_type.hpp
index 244fb10..51cc3cc 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/multimap_common_type.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/multimap_common_type.hpp
@@ -105,12 +105,12 @@ namespace pb_ds
{
private:
typedef
- typename pb_ds::detail::conditional_type<
+ typename pb_ds::detail::__conditional_type<
pb_ds::detail::is_same<
int,
Key>::value,
int_hash,
- string_hash_fn>::type
+ string_hash_fn>::__type
hash_fn_t;
template<typename Cntnr_T>