Parcourir la source

[3070] Fixed some compilation failures.

Marcin Siodelski il y a 10 ans
Parent
commit
f2e283951a

+ 5 - 2
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);

+ 4 - 2
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()) {

+ 0 - 3
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_;