summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeng Wu <alexepico@gmail.com>2011-08-24 09:37:34 +0800
committerPeng Wu <alexepico@gmail.com>2011-08-24 09:37:34 +0800
commit51b8bf1f01b64cb8c22dd25e9ac636b80ba8cd18 (patch)
tree3dcadcd0826f0dd48e1c0238435e0efff7b6063f
parent0056e6c14abf84cbbcb41c0a70049d321a7ef4f4 (diff)
downloadlibpinyin-51b8bf1f01b64cb8c22dd25e9ac636b80ba8cd18.zip
libpinyin-51b8bf1f01b64cb8c22dd25e9ac636b80ba8cd18.tar.gz
libpinyin-51b8bf1f01b64cb8c22dd25e9ac636b80ba8cd18.tar.xz
fixes compile with c++0x
-rw-r--r--src/lookup/phrase_lookup.cpp4
-rw-r--r--src/lookup/phrase_lookup.h4
-rw-r--r--src/lookup/pinyin_lookup.cpp4
-rw-r--r--src/lookup/pinyin_lookup.h4
4 files changed, 8 insertions, 8 deletions
diff --git a/src/lookup/phrase_lookup.cpp b/src/lookup/phrase_lookup.cpp
index e1c4604..c69f587 100644
--- a/src/lookup/phrase_lookup.cpp
+++ b/src/lookup/phrase_lookup.cpp
@@ -29,8 +29,8 @@
using namespace pinyin;
-const gfloat PhraseLookup::bigram_lambda;
-const gfloat PhraseLookup::unigram_lambda;
+const gfloat PhraseLookup::bigram_lambda = LAMBDA_PARAMETER;
+const gfloat PhraseLookup::unigram_lambda = 1 - LAMBDA_PARAMETER;
PhraseLookup::PhraseLookup(PhraseLargeTable * phrase_table,
FacadePhraseIndex * phrase_index,
diff --git a/src/lookup/phrase_lookup.h b/src/lookup/phrase_lookup.h
index 495e44e..55f50a4 100644
--- a/src/lookup/phrase_lookup.h
+++ b/src/lookup/phrase_lookup.h
@@ -33,8 +33,8 @@ namespace pinyin{
class PhraseLookup{
private:
- static const gfloat bigram_lambda = LAMBDA_PARAMETER;
- static const gfloat unigram_lambda = 1 - LAMBDA_PARAMETER;
+ static const gfloat bigram_lambda;
+ static const gfloat unigram_lambda;
PhraseItem m_cache_phrase_item;
protected:
diff --git a/src/lookup/pinyin_lookup.cpp b/src/lookup/pinyin_lookup.cpp
index 7b8e623..b543321 100644
--- a/src/lookup/pinyin_lookup.cpp
+++ b/src/lookup/pinyin_lookup.cpp
@@ -34,8 +34,8 @@
using namespace pinyin;
-const gfloat PinyinLookup::bigram_lambda;
-const gfloat PinyinLookup::unigram_lambda;
+const gfloat PinyinLookup::bigram_lambda = LAMBDA_PARAMETER;
+const gfloat PinyinLookup::unigram_lambda = 1 - LAMBDA_PARAMETER;
PinyinLookup::PinyinLookup(PinyinCustomSettings * custom,
PinyinLargeTable * pinyin_table,
diff --git a/src/lookup/pinyin_lookup.h b/src/lookup/pinyin_lookup.h
index b8f2e58..a6f89e6 100644
--- a/src/lookup/pinyin_lookup.h
+++ b/src/lookup/pinyin_lookup.h
@@ -78,8 +78,8 @@ public:
class PinyinLookup{
private:
- static const gfloat bigram_lambda = LAMBDA_PARAMETER;
- static const gfloat unigram_lambda = 1 - LAMBDA_PARAMETER;
+ static const gfloat bigram_lambda;
+ static const gfloat unigram_lambda;
PhraseItem m_cache_phrase_item;
protected: