9aa1d5ac5e
2000-10-24 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/stl_pair.h (make_pair): Add LWG solution.
* testsuite/21_strings/compare.cc (test01): Inject namespace std
into the mix.
* mkcheck.in (MAX_MEM_USAGE): Bump up to 3072. Strangely enough,
this works.
From-SVN: r37049
107 lines
3.1 KiB
C++
107 lines
3.1 KiB
C++
/*
|
|
*
|
|
* Copyright (c) 1994
|
|
* Hewlett-Packard Company
|
|
*
|
|
* Permission to use, copy, modify, distribute and sell this software
|
|
* and its documentation for any purpose is hereby granted without fee,
|
|
* provided that the above copyright notice appear in all copies and
|
|
* that both that copyright notice and this permission notice appear
|
|
* in supporting documentation. Hewlett-Packard Company makes no
|
|
* representations about the suitability of this software for any
|
|
* purpose. It is provided "as is" without express or implied warranty.
|
|
*
|
|
*
|
|
* Copyright (c) 1996,1997
|
|
* Silicon Graphics Computer Systems, Inc.
|
|
*
|
|
* Permission to use, copy, modify, distribute and sell this software
|
|
* and its documentation for any purpose is hereby granted without fee,
|
|
* provided that the above copyright notice appear in all copies and
|
|
* that both that copyright notice and this permission notice appear
|
|
* in supporting documentation. Silicon Graphics makes no
|
|
* representations about the suitability of this software for any
|
|
* purpose. It is provided "as is" without express or implied warranty.
|
|
*/
|
|
|
|
/* NOTE: This is an internal header file, included by other STL headers.
|
|
* You should not attempt to use it directly.
|
|
*/
|
|
|
|
#ifndef __SGI_STL_INTERNAL_PAIR_H
|
|
#define __SGI_STL_INTERNAL_PAIR_H
|
|
|
|
__STL_BEGIN_NAMESPACE
|
|
|
|
template <class _T1, class _T2>
|
|
struct pair {
|
|
typedef _T1 first_type;
|
|
typedef _T2 second_type;
|
|
|
|
_T1 first;
|
|
_T2 second;
|
|
pair() : first(_T1()), second(_T2()) {}
|
|
pair(const _T1& __a, const _T2& __b) : first(__a), second(__b) {}
|
|
|
|
#ifdef __STL_MEMBER_TEMPLATES
|
|
template <class _U1, class _U2>
|
|
pair(const pair<_U1, _U2>& __p) : first(__p.first), second(__p.second) {}
|
|
#endif
|
|
};
|
|
|
|
template <class _T1, class _T2>
|
|
inline bool operator==(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
|
|
{
|
|
return __x.first == __y.first && __x.second == __y.second;
|
|
}
|
|
|
|
template <class _T1, class _T2>
|
|
inline bool operator<(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
|
|
{
|
|
return __x.first < __y.first ||
|
|
(!(__y.first < __x.first) && __x.second < __y.second);
|
|
}
|
|
|
|
#ifdef __STL_FUNCTION_TMPL_PARTIAL_ORDER
|
|
|
|
template <class _T1, class _T2>
|
|
inline bool operator!=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) {
|
|
return !(__x == __y);
|
|
}
|
|
|
|
template <class _T1, class _T2>
|
|
inline bool operator>(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) {
|
|
return __y < __x;
|
|
}
|
|
|
|
template <class _T1, class _T2>
|
|
inline bool operator<=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) {
|
|
return !(__y < __x);
|
|
}
|
|
|
|
template <class _T1, class _T2>
|
|
inline bool operator>=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) {
|
|
return !(__x < __y);
|
|
}
|
|
|
|
#endif /* __STL_FUNCTION_TMPL_PARTIAL_ORDER */
|
|
|
|
template <class _T1, class _T2>
|
|
#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
|
|
//181. make_pair() unintended behavior
|
|
inline pair<_T1, _T2> make_pair(const _T1 __x, const _T2 __y)
|
|
#else
|
|
inline pair<_T1, _T2> make_pair(const _T1& __x, const _T2& __y)
|
|
#endif
|
|
{
|
|
return pair<_T1, _T2>(__x, __y);
|
|
}
|
|
|
|
__STL_END_NAMESPACE
|
|
|
|
#endif /* __SGI_STL_INTERNAL_PAIR_H */
|
|
|
|
// Local Variables:
|
|
// mode:C++
|
|
// End:
|