From 12328a3a7e9c847303343b72d3302e84c1696a08 Mon Sep 17 00:00:00 2001 From: aholic Date: Thu, 28 Nov 2013 09:17:29 +0800 Subject: [PATCH] remove macro NO_CODING_LOG --- src/FullSegment.hpp | 8 -------- src/MixSegment.hpp | 1 + src/QuerySegment.hpp | 8 -------- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/FullSegment.hpp b/src/FullSegment.hpp index d67f2f3..5fc3604 100644 --- a/src/FullSegment.hpp +++ b/src/FullSegment.hpp @@ -24,13 +24,11 @@ namespace CppJieba public: bool init() { -#ifndef NO_CODING_LOG if(_getInitFlag()) { LogError("already inited before now."); return false; } -#endif if(!_trie.init()) { LogError("_trie.init failed."); @@ -47,12 +45,10 @@ namespace CppJieba } bool dispose() { -#ifndef NO_CODING_LOG if(!_getInitFlag()) { return true; } -#endif _trie.dispose(); _setInitFlag(false); return true; @@ -65,7 +61,6 @@ namespace CppJieba bool cut(Unicode::const_iterator begin, Unicode::const_iterator end, vector& res) const { assert(_getInitFlag()); -#ifndef NO_CODING_LOG //if (!_getInitFlag()) //{ // LogError("not inited."); @@ -76,7 +71,6 @@ namespace CppJieba LogError("begin >= end"); return false; } -#endif //resut of searching in trie tree vector > tRes; @@ -123,7 +117,6 @@ namespace CppJieba bool cut(Unicode::const_iterator begin, Unicode::const_iterator end, vector& res) const { -#ifndef NO_CODING_LOG if (!_getInitFlag()) { LogError("not inited."); @@ -134,7 +127,6 @@ namespace CppJieba LogError("begin > end"); return false; } -#endif vector uRes; if (!cut(begin, end, uRes)) { diff --git a/src/MixSegment.hpp b/src/MixSegment.hpp index 5f35031..272a57f 100644 --- a/src/MixSegment.hpp +++ b/src/MixSegment.hpp @@ -55,6 +55,7 @@ namespace CppJieba public: using SegmentBase::cut; public: + virtual bool cut(Unicode::const_iterator begin, Unicode::const_iterator end, vector& res)const { //if(!_getInitFlag()) diff --git a/src/QuerySegment.hpp b/src/QuerySegment.hpp index 4487339..de268c5 100644 --- a/src/QuerySegment.hpp +++ b/src/QuerySegment.hpp @@ -27,12 +27,10 @@ namespace CppJieba public: bool init() { -#ifndef NO_CODING_LOG if (_getInitFlag()) { LogError("inited."); } -#endif if (!_hmmSeg.init()) { LogError("_hmmSeg init"); @@ -47,12 +45,10 @@ namespace CppJieba } bool dispose() { -#ifndef NO_CODING_LOG if(!_getInitFlag()) { return true; } -#endif _fullSeg.dispose(); _hmmSeg.dispose(); _setInitFlag(false); @@ -66,7 +62,6 @@ namespace CppJieba bool cut(Unicode::const_iterator begin, Unicode::const_iterator end, vector& res) const { assert(_getInitFlag()); -#ifndef NO_CODING_LOG //if (!_getInitFlag()) //{ // LogError("not inited."); @@ -77,7 +72,6 @@ namespace CppJieba LogError("begin >= end"); return false; } -#endif //use hmm cut first vector hmmRes; if (!_hmmSeg.cut(begin, end, hmmRes)) @@ -113,7 +107,6 @@ namespace CppJieba bool cut(Unicode::const_iterator begin, Unicode::const_iterator end, vector& res) const { -#ifndef NO_CODING_LOG if (!_getInitFlag()) { LogError("not inited."); @@ -124,7 +117,6 @@ namespace CppJieba LogError("begin > end"); return false; } -#endif vector uRes; if (!cut(begin, end, uRes)) {