summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2016-02-10 21:58:36 +0000
committerEric Fiselier <eric@efcs.ca>2016-02-10 21:58:36 +0000
commitd262b368d54b3e6deba47f345b7c8e8460b5f0a3 (patch)
treedb6b7b40208715c55fe1e41aed0ee13b4dd558ff
parente1164de5d0c9ae28a943d07eaf8e75f24bfb2d4a (diff)
downloadbcm5719-llvm-d262b368d54b3e6deba47f345b7c8e8460b5f0a3.tar.gz
bcm5719-llvm-d262b368d54b3e6deba47f345b7c8e8460b5f0a3.zip
Remove changes that snuck in within r260431
llvm-svn: 260443
-rw-r--r--libcxx/include/unordered_map9
1 files changed, 0 insertions, 9 deletions
diff --git a/libcxx/include/unordered_map b/libcxx/include/unordered_map
index a05c2b5ef85..89407b00f50 100644
--- a/libcxx/include/unordered_map
+++ b/libcxx/include/unordered_map
@@ -384,7 +384,6 @@ template <class _Key, class _Cp, class _Hash,
class __unordered_map_hasher
: private _Hash
{
- typedef typename __key_value_types<_Cp>::__map_value_type _PairT;
public:
_LIBCPP_INLINE_VISIBILITY
__unordered_map_hasher()
@@ -414,8 +413,6 @@ template <class _Key, class _Cp, class _Hash>
class __unordered_map_hasher<_Key, _Cp, _Hash, false>
{
_Hash __hash_;
-
- typedef typename __key_value_types<_Cp>::__map_value_type _PairT;
public:
_LIBCPP_INLINE_VISIBILITY
__unordered_map_hasher()
@@ -457,7 +454,6 @@ template <class _Key, class _Cp, class _Pred,
class __unordered_map_equal
: private _Pred
{
- typedef typename __key_value_types<_Cp>::__map_value_type _PairT;
public:
_LIBCPP_INLINE_VISIBILITY
__unordered_map_equal()
@@ -490,8 +486,6 @@ template <class _Key, class _Cp, class _Pred>
class __unordered_map_equal<_Key, _Cp, _Pred, false>
{
_Pred __pred_;
-
- typedef typename __key_value_types<_Cp>::__map_value_type _PairT;
public:
_LIBCPP_INLINE_VISIBILITY
__unordered_map_equal()
@@ -512,9 +506,6 @@ public:
_LIBCPP_INLINE_VISIBILITY
bool operator()(const _Key& __x, const _Cp& __y) const
{return __pred_(__x, __y.__cc.first);}
- _LIBCPP_INLINE_VISIBILITY
- bool operator()(const _Key& __x, const _PairT& __y) const
- {return __pred_(__x, __y.first);}
void swap(__unordered_map_equal&__y)
_NOEXCEPT_(__is_nothrow_swappable<_Pred>::value)
{
OpenPOWER on IntegriCloud