BIND 10 master, updated. 8e5e30b800b786cbcf8ff12db820bb1a7c75d69f Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  8e5e30b800b786cbcf8ff12db820bb1a7c75d69f (commit)
       via  9f079c662135d45fac7be5b0b9282e7542c55e81 (commit)
      from  2f5ba8955ec66c1c7af60b85272f03383b256fc0 (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 8e5e30b800b786cbcf8ff12db820bb1a7c75d69f
Merge: 9f079c6 2f5ba89
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Fri Jan 11 15:37:32 2013 +0100

    Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

commit 9f079c662135d45fac7be5b0b9282e7542c55e81
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Fri Jan 11 15:37:07 2013 +0100

    [master] Fix for warning in src/lib/dhcpsrv/option_space.cc

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

Summary of changes:
 src/lib/dhcpsrv/option_space.cc |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dhcpsrv/option_space.cc b/src/lib/dhcpsrv/option_space.cc
index 6036e54..0e802a7 100644
--- a/src/lib/dhcpsrv/option_space.cc
+++ b/src/lib/dhcpsrv/option_space.cc
@@ -38,12 +38,12 @@ OptionSpace::validateName(const std::string& name) {
     if (all(name, boost::is_from_range('a', 'z') ||
             boost::is_from_range('A', 'Z') ||
             boost::is_digit() ||
-            boost::is_any_of("-_")) &&
+            boost::is_any_of(std::string("-_"))) &&
         !name.empty() &&
         // Hyphens and underscores are not allowed at the beginning
         // and at the end of the option space name.
-        !all(find_head(name, 1), boost::is_any_of("-_")) &&
-        !all(find_tail(name, 1), boost::is_any_of("-_"))) {
+        !all(find_head(name, 1), boost::is_any_of(std::string("-_"))) &&
+        !all(find_tail(name, 1), boost::is_any_of(std::string("-_")))) {
         return (true);
 
     }