diff options
| author | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2000-06-27 21:12:58 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2000-06-27 21:12:58 +0000 |
| commit | 35e1ebee089cff8d0537f32e80c5c01ca9b6580b (patch) | |
| tree | 6eb8060fcd00e6709e7f6c184aa4b008e7829f65 | |
| parent | 54a3a08788fdef9bc73e9029ff106a79a640b3af (diff) | |
| download | gcc-35e1ebee089cff8d0537f32e80c5c01ca9b6580b.zip gcc-35e1ebee089cff8d0537f32e80c5c01ca9b6580b.tar.gz gcc-35e1ebee089cff8d0537f32e80c5c01ca9b6580b.tar.bz2 | |
Update to SGI STL 3.3
2000-06-27 Benjamin Kosnik <bkoz@purist.soma.redhat.com>
Update to SGI STL 3.3
* ext/hash_map, ext/hash_set, ext/slist, ext/stl_bvector.h,
ext/stl_rope.h, ext/ropeimpl.h: Update.
* bits/std_bitset.h, bits/std_map, bits/std_memory.h,
bits/stl_algo.h, bits/stl_algobase.h, bits/stl_alloc.h,
bits/stl_config.h, bits/stl_construct.h, bits/stl_deque.h,
bits/stl_function.h, bits/stl_heap.h, bits/stl_iterator.h,
bits/stl_iterator_base.h, bits/stl_list.h, bits/stl_map.h,
bits/stl_multimap.h, bits/stl_multiset.h, bits/stl_numeric.h,
bits/stl_queue.h, bits/stl_set.h, bits/stl_stack.h,
bits/stl_string_fwd.h, bits/stl_threads.h, bits/stl_three.h,
bits/stl_uninitialized.h, bits/stl_vectory.h: Update.
* src/Makefile.am (headers): Add new files.
* src/Makefile.in: Regenerate.
* src/stl-inst.cc (std): Add instantiation for __sink_unused_warning.
* bits/concept_checks.h: New file.
* bits/container_concepts.h: New file.
* bits/sequence_concepts.h: New file.
From-SVN: r34744
| -rw-r--r-- | libstdc++-v3/ext/hash_map | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/libstdc++-v3/ext/hash_map b/libstdc++-v3/ext/hash_map index 015d803..ae3cf26 100644 --- a/libstdc++-v3/ext/hash_map +++ b/libstdc++-v3/ext/hash_map @@ -257,19 +257,10 @@ inline bool operator==(const hash_multimap<_Key,_Tp,_HF,_EqKey,_Alloc>& __hm1, const hash_multimap<_Key,_Tp,_HF,_EqKey,_Alloc>& __hm2); -template <class _Key, class _Tp, class _HashFcn, class _EqualKey, - class _Alloc> +template <class _Key, class _Tp, class _HashFcn, class _EqualKey, class _Alloc> class hash_multimap { // requirements: - - __STL_CLASS_REQUIRES(_Key, _Assignable); - __STL_CLASS_REQUIRES(_Tp, _Assignable); - __STL_CLASS_UNARY_FUNCTION_CHECK(_HashFcn, size_t, _Key); - __STL_CLASS_BINARY_FUNCTION_CHECK(_EqualKey, bool, _Key, _Key); - - // requirements: - __STL_CLASS_REQUIRES(_Key, _Assignable); __STL_CLASS_REQUIRES(_Tp, _Assignable); __STL_CLASS_UNARY_FUNCTION_CHECK(_HashFcn, size_t, _Key); |