From ad8ee0872802ba5d0194458bf215a6cc89f4d0d0 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期一, 15 四月 2019 15:30:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq

---
 QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h b/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h
index da4bb96..0667bbf 100644
--- a/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h
+++ b/QiaoJiaSystem/FaceSearchServer/FaceDBCompareServer.h
@@ -44,6 +44,7 @@
     RWLock m_rwLock;
     std::mutex topResultMtx;
     std::map<std::thread::id, FaceResults> topResult;
+    RWLock m_dbRWLocks_Lock;
     std::map<std::thread::id, RWLock> m_dbRWLocks;
 
     ErlangTool::ErlangDbTool *m_erlangDbTool;

--
Gitblit v1.8.0