From: JINMEI Tatuya Date: Sun, 1 Nov 2015 02:02:02 +0000 (+0900) Subject: [4111] constify X-Git-Tag: trac4097_base~4^2^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2f163c531a4b1d0c8f2ea2125c03c1eaad4e3ffb;p=thirdparty%2Fkea.git [4111] constify --- diff --git a/src/lib/dhcp/tests/option6_addrlst_unittest.cc b/src/lib/dhcp/tests/option6_addrlst_unittest.cc index 6e6d29c260..aa814a779e 100644 --- a/src/lib/dhcp/tests/option6_addrlst_unittest.cc +++ b/src/lib/dhcp/tests/option6_addrlst_unittest.cc @@ -255,7 +255,7 @@ TEST_F(Option6AddrLstTest, toText) { // Option6AddrLst. It assumes the option type is D6O_DHCPV4_O_DHCPV6_SERVER. void checkEmpty(Option6AddrLst& addrs) { - uint8_t expected[] = { + const uint8_t expected[] = { D6O_DHCPV4_O_DHCPV6_SERVER/256, D6O_DHCPV4_O_DHCPV6_SERVER%256, 0, 0 }; diff --git a/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc b/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc index a34d57aed1..97bb114492 100644 --- a/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc +++ b/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc @@ -825,7 +825,7 @@ TEST_F(ParseConfigTest, optionDataMinimalWithOptionDef) { // This test verifies an empty option data configuration is supported. TEST_F(ParseConfigTest, emptyOptionData) { // Configuration string. - std::string config = + const std::string config = "{ \"option-data\": [ {" " \"name\": \"dhcp4o6-server-addr\"" " } ]" @@ -833,7 +833,7 @@ TEST_F(ParseConfigTest, emptyOptionData) { int rcode = 0; ASSERT_NO_THROW(rcode = parseConfiguration(config)); - Option6AddrLstPtr opt = boost::dynamic_pointer_cast< + const Option6AddrLstPtr opt = boost::dynamic_pointer_cast< Option6AddrLst>(getOptionPtr("dhcp6", D6O_DHCPV4_O_DHCPV6_SERVER)); ASSERT_TRUE(opt); ASSERT_EQ(0, opt->getAddresses().size());