[#2538] Addressed more comments

src/lib/dhcp/option.cc
    Removed dead line

src/lib/dhcpsrv/tests/host_reservation_parser_unittest.cc
    Removed unneeded include

diff --git a/src/lib/dhcp/option.cc b/src/lib/dhcp/option.cc
index b50df37601cc77a9c763b4730182cbfa820e0877..5b95dac699a6dafb0d575b2aab70485950dfe6a3 100644 (file)
--- a/src/lib/dhcp/option.cc
+++ b/src/lib/dhcp/option.cc
@@ -333,7 +333,6 @@ void Option::addOption(OptionPtr opt) {
         // Do not allow options to be added to themselves as this
         // can lead to infinite recursion.
         isc_throw(InvalidOperation, "option cannot be added to itself: " << toText());
-        // return;
     }
 
     options_.insert(make_pair(opt->getType(), opt));

diff --git a/src/lib/dhcpsrv/tests/host_reservation_parser_unittest.cc b/src/lib/dhcpsrv/tests/host_reservation_parser_unittest.cc
index b79a032bccc582c6ba24c2f1aa775807cc15f810..a7c1de49e0e90583b5e453ece21a80add27c5268 100644 (file)
--- a/src/lib/dhcpsrv/tests/host_reservation_parser_unittest.cc
+++ b/src/lib/dhcpsrv/tests/host_reservation_parser_unittest.cc
@@ -10,7 +10,6 @@
 #include <cc/data.h>
 #include <dhcp/duid.h>
 #include <dhcp/hwaddr.h>
-#include <dhcp/option_custom.h>
 #include <dhcp/option_int.h>
 #include <dhcp/option4_addrlst.h>
 #include <dhcp/option6_addrlst.h>