From cb6d4125cfa3ff7b1bd121ddc02c877ac84a4933 Mon Sep 17 00:00:00 2001 From: Nanako <469449812@qq.com> Date: Sat, 18 May 2024 00:52:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=A0=E4=B8=BA=E4=BF=AE=E5=A4=8D=E4=BA=86ma?= =?UTF-8?q?c=E5=B9=B3=E5=8F=B0=E7=9A=84=E7=BC=96=E8=AF=91=EF=BC=8C?= =?UTF-8?q?=E6=89=80=E4=BB=A5=E9=87=8D=E6=96=B0=E5=B0=86wxWidget=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=9B=9E=E5=AD=90=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- third_party/mempool/mempool/{unistd.h => my_unistd.h} | 0 third_party/mempool/mempool/ncx_slab.c | 2 +- third_party/spdlog | 2 +- third_party/taskflow | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename third_party/mempool/mempool/{unistd.h => my_unistd.h} (100%) diff --git a/third_party/mempool/mempool/unistd.h b/third_party/mempool/mempool/my_unistd.h similarity index 100% rename from third_party/mempool/mempool/unistd.h rename to third_party/mempool/mempool/my_unistd.h diff --git a/third_party/mempool/mempool/ncx_slab.c b/third_party/mempool/mempool/ncx_slab.c index 57dcc34..aabb711 100644 --- a/third_party/mempool/mempool/ncx_slab.c +++ b/third_party/mempool/mempool/ncx_slab.c @@ -1,5 +1,5 @@ #include "ncx_slab.h" -#include +#include #define NCX_SLAB_PAGE_MASK 3 #define NCX_SLAB_PAGE 0 diff --git a/third_party/spdlog b/third_party/spdlog index f0b96d2..ffa651d 160000 --- a/third_party/spdlog +++ b/third_party/spdlog @@ -1 +1 @@ -Subproject commit f0b96d2ad105bbcde2130851e7bb0c033d66ec2f +Subproject commit ffa651d39a568200efbc5cd8ac7ede78b553f412 diff --git a/third_party/taskflow b/third_party/taskflow index 1b6cf17..d8924e2 160000 --- a/third_party/taskflow +++ b/third_party/taskflow @@ -1 +1 @@ -Subproject commit 1b6cf17bb37741103a67cb3698066b6b80def2e0 +Subproject commit d8924e2c50fcfb3994a074ed56ff5539c727aaef