From: Francis Dupont <fdupont@isc.org>
Date: Fri, 6 Oct 2017 22:40:50 +0000 (+0200)
Subject: [master] Cast mismatched enums
X-Git-Tag: trac5382_base~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=372c3a94c7bbd0cfd35f96bf7754610081e5c68f;p=thirdparty%2Fkea.git

[master] Cast mismatched enums
---

diff --git a/src/lib/dhcp/option_vendor.cc b/src/lib/dhcp/option_vendor.cc
index 7b0220c1c5..aa137f7b4c 100644
--- a/src/lib/dhcp/option_vendor.cc
+++ b/src/lib/dhcp/option_vendor.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2017 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,12 +14,18 @@
 using namespace isc::dhcp;
 
 OptionVendor::OptionVendor(Option::Universe u, const uint32_t vendor_id)
-    :Option(u, u==Option::V4?DHO_VIVSO_SUBOPTIONS:D6O_VENDOR_OPTS), vendor_id_(vendor_id) {
+    : Option(u, u == Option::V4 ?
+             static_cast<uint16_t>(DHO_VIVSO_SUBOPTIONS) :
+             static_cast<uint16_t>(D6O_VENDOR_OPTS)),
+      vendor_id_(vendor_id) {
 }
 
 OptionVendor::OptionVendor(Option::Universe u, OptionBufferConstIter begin,
                            OptionBufferConstIter end)
-    :Option(u, u==Option::V4?DHO_VIVSO_SUBOPTIONS:D6O_VENDOR_OPTS), vendor_id_(0) {
+    : Option(u, u == Option::V4?
+             static_cast<uint16_t>(DHO_VIVSO_SUBOPTIONS) :
+             static_cast<uint16_t>(D6O_VENDOR_OPTS)),
+      vendor_id_(0) {
     unpack(begin, end);
 }