From af7fedd3ef3bfbe1f4061c27b7f0febebbcae1c0 Mon Sep 17 00:00:00 2001
From: Richard Lee <dlackty@gmail.com>
Date: Fri, 17 Jan 2014 19:11:39 +0800
Subject: [PATCH] Fix OS X 10.9 compiling issues

---
 src/Husky/ThreadManager.hpp                         |  4 ++--
 test/unittest/TKeywordExtractor.cpp                 |  4 ++--
 .../gtest-1.6.0/include/gtest/internal/gtest-port.h | 13 +++++++++++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/Husky/ThreadManager.hpp b/src/Husky/ThreadManager.hpp
index 147b23c..e9bf5f7 100644
--- a/src/Husky/ThreadManager.hpp
+++ b/src/Husky/ThreadManager.hpp
@@ -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);
diff --git a/test/unittest/TKeywordExtractor.cpp b/test/unittest/TKeywordExtractor.cpp
index 1ba3c31..2709227 100644
--- a/test/unittest/TKeywordExtractor.cpp
+++ b/test/unittest/TKeywordExtractor.cpp
@@ -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[] = {"小姐", "孙小姐", "方鸿渐", "自己", "没有"};
diff --git a/test/unittest/gtest-1.6.0/include/gtest/internal/gtest-port.h b/test/unittest/gtest-1.6.0/include/gtest/internal/gtest-port.h
index 157b47f..f38222d 100644
--- a/test/unittest/gtest-1.6.0/include/gtest/internal/gtest-port.h
+++ b/test/unittest/gtest-1.6.0/include/gtest/internal/gtest-port.h
@@ -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