From a68a83582a6e4c05d36d3801c776dfe81e64fc47 Mon Sep 17 00:00:00 2001 From: Vladislav Nepogodin Date: Tue, 8 Mar 2022 16:29:52 +0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A7=20remove=20simdjson=20atm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 6 +++--- meson.build | 2 +- src/misc.cpp | 2 +- src/utils.cpp | 4 ++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cfffa5b..e0d3cf4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -134,9 +134,9 @@ enable_sanitizers(project_options) include_directories(${CMAKE_SOURCE_DIR}/src) -target_link_libraries(${PROJECT_NAME} PRIVATE project_warnings project_options spdlog::spdlog fmt::fmt ftxui::screen ftxui::dom ftxui::component simdjson::simdjson cpr::cpr) -target_link_libraries(test-exec-interactive PRIVATE project_warnings project_options spdlog::spdlog fmt::fmt ftxui::component simdjson::simdjson cpr::cpr) -target_link_libraries(test-process-tailing PRIVATE project_warnings project_options spdlog::spdlog fmt::fmt ftxui::component simdjson::simdjson cpr::cpr) +target_link_libraries(${PROJECT_NAME} PRIVATE project_warnings project_options spdlog::spdlog fmt::fmt ftxui::screen ftxui::dom ftxui::component cpr::cpr)#simdjson::simdjson) +target_link_libraries(test-exec-interactive PRIVATE project_warnings project_options spdlog::spdlog fmt::fmt ftxui::component cpr::cpr)#simdjson::simdjson) +target_link_libraries(test-process-tailing PRIVATE project_warnings project_options spdlog::spdlog fmt::fmt ftxui::component cpr::cpr)#simdjson::simdjson) if(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang") target_link_libraries(${PROJECT_NAME} PRIVATE range-v3::range-v3) diff --git a/meson.build b/meson.build index 3df22ce..e291737 100644 --- a/meson.build +++ b/meson.build @@ -120,7 +120,7 @@ endif add_project_arguments(cc.get_supported_arguments(possible_cc_flags), language : 'cpp') -deps = [fmt, spdlog, ftxui, simdjson, cpr] +deps = [fmt, spdlog, ftxui, cpr] if cc.get_id() == 'clang' ranges = dependency('range-v3', version : ['>=0.11.0']) deps += [ranges] diff --git a/src/misc.cpp b/src/misc.cpp index 4f08348..51d6042 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -19,7 +19,7 @@ namespace fs = std::filesystem; namespace tui { -// Revised to deal with partion sizes now being displayed to the user +// Revised to deal with partition sizes now being displayed to the user bool confirm_mount([[maybe_unused]] const std::string_view& part_user) { #ifdef NDEVENV const auto& ret_status = utils::exec(fmt::format(FMT_COMPILE("mount | grep {}"), part_user), true); diff --git a/src/utils.cpp b/src/utils.cpp index 1d56db2..aea44db 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -47,6 +47,7 @@ namespace ranges = std::ranges; #include #endif +/* #if defined(__clang__) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wsign-conversion" @@ -64,6 +65,7 @@ namespace ranges = std::ranges; #elif defined(__GNUC__) #pragma GCC diagnostic pop #endif +*/ namespace fs = std::filesystem; @@ -724,6 +726,7 @@ vm.vfs_cache_pressure = 50 } void parse_config() noexcept { + /* using namespace simdjson; ondemand::parser parser; @@ -735,6 +738,7 @@ void parse_config() noexcept { entry.get(step); // spdlog::debug(step); } + */ } void setup_luks_keyfile() noexcept {