From 7d81f2a5941d4e5b7162b009499582eacbe818c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BF=98=E4=B8=8D=E5=A6=82=E4=B8=80=E5=8F=AA=E7=8C=AA?=
 =?UTF-8?q?=E5=A8=81=E6=AD=A6?= <liamxin@yeah.net>
Date: Thu, 22 Feb 2024 16:03:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt                       | 8 +++++---
 src/aspect/aspect.h                  | 2 +-
 src/{aspect => base}/non_copy_able.h | 0
 src/{ => base}/sync_queue.h          | 0
 src/{ => base}/thread_pool.h         | 0
 src/main.cpp                         | 6 +++---
 src/test/time_elapsed_aspect.h       | 2 +-
 src/{ => util}/stop_watch.h          | 0
 8 files changed, 10 insertions(+), 8 deletions(-)
 rename src/{aspect => base}/non_copy_able.h (100%)
 rename src/{ => base}/sync_queue.h (100%)
 rename src/{ => base}/thread_pool.h (100%)
 rename src/{ => util}/stop_watch.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 40bec28..a59ff02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,16 +21,18 @@ message(STATUS "message from cmake file！")
 add_executable(${PROJECT_NAME} src/main.cpp)
 
 aux_source_directory(src/aspect ASPECT_DIR)
+aux_source_directory(src/base BASE_DIR)
+aux_source_directory(src/util UTIL_DIR)
 aux_source_directory(src/test TEST_DIR)
 
 target_include_directories(${PROJECT_NAME} PRIVATE
-        sync_queue.h
-        stop_watch.h
-        thread_pool.h
+
 )
 
 target_sources(${PROJECT_NAME} PRIVATE
         ${ASPECT_DIR}
         ${TEST_DIR}
+        ${BASE_DIR}
+        ${UTIL_DIR}
 )
 
diff --git a/src/aspect/aspect.h b/src/aspect/aspect.h
index e8afe3d..0a70717 100644
--- a/src/aspect/aspect.h
+++ b/src/aspect/aspect.h
@@ -22,7 +22,7 @@ HAS_MEMBER(before)
 
 HAS_MEMBER(after)
 
-#include "non_copy_able.h"
+#include "../base/non_copy_able.h"
 
 template<typename Func, typename... Args>
 class Aspect : NonCopyAble {
diff --git a/src/aspect/non_copy_able.h b/src/base/non_copy_able.h
similarity index 100%
rename from src/aspect/non_copy_able.h
rename to src/base/non_copy_able.h
diff --git a/src/sync_queue.h b/src/base/sync_queue.h
similarity index 100%
rename from src/sync_queue.h
rename to src/base/sync_queue.h
diff --git a/src/thread_pool.h b/src/base/thread_pool.h
similarity index 100%
rename from src/thread_pool.h
rename to src/base/thread_pool.h
diff --git a/src/main.cpp b/src/main.cpp
index 909edef..c038eb8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -135,7 +135,7 @@ void func() {
     std::this_thread::sleep_for(std::chrono::seconds(2));
 }
 
-#include "sync_queue.h"
+#include "base/sync_queue.h"
 void sync_test(){
     // 同步队列
     auto queue = new SyncQueue<int>(3);
@@ -165,7 +165,7 @@ void sync_test(){
 
 #include <chrono>
 #include <iomanip>
-#include "stop_watch.h"
+#include "util/stop_watch.h"
 
 void chrono_test(){
 
@@ -197,7 +197,7 @@ void chrono_test(){
 
 }
 
-#include "thread_pool.h"
+#include "base/thread_pool.h"
 void thread_test(){
     ThreadPool pool(3,10);
 
diff --git a/src/test/time_elapsed_aspect.h b/src/test/time_elapsed_aspect.h
index 00ac87e..a5d89b1 100644
--- a/src/test/time_elapsed_aspect.h
+++ b/src/test/time_elapsed_aspect.h
@@ -3,7 +3,7 @@
 #define CPP_START_TIME_ELAPSED_ASPECT_H
 
 #include <iostream>
-#include "../stop_watch.h"
+#include "../util/stop_watch.h"
 
 class TimeElapsedAspect {
 private:
diff --git a/src/stop_watch.h b/src/util/stop_watch.h
similarity index 100%
rename from src/stop_watch.h
rename to src/util/stop_watch.h