BIND 10 master, updated. 283053c1a3dd96ff3811f25361f900dd7c9d97ef [master] fixed build failure with SunStudio.

BIND 10 source code commits bind10-changes at lists.isc.org
Wed Apr 11 23:37:56 UTC 2012


The branch, master has been updated
       via  283053c1a3dd96ff3811f25361f900dd7c9d97ef (commit)
      from  f173bdf07ec3f4d099176dcc6b7f878b218fb93a (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 283053c1a3dd96ff3811f25361f900dd7c9d97ef
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Wed Apr 11 16:37:18 2012 -0700

    [master] fixed build failure with SunStudio.
    
    (the intent of the change should be obvious from the diff.)

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

Summary of changes:
 src/lib/datasrc/memory_datasrc.cc |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/memory_datasrc.cc b/src/lib/datasrc/memory_datasrc.cc
index 8374c21..c19d5ae 100644
--- a/src/lib/datasrc/memory_datasrc.cc
+++ b/src/lib/datasrc/memory_datasrc.cc
@@ -1603,12 +1603,15 @@ InMemoryZoneFinder::InMemoryZoneFinderImpl::load(
 
 namespace {
 // A wrapper for dns::masterLoad used by load() below.  Essentially it
-// converts the two callback types.
+// converts the two callback types.  Note the mostly redundant wrapper of
+// boost::bind.  It converts function<void(ConstRRsetPtr)> to
+// function<void(RRsetPtr)> (masterLoad() expects the latter).  SunStudio
+// doesn't seem to do this conversion if we just pass 'callback'.
 void
 masterLoadWrapper(const char* const filename, const Name& origin,
                   const RRClass& zone_class, LoadCallback callback)
 {
-    masterLoad(filename, origin, zone_class, callback);
+    masterLoad(filename, origin, zone_class, boost::bind(callback, _1));
 }
 
 // The installer called from Impl::load() for the iterator version of load().



More information about the bind10-changes mailing list