diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2014-03-06 18:42:19 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-03-06 18:42:19 -0800 |
| commit | b4a7d95d95e8fa5f54bee065801e6793a2c16b32 (patch) | |
| tree | 4bcee3fa018bd5096c272ee5def8fc9caadb1ae7 /native/jni/src/defines.h | |
| parent | 73105cc0791ea40c416bde899c2779d02ac4ec8c (diff) | |
| parent | ce2ac1c835e9794dde41fe14e4e953177c8333cc (diff) | |
| download | latinime-b4a7d95d95e8fa5f54bee065801e6793a2c16b32.tar.gz latinime-b4a7d95d95e8fa5f54bee065801e6793a2c16b32.tar.xz latinime-b4a7d95d95e8fa5f54bee065801e6793a2c16b32.zip | |
am ce2ac1c8: Merge "Revert "Use std::min() and std::max()""
* commit 'ce2ac1c835e9794dde41fe14e4e953177c8333cc':
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, 3 insertions, 0 deletions
diff --git a/native/jni/src/defines.h b/native/jni/src/defines.h index 4c57af0ba..0715fbd70 100644 --- a/native/jni/src/defines.h +++ b/native/jni/src/defines.h @@ -344,6 +344,9 @@ 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) |