From 878dd746db7eabae732d604bc6c9b7ee4dfaa444 Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Thu, 9 Dec 2021 13:55:53 -0500
Subject: [PATCH] reduce warnings and improve portability

---
 unittest/c-library/test_library_commands.cpp | 5 +++--
 unittest/c-library/test_library_mpi.cpp      | 1 -
 unittest/commands/test_groups.cpp            | 2 +-
 unittest/commands/test_variables.cpp         | 2 +-
 unittest/cplusplus/test_input_class.cpp      | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/unittest/c-library/test_library_commands.cpp b/unittest/c-library/test_library_commands.cpp
index b16dc6e9dd..203862c696 100644
--- a/unittest/c-library/test_library_commands.cpp
+++ b/unittest/c-library/test_library_commands.cpp
@@ -2,6 +2,7 @@
 
 #include "lammps.h"
 #include "library.h"
+#include "platform.h"
 #include <string>
 
 #include "gmock/gmock.h"
@@ -76,8 +77,8 @@ TEST_F(LibraryCommands, from_file)
     if (!verbose) ::testing::internal::GetCapturedStdout();
     EXPECT_EQ(lammps_get_natoms(lmp), 2);
 
-    unlink(demo_file);
-    unlink(cont_file);
+    LAMMPS_NS::platform::unlink(demo_file);
+    LAMMPS_NS::platform::unlink(cont_file);
 };
 
 TEST_F(LibraryCommands, from_line)
diff --git a/unittest/c-library/test_library_mpi.cpp b/unittest/c-library/test_library_mpi.cpp
index 6fdec7b7e4..1609107ae0 100644
--- a/unittest/c-library/test_library_mpi.cpp
+++ b/unittest/c-library/test_library_mpi.cpp
@@ -167,7 +167,6 @@ TEST(MPI, split_comm)
 
 TEST(MPI, multi_partition)
 {
-    FILE *fp;
     int nprocs, me;
     lammps_mpi_init();
     MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
diff --git a/unittest/commands/test_groups.cpp b/unittest/commands/test_groups.cpp
index 52b93fe742..9d69b5412e 100644
--- a/unittest/commands/test_groups.cpp
+++ b/unittest/commands/test_groups.cpp
@@ -204,7 +204,7 @@ TEST_F(GroupTest, SelectRestart)
     command("write_restart group.restart");
     command("clear");
     command("read_restart group.restart");
-    unlink("group.restart");
+    platform::unlink("group.restart");
     END_HIDE_OUTPUT();
     group = lmp->group;
     ASSERT_EQ(group->count(group->find("one")), 16);
diff --git a/unittest/commands/test_variables.cpp b/unittest/commands/test_variables.cpp
index 86d880f22c..fb0aa58069 100644
--- a/unittest/commands/test_variables.cpp
+++ b/unittest/commands/test_variables.cpp
@@ -317,7 +317,7 @@ TEST_F(VariableTest, Expressions)
     ASSERT_TRUE(variable->equalstyle(ivar));
     ASSERT_DOUBLE_EQ(variable->compute_equal(ivar), 2.0);
     ASSERT_DOUBLE_EQ(variable->compute_equal("v_three"), 3.0);
-    ASSERT_FLOAT_EQ(variable->compute_equal("v_four"), MY_PI);
+    ASSERT_NEAR(variable->compute_equal("v_four"), MY_PI,1.0e-14);
     ASSERT_GE(variable->compute_equal("v_five"), 20210310);
     ASSERT_DOUBLE_EQ(variable->compute_equal("v_seven"), -1);
     ASSERT_DOUBLE_EQ(variable->compute_equal("v_eight"), 2.5);
diff --git a/unittest/cplusplus/test_input_class.cpp b/unittest/cplusplus/test_input_class.cpp
index 87bea36081..b1d8af28c6 100644
--- a/unittest/cplusplus/test_input_class.cpp
+++ b/unittest/cplusplus/test_input_class.cpp
@@ -77,8 +77,8 @@ TEST_F(Input_commands, from_file)
     lmp->input->file(cont_file);
     EXPECT_EQ(lmp->atom->natoms, 2);
 
-    unlink(demo_file);
-    unlink(cont_file);
+    platform::unlink(demo_file);
+    platform::unlink(cont_file);
 };
 
 TEST_F(Input_commands, from_line)