diff --git a/support/3rd_party/include/utils/file.hpp b/support/3rd_party/include/utils/file.hpp index 20a982c2..1d059125 100644 --- a/support/3rd_party/include/utils/file.hpp +++ b/support/3rd_party/include/utils/file.hpp @@ -116,7 +116,7 @@ private: [[nodiscard]] auto is_file(std::wstring_view path) -> bool; #if defined(PROJECT_ENABLE_JSON) -#if defined(PROJECT_ENABLE_LIBSODIUM) +#if defined(PROJECT_ENABLE_LIBSODIUM) && defined(PROJECT_ENABLE_BOOST) [[nodiscard]] auto read_json_file(std::string_view path, nlohmann::json &data, std::optional password = std::nullopt) -> bool; @@ -132,7 +132,7 @@ read_json_file(std::string_view path, nlohmann::json &data, [[nodiscard]] auto write_json_file( std::wstring_view path, const nlohmann::json &data, std::optional password = std::nullopt) -> bool; -#else // !defined(PROJECT_ENABLE_LIBSODIUM) +#else // !defined(PROJECT_ENABLE_LIBSODIUM) && defined(PROJECT_ENABLE_BOOST) [[nodiscard]] auto read_json_file(std::string_view path, nlohmann::json &data) -> bool; @@ -144,7 +144,7 @@ read_json_file(std::string_view path, nlohmann::json &data, [[nodiscard]] auto write_json_file(std::wstring_view path, const nlohmann::json &data) -> bool; -#endif // defined(PROJECT_ENABLE_LIBSODIUM) +#endif // defined(PROJECT_ENABLE_LIBSODIUM) && defined(PROJECT_ENABLE_BOOST) #endif // defined(PROJECT_ENABLE_JSON) } // namespace repertory::utils::file diff --git a/support/3rd_party/src/utils/file.cpp b/support/3rd_party/src/utils/file.cpp index 1dc73d9f..c8e5902c 100644 --- a/support/3rd_party/src/utils/file.cpp +++ b/support/3rd_party/src/utils/file.cpp @@ -242,12 +242,12 @@ auto is_file(std::wstring_view path) -> bool { } #if defined(PROJECT_ENABLE_JSON) -#if defined(PROJECT_ENABLE_LIBSODIUM) +#if defined(PROJECT_ENABLE_LIBSODIUM) && defined(PROJECT_ENABLE_BOOST) auto read_json_file(std::string_view path, nlohmann::json &data, std::optional password) -> bool { -#else // !defined(PROJECT_ENABLE_LIBSODIUM) +#else // !defined(PROJECT_ENABLE_LIBSODIUM) && defined(PROJECT_ENABLE_BOOST) auto read_json_file(std::string_view path, nlohmann::json &data) -> bool { -#endif // defined(PROJECT_ENABLE_LIBSODIUM) +#endif // defined(PROJECT_ENABLE_LIBSODIUM) && defined(PROJECT_ENABLE_BOOST) static constexpr const std::string_view function_name{ static_cast(__FUNCTION__), }; @@ -272,13 +272,13 @@ auto read_json_file(std::string_view path, nlohmann::json &data) -> bool { stream << file_stream.rdbuf(); auto json_text = stream.str(); -#if defined(PROJECT_ENABLE_LIBSODIUM) +#if defined(PROJECT_ENABLE_LIBSODIUM) && defined(PROJECT_ENABLE_BOOST) if (password.has_value()) { auto decrypted_data = utils::encryption::decrypt_data(json_text, *password); json_text = {decrypted_data.begin(), decrypted_data.end()}; } -#endif // defined(PROJECT_ENABLE_LIBSODIUM) +#endif // defined(PROJECT_ENABLE_LIBSODIUM) && defined(PROJECT_ENABLE_BOOST) if (not json_text.empty()) { data = nlohmann::json::parse(json_text.c_str()); } @@ -301,13 +301,13 @@ auto read_json_file(std::string_view path, nlohmann::json &data) -> bool { return false; } -#if defined(PROJECT_ENABLE_LIBSODIUM) +#if defined(PROJECT_ENABLE_LIBSODIUM) && defined(PROJECT_ENABLE_BOOST) auto write_json_file(std::string_view path, const nlohmann::json &data, std::optional password) -> bool { -#else // !defined(PROJECT_ENABLE_LIBSODIUM) +#else // !defined(PROJECT_ENABLE_LIBSODIUM) && defined(PROJECT_ENABLE_BOOST) auto write_json_file(std::string_view path, const nlohmann::json &data) -> bool { -#endif // defined(PROJECT_ENABLE_LIBSODIUM) +#endif // defined(PROJECT_ENABLE_LIBSODIUM) && defined(PROJECT_ENABLE_BOOST) static constexpr const std::string_view function_name{ static_cast(__FUNCTION__), }; @@ -319,7 +319,7 @@ auto write_json_file(std::string_view path, file.get_error_code().message()); } -#if defined(PROJECT_ENABLE_LIBSODIUM) +#if defined(PROJECT_ENABLE_LIBSODIUM) && defined(PROJECT_ENABLE_BOOST) if (password.has_value()) { return file.write(utils::encryption::encrypt_data(data.dump(), *password), 0U); @@ -336,7 +336,7 @@ auto write_json_file(std::string_view path, return false; } -#if defined(PROJECT_ENABLE_LIBSODIUM) +#if defined(PROJECT_ENABLE_LIBSODIUM) && defined(PROJECT_ENABLE_BOOST) auto read_json_file(std::wstring_view path, nlohmann::json &data, std::optional password) -> bool { if (password.has_value()) { @@ -356,7 +356,7 @@ auto write_json_file(std::wstring_view path, const nlohmann::json &data, return write_json_file(utils::string::to_utf8(path), data, std::nullopt); } -#else // !defined(PROJECT_ENABLE_LIBSODIUM) +#else // !defined(PROJECT_ENABLE_LIBSODIUM) && defined(PROJECT_ENABLE_BOOST) auto read_json_file(std::wstring_view path, nlohmann::json &data) -> bool { return read_json_file(utils::string::to_utf8(path), data); } @@ -365,6 +365,6 @@ auto write_json_file(std::wstring_view path, const nlohmann::json &data) -> bool { return write_json_file(utils::string::to_utf8(path), data); } -#endif // defined(PROJECT_ENABLE_LIBSODIUM) +#endif // defined(PROJECT_ENABLE_LIBSODIUM) && defined(PROJECT_ENABLE_BOOST) #endif // defined(PROJECT_ENABLE_JSON) } // namespace repertory::utils::file