From b6d44bb02a394bbee49586e19e90e99cc16a30c1 Mon Sep 17 00:00:00 2001 From: EmelyanenkoK Date: Thu, 15 Dec 2022 17:12:29 +0300 Subject: [PATCH] Revert "fix include paths parsing under Windows (#541)" (#557) This reverts commit 4d09d04a42673d1aa913dfef6285ab87e6990f20. --- crypto/block/create-state.cpp | 12 ++---------- crypto/fift/fift-main.cpp | 12 ++---------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/crypto/block/create-state.cpp b/crypto/block/create-state.cpp index dc975315..7a734c3a 100644 --- a/crypto/block/create-state.cpp +++ b/crypto/block/create-state.cpp @@ -810,22 +810,14 @@ void usage(const char* progname) { std::exit(2); } -constexpr char include_path_separator = -#if _WIN32 - ';' -#else - ':' -#endif // - ; - void parse_include_path_set(std::string include_path_set, std::vector& res) { td::Parser parser(include_path_set); while (!parser.empty()) { - auto path = parser.read_till_nofail(include_path_separator); + auto path = parser.read_till_nofail(':'); if (!path.empty()) { res.push_back(path.str()); } - parser.skip_nofail(include_path_separator); + parser.skip_nofail(':'); } } diff --git a/crypto/fift/fift-main.cpp b/crypto/fift/fift-main.cpp index 79719cdf..ef833f43 100644 --- a/crypto/fift/fift-main.cpp +++ b/crypto/fift/fift-main.cpp @@ -72,22 +72,14 @@ void usage(const char* progname) { std::exit(2); } -constexpr char include_path_separator = -#if _WIN32 - ';' -#else - ':' -#endif // - ; - void parse_include_path_set(std::string include_path_set, std::vector& res) { td::Parser parser(include_path_set); while (!parser.empty()) { - auto path = parser.read_till_nofail(include_path_separator); + auto path = parser.read_till_nofail(':'); if (!path.empty()) { res.push_back(path.str()); } - parser.skip_nofail(include_path_separator); + parser.skip_nofail(':'); } }