Commit 49de8971 authored by Marcin Siodelski's avatar Marcin Siodelski
Browse files

[3874] Fixed compilation issues in DUIDFactory class.

parent aab4794b
...@@ -106,7 +106,8 @@ DUIDFactory::createLLT(const uint16_t htype, const uint32_t time_in, ...@@ -106,7 +106,8 @@ DUIDFactory::createLLT(const uint16_t htype, const uint32_t time_in,
} else if (htype_out == 0) { } else if (htype_out == 0) {
// If link layer type unspecified and link layer adddress // If link layer type unspecified and link layer adddress
// is specified, use current type or HTYPE_ETHER. // 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<uint16_t>(HTYPE_ETHER));
} }
...@@ -230,7 +231,8 @@ DUIDFactory::createLL(const uint16_t htype, ...@@ -230,7 +231,8 @@ DUIDFactory::createLL(const uint16_t htype,
} else if (htype_out == 0) { } else if (htype_out == 0) {
// If link layer type unspecified and link layer adddress // If link layer type unspecified and link layer adddress
// is specified, use current type or HTYPE_ETHER. // 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<uint16_t>(HTYPE_ETHER));
} }
...@@ -394,7 +396,7 @@ DUIDFactory::readFromFile() { ...@@ -394,7 +396,7 @@ DUIDFactory::readFromFile() {
// If we have read anything from the file, let's try to use it to // If we have read anything from the file, let's try to use it to
// create a DUID. // create a DUID.
if (duid_str.tellp() != 0) { if (duid_str.tellp() != std::streampos(0)) {
try { try {
duid_.reset(new DUID(DUID::fromText(duid_str.str()))); duid_.reset(new DUID(DUID::fromText(duid_str.str())));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment