From ae72c0eaeb57f42b97fa2d0a10a050837b3e17e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=96=9B=E6=98=8E=E6=B5=A9?= <xue_minghao@qq.com>
Date: Sun, 11 Mar 2018 11:24:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BC=96=E8=AF=91=E4=B8=8D?=
 =?UTF-8?q?=E8=BF=87=E7=9A=84=E4=B8=A4=E4=B8=AA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NIMKit/Sections/Session/Object/NIMSessionTableAdapter.m    | 3 ++-
 .../IfishYooseeHelper/IfishYooseeP2PCore/ShakeManager.m        | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Ifish/YunXinIM/NIMKit/NIMKit/Sections/Session/Object/NIMSessionTableAdapter.m b/Ifish/YunXinIM/NIMKit/NIMKit/Sections/Session/Object/NIMSessionTableAdapter.m
index 729f5b8..ca2d8fa 100755
--- a/Ifish/YunXinIM/NIMKit/NIMKit/Sections/Session/Object/NIMSessionTableAdapter.m
+++ b/Ifish/YunXinIM/NIMKit/NIMKit/Sections/Session/Object/NIMSessionTableAdapter.m
@@ -63,7 +63,8 @@
     }
     else if ([modelInArray isKindOfClass:[NIMTimestampModel class]])
     {
-        cellHeight = [modelInArray height];
+        NIMTimestampModel *model = (NIMTimestampModel *)modelInArray;
+        cellHeight = [model height];
     }
     else
     {
diff --git a/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/IfishYooseeP2PCore/ShakeManager.m b/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/IfishYooseeP2PCore/ShakeManager.m
index dbf4ea4..bc08526 100644
--- a/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/IfishYooseeP2PCore/ShakeManager.m
+++ b/Ifish/controllers/IfishYooseeFile/IfishYooseeHelper/IfishYooseeP2PCore/ShakeManager.m
@@ -22,6 +22,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <pthread.h>
+#include <sys/_select.h>
 
 @implementation ShakeManager