BIND 10 trac2994, updated. be65cfba939a6a7abd3c93931ce35c33d3e8247b [2994] Changes after review:

[BIND 10 source code commits]

The branch, trac2994 has been updated
       via  be65cfba939a6a7abd3c93931ce35c33d3e8247b (commit)
      from  89d6be56eefa1ed79d9c0cfb8112243e1435beb6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit be65cfba939a6a7abd3c93931ce35c33d3e8247b
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Mon Jul 22 16:37:15 2013 +0200

    [2994] Changes after review:
    
     - missing header added
     - invalid reference to prefixes removed

-----------------------------------------------------------------------

Summary of changes:
 src/bin/dhcp4/dhcp4_hooks.dox                  |    4 ++--
 src/lib/dhcpsrv/tests/alloc_engine_unittest.cc |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/dhcp4/dhcp4_hooks.dox b/src/bin/dhcp4/dhcp4_hooks.dox
index c1c4ccc..44704a8 100644
--- a/src/bin/dhcp4/dhcp4_hooks.dox
+++ b/src/bin/dhcp4/dhcp4_hooks.dox
@@ -78,8 +78,8 @@ packet processing. Hook points that are not specific to packet processing
    - name: @b subnet4collection, type: const isc::dhcp::Subnet4Collection *, direction: <b>in</b>
 
  - @b Description: this callout is executed when a subnet is being
-   selected for the incoming packet. All parameters, addresses and
-   prefixes will be assigned from that subnet. A callout can select a
+   selected for the incoming packet. All parameters and addresses
+   will be assigned from that subnet. A callout can select a
    different subnet if it wishes so, the list of all subnets currently
    configured being provided as 'subnet4collection'. The list itself must
    not be modified.
diff --git a/src/lib/dhcpsrv/tests/alloc_engine_unittest.cc b/src/lib/dhcpsrv/tests/alloc_engine_unittest.cc
index c03cab6..2f0894d 100644
--- a/src/lib/dhcpsrv/tests/alloc_engine_unittest.cc
+++ b/src/lib/dhcpsrv/tests/alloc_engine_unittest.cc
@@ -35,6 +35,7 @@
 
 #include <iostream>
 #include <sstream>
+#include <algorithm>
 #include <set>
 #include <time.h>