[3070] Fixed some compilation failures.

diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc
index 72e9abc20ff7f83baf9ef672bc1cb2e7f0f60f12..dbbc8588161caca774c78142e6e4d37648fae5aa 100644 (file)
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@ -2321,8 +2321,11 @@ Dhcpv6Srv::processSolicit(const Pkt6Ptr& solicit) {
     if (ctx.subnet_ && ctx.subnet_->getRapidCommit()) {
         OptionPtr opt_rapid_commit = solicit->getOption(D6O_RAPID_COMMIT);
         if (opt_rapid_commit) {
-            LOG_DEBUG(options_logger, DBG_DHCP6_DETAIL, DHCP6_RAPID_COMMIT)
-                .arg(solicit->getLabel());
+
+            /// @todo uncomment when #3807 is merged!
+/*            LOG_DEBUG(options_logger, DBG_DHCP6_DETAIL, DHCP6_RAPID_COMMIT)
+                .arg(solicit->getLabel()); */
+
             // If Rapid Commit has been sent by the client, change the
             // response type to Reply and include Rapid Commit option.
             response->setType(DHCPV6_REPLY);

diff --git a/src/lib/dhcpsrv/parsers/dhcp_parsers.cc b/src/lib/dhcpsrv/parsers/dhcp_parsers.cc
index f6b293e2f906567a0e3d918075bcab3241f1f826..e822eec753bbe4376885d64b7e391281f5afeff2 100644 (file)
--- a/src/lib/dhcpsrv/parsers/dhcp_parsers.cc
+++ b/src/lib/dhcpsrv/parsers/dhcp_parsers.cc
@@ -1030,8 +1030,10 @@ PoolParser::commit() {
 SubnetConfigParser::SubnetConfigParser(const std::string&,
                                        ParserContextPtr global_context,
                                        const isc::asiolink::IOAddress& default_addr)
-    : boolean_values_(new BooleanStorage()), uint32_values_(new Uint32Storage()),
-      string_values_(new StringStorage()), pools_(new PoolStorage()),
+    : uint32_values_(new Uint32Storage()),
+      string_values_(new StringStorage()),
+      boolean_values_(new BooleanStorage()),
+      pools_(new PoolStorage()),
       global_context_(global_context),
       relay_info_(new isc::dhcp::Subnet::RelayInfo(default_addr)),
       options_(new CfgOption()) {

diff --git a/src/lib/dhcpsrv/parsers/dhcp_parsers.h b/src/lib/dhcpsrv/parsers/dhcp_parsers.h
index fe55a099e6b062643d181d46bb4f3437af1a1fbe..efed05e61af3d6abac6820b8811fdb4fd92af7e3 100644 (file)
--- a/src/lib/dhcpsrv/parsers/dhcp_parsers.h
+++ b/src/lib/dhcpsrv/parsers/dhcp_parsers.h
@@ -1057,9 +1057,6 @@ private:
 
 protected:
 
-    /// Storage for subnet-specific boolean values.
-    BooleanStoragePtr boolean_values_;
-
     /// Storage for subnet-specific integer values.
     Uint32StoragePtr uint32_values_;