From: Marcin Siodelski Date: Fri, 26 Aug 2016 17:45:20 +0000 (+0200) Subject: [master] Fixed build failure showing up on Redhat linux. X-Git-Tag: trac4636_base~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=665f87a7cfd41dea26e21beff2b6ae85c3ad9271;p=thirdparty%2Fkea.git [master] Fixed build failure showing up on Redhat linux. Use std::equal instead of EXPECT_EQ on vectors. --- diff --git a/src/bin/dhcp4/tests/classify_unittest.cc b/src/bin/dhcp4/tests/classify_unittest.cc index c3862f3090..aaed262f83 100644 --- a/src/bin/dhcp4/tests/classify_unittest.cc +++ b/src/bin/dhcp4/tests/classify_unittest.cc @@ -10,6 +10,7 @@ #include #include #include +#include #include using namespace isc; @@ -142,13 +143,15 @@ public: ASSERT_GE(max_sname, exp_sname.length()); vector sname(max_sname, 0); memcpy(&sname[0], &exp_sname[0], exp_sname.size()); - EXPECT_EQ(sname, resp->getSname()); + EXPECT_TRUE(std::equal(sname.begin(), sname.end(), + resp->getSname().begin())); const size_t max_filename = Pkt4::MAX_FILE_LEN; ASSERT_GE(max_filename, exp_filename.length()); vector filename(max_filename, 0); memcpy(&filename[0], &exp_filename[0], exp_filename.size()); - EXPECT_EQ(filename, resp->getFile()); + EXPECT_TRUE(std::equal(filename.begin(), filename.end(), + resp->getFile().begin())); } /// @brief Interface Manager's fake configuration control.