From 56e411a5d22cf3201db9c93dce65f4a694afa0d5 Mon Sep 17 00:00:00 2001 From: gong <3218757026@qq.com> Date: 星期六, 02 十一月 2024 10:37:44 +0800 Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025 --- Server/马丽萍/code/log/block_queue.h | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git "a/Server/\351\251\254\344\270\275\350\220\215/code/log/block_queue.h" "b/Server/\351\251\254\344\270\275\350\220\215/code/log/block_queue.h" index 34c77bd..4791989 100644 --- "a/Server/\351\251\254\344\270\275\350\220\215/code/log/block_queue.h" +++ "b/Server/\351\251\254\344\270\275\350\220\215/code/log/block_queue.h" @@ -8,9 +8,12 @@ #include <iostream> #include <stdlib.h> -#include <pthread.h> -#include <sys/time.h> -#include "../lock/locker.h" +#include <thread> // 鏇挎崲 pthread.h + +#include <chrono> +#include <ctime> + +#include "locker.h" using namespace std; template <class T> -- Gitblit v1.8.0