diff options
| author | Willem Jan Palenstijn | 2013-04-18 23:34:29 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:39:44 +0200 |
| commit | 01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6 (patch) | |
| tree | 544b07f3aa41abe7907bcd2040cdad11ebc324bb /common/algorithm.h | |
| parent | 9cf2c83e5e5a35816ab153bf8443dac691829ea8 (diff) | |
| parent | a41d72a44a660c72fdadbc3a8ef580e5e03cb890 (diff) | |
| download | scummvm-rg350-01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6.tar.gz scummvm-rg350-01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6.tar.bz2 scummvm-rg350-01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6.zip | |
Merge branch 'master'
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 - |