This is an automated email from the ASF dual-hosted git repository. fgerlits pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit a1ded9709bbf7e11920998d91ef4111ab8b91e7b Author: Marton Szasz <[email protected]> AuthorDate: Thu Oct 7 17:01:42 2021 +0200 MINIFICPP-1662 fix gsl include gsl-lite recommends that libraries use it through the ::gsl_lite namespace, possibly by a namespace alias in their own namespace. source and rationale: https://github.com/gsl-lite/gsl-lite#using-gsl-lite-in-libraries utils/gsl.h introduces such namespace alias: ::org::apache::nifi::minifi::gsl -> ::gsl_lite We should try to use this header and alias instead of the gsl headers and namespaces directly. Unfortunately we have no automated checks for this in place. Signed-off-by: Ferenc Gerlits <[email protected]> This closes #1197 --- encrypt-config/tests/ConfigFileTests.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/encrypt-config/tests/ConfigFileTests.cpp b/encrypt-config/tests/ConfigFileTests.cpp index be1a146..d962b90 100644 --- a/encrypt-config/tests/ConfigFileTests.cpp +++ b/encrypt-config/tests/ConfigFileTests.cpp @@ -21,7 +21,7 @@ #include "ConfigFile.h" -#include "gsl/gsl-lite.hpp" +#include "utils/gsl.h" #include "TestBase.h" #include "utils/file/FileUtils.h" @@ -185,7 +185,7 @@ TEST_CASE("ConfigFile can write to a new file", "[encrypt-config][writeTo]") { TestController test_controller; std::string temp_dir = test_controller.createTempDirectory(); - auto remove_directory = gsl::finally([&temp_dir]() { utils::file::delete_dir(temp_dir); }); + auto remove_directory = minifi::gsl::finally([&temp_dir]() { utils::file::delete_dir(temp_dir); }); std::string file_path = utils::file::concat_path(temp_dir, "minifi.properties"); test_file.writeTo(file_path);
