Fix some MSVC warnings

mabraham · May 3, 2024 · e123362 · e123362
1 parent 0c5c98a
commit e123362
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -485,15 +485,15 @@ 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()));
     }
     else
     {
         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()));
     }