nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am a27cb623: Merge "Use C++ template for min/max" 

* commit 'a27cb623901d79be1007b0803898086a12ce731b':
  Use C++ template for min/max
main
Tadashi G. Takaoka 2012-02-05 17:40:00 -08:00 committed by Android Git Automerger
parent e725e08374 a27cb62390
commit ed348a4846
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
native/src/correction.cpp
View File

@ -24,6 +24,7 @@
#include "char_utils.h"
#include "correction.h"
#include "defines.h"
#include "dictionary.h"
#include "proximity_info.h"

4
native/src/defines.h
View File

@ -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

4
native/src/words_priority_queue.h
View File

@ -17,6 +17,7 @@
#ifndef LATINIME_WORDS_PRIORITY_QUEUE_H
#define LATINIME_WORDS_PRIORITY_QUEUE_H
#include <cstring> // for memcpy()
#include <iostream>
#include <queue>
#include "defines.h"
@ -93,7 +94,8 @@ class WordsPriorityQueue {
int outputSuggestions(int *frequencies, unsigned short *outputChars) {
mHighestSuggestedWord = 0;
const unsigned int size = min(MAX_WORDS, mSuggestions.size());
const unsigned int size = min(
MAX_WORDS, static_cast<unsigned int>(mSuggestions.size()));
int index = size - 1;
while (!mSuggestions.empty() && index >= 0) {
SuggestedWord* sw = mSuggestions.top();