diff --git a/CMakeLists.txt b/CMakeLists.txt index 05c133a..4e97f33 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ if(NOT CMAKE_BUILD_TYPE) endif() -include_directories(inc) +include_directories(.) add_executable(logger src/main.cpp) diff --git a/inc/Logger.h b/const_fmt/Logger.h similarity index 97% rename from inc/Logger.h rename to const_fmt/Logger.h index bd06c88..f7a43d5 100644 --- a/inc/Logger.h +++ b/const_fmt/Logger.h @@ -6,7 +6,7 @@ #include #include -#include +#include "format.h" /* diff --git a/inc/format.h b/const_fmt/format.h similarity index 100% rename from inc/format.h rename to const_fmt/format.h diff --git a/inc/format_impl.h b/const_fmt/format_impl.h similarity index 100% rename from inc/format_impl.h rename to const_fmt/format_impl.h diff --git a/inc/parse.h b/const_fmt/parse.h similarity index 100% rename from inc/parse.h rename to const_fmt/parse.h diff --git a/inc/types.h b/const_fmt/types.h similarity index 100% rename from inc/types.h rename to const_fmt/types.h diff --git a/inc/utility.h b/const_fmt/utility.h similarity index 100% rename from inc/utility.h rename to const_fmt/utility.h diff --git a/src/main.cpp b/src/main.cpp index 75f277d..fc44384 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,6 +1,4 @@ -//#include - -#include +#include int main(int argc, char* argv[]) { @@ -12,4 +10,4 @@ int main(int argc, char* argv[]) { // return formatted[6]; return 0; -} \ No newline at end of file +} diff --git a/test/src/format.cpp b/test/src/format.cpp index 1d479c7..bf875db 100644 --- a/test/src/format.cpp +++ b/test/src/format.cpp @@ -1,4 +1,4 @@ -#include +#include #include @@ -62,4 +62,4 @@ TEST(Format, negative_int) { //TEST(Format, string) { // // TODO // EXPECT_EQ(true, false); -//} \ No newline at end of file +//} diff --git a/test/src/parse.cpp b/test/src/parse.cpp index 7c61055..eb42a95 100644 --- a/test/src/parse.cpp +++ b/test/src/parse.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace detail; @@ -93,4 +93,4 @@ TEST(Parse, ast_chars_and_nodes) { ' ', ' ', '-'}; EXPECT_EQ(parse_string<"{:06.3}ab d{:8s}{:.4} -">().value, control); -} \ No newline at end of file +} diff --git a/test/src/utility.cpp b/test/src/utility.cpp index dc8798a..0480b21 100644 --- a/test/src/utility.cpp +++ b/test/src/utility.cpp @@ -1,4 +1,4 @@ -#include +#include #include TEST(Utility, const_pow) {