From 23bd97eaa5626ad96ca3f5d3e97e93d14705ca6d Mon Sep 17 00:00:00 2001 From: chenshijun <csj_sky@126.com> Date: 星期六, 30 三月 2019 17:50:24 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/yangwu1.3' into 1.3nsq --- QiaoJiaSystem/GB28181DecoderModel/SpinLock.hpp | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/QiaoJiaSystem/GB28181DecoderModel/SpinLock.hpp b/QiaoJiaSystem/GB28181DecoderModel/SpinLock.hpp index e6e74f8..7737af6 100644 --- a/QiaoJiaSystem/GB28181DecoderModel/SpinLock.hpp +++ b/QiaoJiaSystem/GB28181DecoderModel/SpinLock.hpp @@ -6,7 +6,9 @@ #define GB28181SDK_SPINLOCK_H #include <atomic> - +/*** + * 鑷棆閿侊紝鍙兘浼氭湁娌¢攣涓婄殑bug + */ class SpinLock { public: SpinLock() : m_lock(ATOMIC_FLAG_INIT) {} -- Gitblit v1.8.0