From 49de8971b167d3eeb3fe9f6027fa94af83838fe7 Mon Sep 17 00:00:00 2001 From: Marcin Siodelski Date: Thu, 26 Nov 2015 15:11:18 +0100 Subject: [PATCH] [3874] Fixed compilation issues in DUIDFactory class. --- src/lib/dhcp/duid_factory.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/lib/dhcp/duid_factory.cc b/src/lib/dhcp/duid_factory.cc index 21f6267e35..104ccaee2b 100644 --- a/src/lib/dhcp/duid_factory.cc +++ b/src/lib/dhcp/duid_factory.cc @@ -106,7 +106,8 @@ DUIDFactory::createLLT(const uint16_t htype, const uint32_t time_in, } else if (htype_out == 0) { // If link layer type unspecified and link layer adddress // is specified, use current type or HTYPE_ETHER. - htype_out = (htype_current != 0) ? htype_current : HTYPE_ETHER; + htype_out = ((htype_current != 0) ? htype_current : + static_cast(HTYPE_ETHER)); } @@ -230,7 +231,8 @@ DUIDFactory::createLL(const uint16_t htype, } else if (htype_out == 0) { // If link layer type unspecified and link layer adddress // is specified, use current type or HTYPE_ETHER. - htype_out = (htype_current != 0) ? htype_current : HTYPE_ETHER; + htype_out = ((htype_current != 0) ? htype_current : + static_cast(HTYPE_ETHER)); } @@ -394,7 +396,7 @@ DUIDFactory::readFromFile() { // If we have read anything from the file, let's try to use it to // create a DUID. - if (duid_str.tellp() != 0) { + if (duid_str.tellp() != std::streampos(0)) { try { duid_.reset(new DUID(DUID::fromText(duid_str.str()))); -- 2.47.2