BIND 10 master, updated. 954430281cec4d8f6382285f761a1859ca9508f7 Merge branch 'trac2789' - Addressed review comments

[BIND 10 source code commits]

The branch, master has been updated
       via  954430281cec4d8f6382285f761a1859ca9508f7 (commit)
       via  f3507e17b575821adf1076236e2855c1d7be1f26 (commit)
       via  c5f8c4c31d08049b5b8b1e7ab43011d62293f18b (commit)
      from  93cb134fd8ff6fc6c9d63d0a9f6ca3defed43721 (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 954430281cec4d8f6382285f761a1859ca9508f7
Merge: 93cb134 f3507e1
Author: Thomas Markwalder <tmark at isc.org>
Date:   Mon Mar 25 10:43:10 2013 -0400

    Merge branch 'trac2789' - Addressed review comments

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

Summary of changes:
 src/lib/dhcpsrv/pool.cc |   11 +++++------
 src/lib/dhcpsrv/pool.h  |    5 +----
 2 files changed, 6 insertions(+), 10 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dhcpsrv/pool.cc b/src/lib/dhcpsrv/pool.cc
index 7b8a4ea..7104c61 100644
--- a/src/lib/dhcpsrv/pool.cc
+++ b/src/lib/dhcpsrv/pool.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2013 Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above
@@ -64,7 +64,7 @@ Pool4::Pool4(const isc::asiolink::IOAddress& prefix,
 
 Pool6::Pool6(Pool6Type type, const isc::asiolink::IOAddress& first,
              const isc::asiolink::IOAddress& last)
-    :Pool(first, last), type_(type), prefix_len_(0) {
+    :Pool(first, last), type_(type) {
 
     // check if specified address boundaries are sane
     if (!first.isV6() || !last.isV6()) {
@@ -95,16 +95,15 @@ Pool6::Pool6(Pool6Type type, const isc::asiolink::IOAddress& first,
 Pool6::Pool6(Pool6Type type, const isc::asiolink::IOAddress& prefix,
              uint8_t prefix_len)
     :Pool(prefix, IOAddress("::")),
-     type_(type), prefix_len_(prefix_len) {
+     type_(type) {
 
     // check if the prefix is sane
     if (!prefix.isV6()) {
         isc_throw(BadValue, "Invalid Pool6 address boundaries: not IPv6");
     }
 
-    // check if the prefix length is sane (we use the member variable only
-    // for silencing some compilers; see #2705 and #2789).
-    if (prefix_len_ == 0 || prefix_len_ > 128) {
+    // check if the prefix length is sane 
+    if (prefix_len == 0 || prefix_len > 128) {
         isc_throw(BadValue, "Invalid prefix length");
     }
 
diff --git a/src/lib/dhcpsrv/pool.h b/src/lib/dhcpsrv/pool.h
index e8dc3e3..e0a6f3c 100644
--- a/src/lib/dhcpsrv/pool.h
+++ b/src/lib/dhcpsrv/pool.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2013 Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above
@@ -168,9 +168,6 @@ private:
     /// @brief defines a pool type
     Pool6Type type_;
 
-    /// @brief prefix length
-    /// used by TYPE_PD only (zeroed for other types)
-    uint8_t prefix_len_;
 };
 
 /// @brief a pointer an IPv6 Pool