diff options
author | Jing Yu <jingyu@google.com> | 2011-01-30 22:18:29 -0800 |
---|---|---|
committer | Jing Yu <jingyu@google.com> | 2011-01-30 22:18:29 -0800 |
commit | 4a66e756636cb8364582ea503abd10d76f5b4aa3 (patch) | |
tree | 9660204ec085888a0601a6460c967b204a63d5f3 /gcc-4.4.3/libstdc++-v3/include/bits/stl_algo.h | |
parent | b6be42e837844cce5283f42fcfac31e6d66a277d (diff) | |
download | toolchain_gcc-4a66e756636cb8364582ea503abd10d76f5b4aa3.tar.gz toolchain_gcc-4a66e756636cb8364582ea503abd10d76f5b4aa3.tar.bz2 toolchain_gcc-4a66e756636cb8364582ea503abd10d76f5b4aa3.zip |
Upgrade gcc-4.4.3 for Android toolchain.
- Backport upstream patches to support arm hardfp.
- Backport gcc-4.5 patches to support -march=atom. Now it is
able to build atom toolchain with glibc from this branch
- Develop a bunch of optimizations
- Fix a few arm dejagnu failures
To-do list:
- Support Android/atom
- Fix ia32 bootstrap failure
Change-Id: I5e10dcd21620d4d8ca984d1d1707a76067e61691
Diffstat (limited to 'gcc-4.4.3/libstdc++-v3/include/bits/stl_algo.h')
-rw-r--r-- | gcc-4.4.3/libstdc++-v3/include/bits/stl_algo.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gcc-4.4.3/libstdc++-v3/include/bits/stl_algo.h b/gcc-4.4.3/libstdc++-v3/include/bits/stl_algo.h index f54b1cd77..d4b04d1da 100644 --- a/gcc-4.4.3/libstdc++-v3/include/bits/stl_algo.h +++ b/gcc-4.4.3/libstdc++-v3/include/bits/stl_algo.h @@ -74,13 +74,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std) #if __google_stl_debug_compare template<typename _Compare> struct _CheckedCompare { - // Mutable because some clients use non-const operator(). - mutable _Compare _M_compare; + _Compare _M_compare; _CheckedCompare(const _Compare & __comp): _M_compare(__comp) { } template <typename _Tp> - bool operator()(const _Tp& __x, const _Tp& __y) const { + bool operator()(const _Tp& __x, const _Tp& __y) { if (_M_compare(__x, __x)) __throw_runtime_error("strict weak ordering: (__x LT __x) != false"); if (_M_compare(__y, __y)) @@ -96,7 +95,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // indexterm/internal/numericterms.cc // fails without this. template <typename _Tp1, typename _Tp2> - bool operator()(const _Tp1& __x, const _Tp2& __y) const { + bool operator()(const _Tp1& __x, const _Tp2& __y) { return _M_compare(__x, __y); } }; |