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

Merge pull request #15 from dlackty/fix-osx-compiling

Browse Source 
Fix OS X 10.9 compiling issues
This commit is contained in:
Yanyi Wu 2014-01-17 03:33:46 -08:00
commit 18c205f596
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Husky/ThreadManager.hpp
View File

@ -12,7 +12,7 @@ namespace Husky
class ThreadManager
{
private:
typedef int HANDLE;
typedef pthread_t HANDLE;
typedef void *(* PThreadFunc)(void* param);
public:
ThreadManager(){;}
@ -25,7 +25,7 @@ namespace Husky
_handles.clear();
}
HANDLE CreateThread( PThreadFunc pFunc,void *pPara)
int CreateThread( PThreadFunc pFunc,void *pPara)
{
pthread_t pt;
int nErrorCode = pthread_create(&pt,NULL,pFunc,pPara);

4
test/unittest/TKeywordExtractor.cpp
View File

@ -29,7 +29,7 @@ TEST(KeywordExtractorTest, Test2)
TEST(KeywordExtractorTest, Test3)
{
ifstream ifs("../test/testdata/weicheng.utf8");
ASSERT_TRUE(ifs);
ASSERT_TRUE(!!ifs);
string str((istreambuf_iterator<char>(ifs)), (istreambuf_iterator<char>()));
KeywordExtractor extractor("../dict/jieba.dict.utf8", "../dict/idf.utf8");
const char* res[] = {"小姐", "孙小姐", "方鸿渐", "自己", "没有"};
@ -42,7 +42,7 @@ TEST(KeywordExtractorTest, Test3)
TEST(KeywordExtractorTest, Test4)
{
ifstream ifs("../test/testdata/weicheng.utf8");
ASSERT_TRUE(ifs);
ASSERT_TRUE(!!ifs);
string str((istreambuf_iterator<char>(ifs)), (istreambuf_iterator<char>()));
KeywordExtractor extractor("../dict/jieba.dict.utf8", "../dict/idf.utf8");
//const char* res[] = {"小姐", "孙小姐", "方鸿渐", "自己", "没有"};

13
test/unittest/gtest-1.6.0/include/gtest/internal/gtest-port.h
View File

@ -496,7 +496,20 @@
# undef _TR1_FUNCTIONAL // Allows the user to #include
// <tr1/functional> if he chooses to.
# else
# if defined (__cplusplus) && __cplusplus > 199711L
# include <tuple>
namespace std {
namespace tr1 {
using std::tuple;
using std::tuple_element;
using std::get;
using std::tuple_size;
using std::make_tuple;
}
}
# else
# include <tr1/tuple> // NOLINT
# endif
# endif // !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302
# else