From: Marcin Siodelski <marcin@isc.org>
Date: Fri, 13 Mar 2015 14:08:33 +0000 (+0100)
Subject: [master] Merge branch 'trac3688'
X-Git-Tag: trac3764_base~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5c50e2aff64da05b439da8d5fa4913fc8a704ca;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3688'

Conflicts:
	src/bin/dhcp4/dhcp4_srv.h
---

b5c50e2aff64da05b439da8d5fa4913fc8a704ca
diff --cc src/bin/dhcp4/dhcp4_srv.h
index 6623aae572,f0b9e4da7c..86e171e447
--- a/src/bin/dhcp4/dhcp4_srv.h
+++ b/src/bin/dhcp4/dhcp4_srv.h
@@@ -676,11 -755,14 +755,6 @@@ private
      /// @return Option that contains netmask information
      static OptionPtr getNetmaskOption(const Subnet4Ptr& subnet);
  
-     /// @brief Allocation Engine.
-     /// Pointer to the allocation engine that we are currently using
-     /// It must be a pointer, because we will support changing engines
-     /// during normal operation (e.g. to use different allocators)
-     boost::shared_ptr<AllocEngine> alloc_engine_;
 -    /// @brief Implements the error handler for socket open failure.
 -    ///
 -    /// This callback function is installed on the @c isc::dhcp::IfaceMgr
 -    /// when IPv4 sockets are being open. When socket fails to open for
 -    /// any reason, this function is called. It simply logs the error message.
 -    ///
 -    /// @param errmsg An error message containing a cause of the failure.
 -    static void ifaceMgrSocket4ErrorHandler(const std::string& errmsg);
  
      uint16_t port_;  ///< UDP port number on which server listens.
      bool use_bcast_; ///< Should broadcast be enabled on sockets (if true).