From 80f9d2ea4c551468d1d358eba93edec384b3a3e8 Mon Sep 17 00:00:00 2001 From: wyy Date: Sat, 4 Jan 2014 17:48:13 +0800 Subject: [PATCH] add DEFINE MIN MACRO --- src/KeywordExtractor.hpp | 3 ++- test/unittest/TSegmentBase.cpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/KeywordExtractor.hpp b/src/KeywordExtractor.hpp index 240ced8..92c9d76 100644 --- a/src/KeywordExtractor.hpp +++ b/src/KeywordExtractor.hpp @@ -3,6 +3,7 @@ #include "MPSegment.hpp" #include +#define MIN(X,Y) ((X) < (Y) ? (X) : (Y)) namespace CppJieba { @@ -109,7 +110,7 @@ namespace CppJieba } } - keywords.resize(min(topN, wordmap.size())); + keywords.resize(MIN(topN, wordmap.size())); partial_sort_copy(wordmap.begin(), wordmap.end(), keywords.begin(), keywords.end(), _cmp); return true; } diff --git a/test/unittest/TSegmentBase.cpp b/test/unittest/TSegmentBase.cpp index 9fd6cf7..5b00bee 100644 --- a/test/unittest/TSegmentBase.cpp +++ b/test/unittest/TSegmentBase.cpp @@ -16,9 +16,9 @@ TEST(SegmentBaseTest, Test1) uint offset = 0; while(offset < size) { - uint len; + uint len = 0; const char* t = str + offset; - int ret = SegmentBase::filterAscii(t, size - offset, len); + SegmentBase::filterAscii(t, size - offset, len); s.assign(t, len); res.push_back(s); //cout<