diff options
| author |   Keisuke Kuroyanagi <ksk@google.com> | 2014-03-06 21:34:45 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-03-06 21:34:45 -0800 |
| commit | 3ee2196cfb7c49a974b5e3e1637f0d9b9b2c28c6 (patch) | |
| tree | c49b06b612cd4c61958d7b9e8a4e6d2d39d6fe40 /native/jni/src/defines.h | |
| parent | a2293ec906563b39d2613201e7b14301c6afb6d4 (diff) | |
| parent | 9c2f003d598e2519637007ef4d918022521bdecf (diff) | |
| download | latinime-3ee2196cfb7c49a974b5e3e1637f0d9b9b2c28c6.tar.gz latinime-3ee2196cfb7c49a974b5e3e1637f0d9b9b2c28c6.tar.xz latinime-3ee2196cfb7c49a974b5e3e1637f0d9b9b2c28c6.zip | |
am 9c2f003d: Merge "Revert "Revert "Use std::min() and std::max()"""
* commit '9c2f003d598e2519637007ef4d918022521bdecf':
Revert "Revert "Use std::min() and std::max()""
Diffstat (limited to 'native/jni/src/defines.h')
| -rw-r--r-- | native/jni/src/defines.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/native/jni/src/defines.h b/native/jni/src/defines.h index 0715fbd70..4c57af0ba 100644 --- a/native/jni/src/defines.h +++ b/native/jni/src/defines.h @@ -344,9 +344,6 @@ static inline void prof_out(void) { #define MAX_POINTER_COUNT 1 #define MAX_POINTER_COUNT_G 2 -template<typename T> AK_FORCE_INLINE const T &min(const T &a, const T &b) { return a < b ? a : b; } -template<typename T> AK_FORCE_INLINE const T &max(const T &a, const T &b) { return a > b ? a : b; } - // DEBUG #define INPUTLENGTH_FOR_DEBUG (-1) #define MIN_OUTPUT_INDEX_FOR_DEBUG (-1) |