From e1233622fd952247ec715b9be9c0365c371ee8b6 Mon Sep 17 00:00:00 2001 From: Mark Abraham Date: Fri, 3 May 2024 12:26:14 +0200 Subject: [PATCH] Fix some MSVC warnings --- src/gromacs/selection/selectioncollection.cpp | 3 ++- src/gromacs/utility/binaryinformation.cpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gromacs/selection/selectioncollection.cpp b/src/gromacs/selection/selectioncollection.cpp index e3c712b0fc0..42150813cbb 100644 --- a/src/gromacs/selection/selectioncollection.cpp +++ b/src/gromacs/selection/selectioncollection.cpp @@ -780,7 +780,8 @@ SelectionList SelectionCollection::parseFromFile(const std::filesystem::path& fi } catch (GromacsException& ex) { - ex.prependContext(formatString("Error in parsing selections from file '%s'", filename.c_str())); + ex.prependContext(formatString("Error in parsing selections from file '%s'", + filename.u8string().c_str())); throw; } } diff --git a/src/gromacs/utility/binaryinformation.cpp b/src/gromacs/utility/binaryinformation.cpp index 311ff071363..5ff15186611 100644 --- a/src/gromacs/utility/binaryinformation.cpp +++ b/src/gromacs/utility/binaryinformation.cpp @@ -485,7 +485,7 @@ void gmx_print_version_info(gmx::TextWriter* writer) // Describe the BLAS and LAPACK libraries. We generally don't know // much about what external library was detected, but we do in the // case of MKL so then it is reported. - if (HAVE_LIBMKL && std::strstr(GMX_DESCRIBE_BLAS, "MKL") != nullptr) + if ((HAVE_LIBMKL) && std::strstr(GMX_DESCRIBE_BLAS, "MKL") != nullptr) { writer->writeLine(formatString("BLAS library: %s", describeMkl().c_str())); } @@ -493,7 +493,7 @@ void gmx_print_version_info(gmx::TextWriter* writer) { writer->writeLine(formatString("BLAS library: %s", GMX_DESCRIBE_BLAS)); } - if (HAVE_LIBMKL && std::strstr(GMX_DESCRIBE_LAPACK, "MKL") != nullptr) + if ((HAVE_LIBMKL) && std::strstr(GMX_DESCRIBE_LAPACK, "MKL") != nullptr) { writer->writeLine(formatString("LAPACK library: %s", describeMkl().c_str())); }