gcc9 fixes

BlackZork · Jun 2, 2024 · 1e0684e · 1e0684e
1 parent 8ebc104
commit 1e0684e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/libmodmqttsrv/modmqtt.cpp b/libmodmqttsrv/modmqtt.cpp
@@ -709,7 +709,7 @@ ModMqtt::initObjects(const YAML::Node& config, const ModMqtt::ModbusInitData& mo
         ConfigTools::readOptionalValue<std::vector<std::pair<int, int>>>(slaves, objdata, "slave");
         // default undefined slave - register address must contain slave id
         if (slaves.size() == 0)
-            slaves.push_back(std::pair(-1, -1));
+            slaves.push_back(std::pair<int,int>(-1, -1));
 
         for(const std::string& defaultNetwork: networks) {
 

diff --git a/unittests/yaml_converters_tests.cpp b/unittests/yaml_converters_tests.cpp
@@ -35,13 +35,13 @@ TEST_CASE ("number list string should") {
     SECTION("be parsed as single number") {
         YAML::Node node = YAML::Load("4");
         pairs lst = node.as<pairs>();
-        REQUIRE(lst[0] == std::pair(4,4));
+        REQUIRE(lst[0] == std::pair<int,int>(4,4));
     }
 
     SECTION("be parsed as single number with spaces ignored") {
         YAML::Node node = YAML::Load(" 4");
         pairs lst = node.as<pairs>();
-        REQUIRE(lst[0] == std::pair(4,4));
+        REQUIRE(lst[0] == std::pair<int,int>(4,4));
     }
 
     SECTION("fail if value is not a number") {
@@ -58,23 +58,23 @@ TEST_CASE ("number list string should") {
     SECTION("be parsed as list of number separated by comma") {
         YAML::Node node = YAML::Load("4,5");
         pairs lst = node.as<pairs>();
-        REQUIRE(lst[0] == std::pair(4,4));
-        REQUIRE(lst[1] == std::pair(5,5));
+        REQUIRE(lst[0] == std::pair<int,int>(4,4));
+        REQUIRE(lst[1] == std::pair<int,int>(5,5));
     }
 
     SECTION("be parsed as list of number ranges separated by comma") {
         YAML::Node node = YAML::Load("4-6,5-18");
         pairs lst = node.as<pairs>();
-        REQUIRE(lst[0] == std::pair(4,6));
-        REQUIRE(lst[1] == std::pair(5,18));
+        REQUIRE(lst[0] == std::pair<int,int>(4,6));
+        REQUIRE(lst[1] == std::pair<int,int>(5,18));
     }
 
     SECTION("should ignore spaces") {
         YAML::Node node = YAML::Load(" 4, 5-18, 7");
         pairs lst = node.as<pairs>();
-        REQUIRE(lst[0] == std::pair(4,4));
-        REQUIRE(lst[1] == std::pair(5,18));
-        REQUIRE(lst[2] == std::pair(7,7));
+        REQUIRE(lst[0] == std::pair<int,int>(4,4));
+        REQUIRE(lst[1] == std::pair<int,int>(5,18));
+        REQUIRE(lst[2] == std::pair<int,int>(7,7));
     }
 
 }