From a879dc48cb78639f5ce4a4f89da274b350473636 Mon Sep 17 00:00:00 2001
From: MYH <2395591599@qq.com>
Date: 星期二, 05 十一月 2024 15:10:29 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025
---
Server/王琨元/code/ConnectionPool.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git "a/Server/\347\216\213\347\220\250\345\205\203/code/ConnectionPool.h" "b/Server/\347\216\213\347\220\250\345\205\203/code/ConnectionPool.h"
index fe89205..bce6a07 100644
--- "a/Server/\347\216\213\347\220\250\345\205\203/code/ConnectionPool.h"
+++ "b/Server/\347\216\213\347\220\250\345\205\203/code/ConnectionPool.h"
@@ -3,11 +3,11 @@
#include <queue>
#include <mutex>
#include <condition_variable>
-#include <json/json.h>
+//#include <json/json.h>
#include "MysqlConn.h"
-using namespace Json;
+//using namespace Json;
class ConnectionPool
{
--
Gitblit v1.8.0