summaryrefslogtreecommitdiffstats
path: root/src/lookup
diff options
context:
space:
mode:
Diffstat (limited to 'src/lookup')
-rw-r--r--src/lookup/lookup.cpp4
-rw-r--r--src/lookup/pinyin_lookup.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/lookup/lookup.cpp b/src/lookup/lookup.cpp
index e0a91dc..e0ccce9 100644
--- a/src/lookup/lookup.cpp
+++ b/src/lookup/lookup.cpp
@@ -22,7 +22,7 @@
#include "phrase_index.h"
#include "lookup.h"
-using namespace pinyin;
+namespace pinyin{
bool convert_to_utf8(FacadePhraseIndex * phrase_index,
MatchResults match_results,
@@ -56,3 +56,5 @@ bool convert_to_utf8(FacadePhraseIndex * phrase_index,
}
return true;
}
+
+};
diff --git a/src/lookup/pinyin_lookup.h b/src/lookup/pinyin_lookup.h
index da70f24..47cc4a9 100644
--- a/src/lookup/pinyin_lookup.h
+++ b/src/lookup/pinyin_lookup.h
@@ -127,11 +127,10 @@ public:
bool train_result(PinyinKeyVector keys, CandidateConstraints constraints, MatchResults & results);
bool convert_to_utf8(MatchResults results,
- /* in */ const char * delimiter,
/* out */ char * & result_string)
{
return pinyin::convert_to_utf8(m_phrase_index, results,
- delimiter, result_string);
+ NULL, result_string);
}
/* user interactions */