From 0a762a217fe499b7b63d55ed4b46dde1afd49f28 Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期一, 15 四月 2019 16:57:06 +0800
Subject: [PATCH] .3nsq: Auto stash before merge of "1.3nsq" and "origin/1.3nsq"

---
 QiaoJiaSystem/GB28181DecoderModel/GlobalSignalWaitLock.hpp |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/QiaoJiaSystem/GB28181DecoderModel/GlobalSignalWaitLock.hpp b/QiaoJiaSystem/GB28181DecoderModel/GlobalSignalWaitLock.hpp
index 83b1365..de41b0c 100644
--- a/QiaoJiaSystem/GB28181DecoderModel/GlobalSignalWaitLock.hpp
+++ b/QiaoJiaSystem/GB28181DecoderModel/GlobalSignalWaitLock.hpp
@@ -6,6 +6,7 @@
 #define GB28181SDK_GLOBALSIGNALWAITLOCK_H
 
 #include <iostream>
+#include <Debug.h>
 #include <basic/util/thread/RWLock.hpp>
 
 //#define TryCath(CODE)     try { \

--
Gitblit v1.8.0