diff options
| author | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
| commit | 4a69dc13d92e82fff85dc5a3a923b74ced259ffa (patch) | |
| tree | 8945cd3745fd65f28b043caf7b1beddbbce2b2a1 /common/algorithm.h | |
| parent | ad293b249e74dd1cfbdbd721d02145efbdaf9eca (diff) | |
| parent | 5e174cbfe466dbbe8e5470b0a00de1481b986181 (diff) | |
| download | scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.gz scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.bz2 scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'common/algorithm.h')
| -rw-r--r-- | common/algorithm.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/common/algorithm.h b/common/algorithm.h index 00c0e1c98f..e7ccef4840 100644 --- a/common/algorithm.h +++ b/common/algorithm.h @@ -226,12 +226,12 @@ void sort(T first, T last, StrictWeakOrdering comp) { */ template<typename T> void sort(T *first, T *last) { - sort(first, last, Common::Less<T>()); + sort(first, last, Less<T>()); } template<class T> void sort(T first, T last) { - sort(first, last, Common::Less<typename T::ValueType>()); + sort(first, last, Less<typename T::ValueType>()); } // MSVC is complaining about the minus operator being applied to an unsigned type @@ -269,4 +269,3 @@ T gcd(T a, T b) { } // End of namespace Common #endif - |