third_codes/cppjieba
1
0
Fork 0
mirror of https://github.com/yanyiwu/cppjieba.git synced 2025-07-18 00:00:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove some warning of compiler

Browse Source
This commit is contained in:
wyy 2013-12-24 19:33:56 -08:00
parent 229fcd715f
commit 14aa9168d3
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -3,7 +3,7 @@ PROJECT(CPPJIEBA)
CMAKE_MINIMUM_REQUIRED (VERSION 2.8) CMAKE_MINIMUM_REQUIRED (VERSION 2.8)
SET(CMAKE_INSTALL_PREFIX /usr) SET(CMAKE_INSTALL_PREFIX /usr)
ADD_DEFINITIONS(-std=c++0x -O3) ADD_DEFINITIONS(-std=c++0x -O3 -Wall)
IF (DEFINED ENC) IF (DEFINED ENC)
ADD_DEFINITIONS(-DCPPJIEBA_${ENC}) ADD_DEFINITIONS(-DCPPJIEBA_${ENC})
ENDIF() ENDIF()

2
src/FullSegment.hpp
View File

@ -71,7 +71,7 @@ namespace CppJieba
for (vector<pair<uint, const TrieNodeInfo*> >::const_iterator itr = tRes.begin(); itr != tRes.end(); itr++) for (vector<pair<uint, const TrieNodeInfo*> >::const_iterator itr = tRes.begin(); itr != tRes.end(); itr++)
{ {
wordLen = itr->second->word.size(); wordLen = itr->second->word.size();
if (wordLen >= 2 || tRes.size() == 1 && maxIdx <= uIdx) if (wordLen >= 2 || (tRes.size() == 1 && maxIdx <= uIdx))
{ {
res.push_back(itr->second->word); res.push_back(itr->second->word);
} }

10
src/Limonp/md5.hpp
View File

@ -34,7 +34,7 @@
namespace Limonp namespace Limonp
{ {
#pragma region MD5 defines //#pragma region MD5 defines
// Constants for MD5Transform routine. // Constants for MD5Transform routine.
#define S11 7 #define S11 7
#define S12 12 #define S12 12
@ -85,7 +85,7 @@ namespace Limonp
(a) = ROTATE_LEFT ((a), (s)); \ (a) = ROTATE_LEFT ((a), (s)); \
(a) += (b); \ (a) += (b); \
} }
#pragma endregion //#pragma endregion
typedef unsigned char BYTE ; typedef unsigned char BYTE ;
@ -115,7 +115,7 @@ private:
unsigned char buffer[64]; /* input buffer */ unsigned char buffer[64]; /* input buffer */
} context ; } context ;
#pragma region static helper functions //#pragma region static helper functions
// The core of the MD5 algorithm is here. // The core of the MD5 algorithm is here.
// MD5 basic transformation. Transforms state based on block. // MD5 basic transformation. Transforms state based on block.
static void MD5Transform( UINT4 state[4], unsigned char block[64] ) static void MD5Transform( UINT4 state[4], unsigned char block[64] )
@ -229,7 +229,7 @@ private:
output[i] = ((UINT4)input[j]) | (((UINT4)input[j+1]) << 8) | output[i] = ((UINT4)input[j]) | (((UINT4)input[j+1]) << 8) |
(((UINT4)input[j+2]) << 16) | (((UINT4)input[j+3]) << 24); (((UINT4)input[j+2]) << 16) | (((UINT4)input[j+3]) << 24);
} }
#pragma endregion //#pragma endregion
public: public:
@ -354,7 +354,7 @@ public:
} }
else else
{ {
while( len = fread( buffer, 1, 1024, file ) ) while( (len = fread( buffer, 1, 1024, file )) )
Update( buffer, len ) ; Update( buffer, len ) ;
Final(); Final();