diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-02-05 17:38:30 -0800 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-02-05 17:38:30 -0800 |
| commit | a27cb623901d79be1007b0803898086a12ce731b (patch) | |
| tree | d75deaf2899b9f112ab56a63b7d04b8e941e7272 /native/src/defines.h | |
| parent | 3f8fc4de9ae8720a16458198d268dcf7423c1e51 (diff) | |
| parent | 09baa36f7d1298e54a291b0d486cf366a3c3257c (diff) | |
| download | latinime-a27cb623901d79be1007b0803898086a12ce731b.tar.gz latinime-a27cb623901d79be1007b0803898086a12ce731b.tar.xz latinime-a27cb623901d79be1007b0803898086a12ce731b.zip | |
Merge "Use C++ template for min/max"
Diffstat (limited to 'native/src/defines.h')
| -rw-r--r-- | native/src/defines.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/native/src/defines.h b/native/src/defines.h index 1e108cb17..5b5c54850 100644 --- a/native/src/defines.h +++ b/native/src/defines.h @@ -241,8 +241,8 @@ static void prof_out(void) { #define MIN_USER_TYPED_LENGTH_FOR_MULTIPLE_WORD_SUGGESTION 3 #define MIN_USER_TYPED_LENGTH_FOR_EXCESSIVE_CHARACTER_SUGGESTION 3 -#define min(a,b) ((a)<(b)?(a):(b)) -#define max(a,b) ((a)>(b)?(a):(b)) +template<typename T> inline T min(T a, T b) { return a < b ? a : b; } +template<typename T> inline T max(T a, T b) { return a > b ? a : b; } // The ratio of neutral area radius to sweet spot radius. #define NEUTRAL_AREA_RADIUS_RATIO 1.3f |