mirror of
https://github.com/llvm-mirror/libcxx.git
synced 2025-10-25 04:56:13 +08:00
Remove changes that snuck in within r260431
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@260443 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -384,7 +384,6 @@ template <class _Key, class _Cp, class _Hash,
|
|||||||
class __unordered_map_hasher
|
class __unordered_map_hasher
|
||||||
: private _Hash
|
: private _Hash
|
||||||
{
|
{
|
||||||
typedef typename __key_value_types<_Cp>::__map_value_type _PairT;
|
|
||||||
public:
|
public:
|
||||||
_LIBCPP_INLINE_VISIBILITY
|
_LIBCPP_INLINE_VISIBILITY
|
||||||
__unordered_map_hasher()
|
__unordered_map_hasher()
|
||||||
@@ -414,8 +413,6 @@ template <class _Key, class _Cp, class _Hash>
|
|||||||
class __unordered_map_hasher<_Key, _Cp, _Hash, false>
|
class __unordered_map_hasher<_Key, _Cp, _Hash, false>
|
||||||
{
|
{
|
||||||
_Hash __hash_;
|
_Hash __hash_;
|
||||||
|
|
||||||
typedef typename __key_value_types<_Cp>::__map_value_type _PairT;
|
|
||||||
public:
|
public:
|
||||||
_LIBCPP_INLINE_VISIBILITY
|
_LIBCPP_INLINE_VISIBILITY
|
||||||
__unordered_map_hasher()
|
__unordered_map_hasher()
|
||||||
@@ -457,7 +454,6 @@ template <class _Key, class _Cp, class _Pred,
|
|||||||
class __unordered_map_equal
|
class __unordered_map_equal
|
||||||
: private _Pred
|
: private _Pred
|
||||||
{
|
{
|
||||||
typedef typename __key_value_types<_Cp>::__map_value_type _PairT;
|
|
||||||
public:
|
public:
|
||||||
_LIBCPP_INLINE_VISIBILITY
|
_LIBCPP_INLINE_VISIBILITY
|
||||||
__unordered_map_equal()
|
__unordered_map_equal()
|
||||||
@@ -490,8 +486,6 @@ template <class _Key, class _Cp, class _Pred>
|
|||||||
class __unordered_map_equal<_Key, _Cp, _Pred, false>
|
class __unordered_map_equal<_Key, _Cp, _Pred, false>
|
||||||
{
|
{
|
||||||
_Pred __pred_;
|
_Pred __pred_;
|
||||||
|
|
||||||
typedef typename __key_value_types<_Cp>::__map_value_type _PairT;
|
|
||||||
public:
|
public:
|
||||||
_LIBCPP_INLINE_VISIBILITY
|
_LIBCPP_INLINE_VISIBILITY
|
||||||
__unordered_map_equal()
|
__unordered_map_equal()
|
||||||
@@ -512,9 +506,6 @@ public:
|
|||||||
_LIBCPP_INLINE_VISIBILITY
|
_LIBCPP_INLINE_VISIBILITY
|
||||||
bool operator()(const _Key& __x, const _Cp& __y) const
|
bool operator()(const _Key& __x, const _Cp& __y) const
|
||||||
{return __pred_(__x, __y.__cc.first);}
|
{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)
|
void swap(__unordered_map_equal&__y)
|
||||||
_NOEXCEPT_(__is_nothrow_swappable<_Pred>::value)
|
_NOEXCEPT_(__is_nothrow_swappable<_Pred>::value)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user