diff options
author | Dan Albert <danalbert@google.com> | 2015-10-23 16:48:50 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-10-23 16:48:50 +0000 |
commit | fc61c12241f5b06ea082aad676ad737295eb8d54 (patch) | |
tree | 2534a27a06a5b20856614660dfe0963ded059220 | |
parent | c3c56f45c252e09dae7e5b9b7309720d5ccc0bce (diff) | |
parent | 99ca820f1592fe8304bc55ed089c028414b9cdea (diff) | |
download | external_libcxx-fc61c12241f5b06ea082aad676ad737295eb8d54.tar.gz external_libcxx-fc61c12241f5b06ea082aad676ad737295eb8d54.tar.bz2 external_libcxx-fc61c12241f5b06ea082aad676ad737295eb8d54.zip |
Revert "Remove several unused forward declarations. Fixes PR22605."
am: 99ca820f15
* commit '99ca820f1592fe8304bc55ed089c028414b9cdea':
Revert "Remove several unused forward declarations. Fixes PR22605."
-rw-r--r-- | include/__hash_table | 2 | ||||
-rw-r--r-- | include/__tree | 8 | ||||
-rw-r--r-- | include/iterator | 4 |
3 files changed, 13 insertions, 1 deletions
diff --git a/include/__hash_table b/include/__hash_table index ec20e10fc..dac4cfddb 100644 --- a/include/__hash_table +++ b/include/__hash_table @@ -85,6 +85,8 @@ template <class _Tp, class _Hash, class _Equal, class _Alloc> class __hash_table template <class _ConstNodePtr> class _LIBCPP_TYPE_VIS_ONLY __hash_const_iterator; template <class _HashIterator> class _LIBCPP_TYPE_VIS_ONLY __hash_map_iterator; template <class _HashIterator> class _LIBCPP_TYPE_VIS_ONLY __hash_map_const_iterator; +template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc> + class _LIBCPP_TYPE_VIS_ONLY unordered_map; template <class _NodePtr> class _LIBCPP_TYPE_VIS_ONLY __hash_iterator diff --git a/include/__tree b/include/__tree index 3ad57943c..8030eeff5 100644 --- a/include/__tree +++ b/include/__tree @@ -28,6 +28,14 @@ template <class _Tp, class _NodePtr, class _DiffType> class _LIBCPP_TYPE_VIS_ONLY __tree_iterator; template <class _Tp, class _ConstNodePtr, class _DiffType> class _LIBCPP_TYPE_VIS_ONLY __tree_const_iterator; +template <class _Key, class _Tp, class _Compare, class _Allocator> + class _LIBCPP_TYPE_VIS_ONLY map; +template <class _Key, class _Tp, class _Compare, class _Allocator> + class _LIBCPP_TYPE_VIS_ONLY multimap; +template <class _Key, class _Compare, class _Allocator> + class _LIBCPP_TYPE_VIS_ONLY set; +template <class _Key, class _Compare, class _Allocator> + class _LIBCPP_TYPE_VIS_ONLY multiset; /* diff --git a/include/iterator b/include/iterator index c06ef8f67..9ac435151 100644 --- a/include/iterator +++ b/include/iterator @@ -1112,6 +1112,8 @@ typename enable_if >::type __unwrap_iter(__wrap_iter<_Tp*>); +template <class _Tp, class _Alloc> class _LIBCPP_TYPE_VIS_ONLY vector; + template <class _Iter> class __wrap_iter { @@ -1241,7 +1243,7 @@ private: template <class _Up> friend class __wrap_iter; template <class _CharT, class _Traits, class _Alloc> friend class basic_string; - template <class _Tp, class _Alloc> friend class _LIBCPP_TYPE_VIS_ONLY vector; + template <class _Tp, class _Alloc> friend class vector; template <class _Iter1, class _Iter2> friend |