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 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(3); @@ -165,7 +165,7 @@ void sync_test(){ #include #include -#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 -#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