mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-29 13:07:50 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jeremy C. Reed 2012-04-12 17:15:55 -05:00
commit d8b8e46b85
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib/cc/tests/Makefile.am
View File

@ -24,11 +24,14 @@ run_unittests_SOURCES = data_unittests.cc session_unittests.cc run_unittests.cc
run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
run_unittests_LDADD = $(GTEST_LDADD) # We need to put our libs first, in case gtest (or any dependency, really)
run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.la # is installed in the same location as a different version of bind10
# Otherwise the linker may not use the source tree libs
run_unittests_LDADD = $(top_builddir)/src/lib/cc/libcc.la
run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
run_unittests_LDADD += $(GTEST_LDADD)
endif endif

7
src/lib/datasrc/memory_datasrc.cc
View File

@ -1603,12 +1603,15 @@ InMemoryZoneFinder::InMemoryZoneFinderImpl::load(
namespace { namespace {
// A wrapper for dns::masterLoad used by load() below. Essentially it // 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 void
masterLoadWrapper(const char* const filename, const Name& origin, masterLoadWrapper(const char* const filename, const Name& origin,
const RRClass& zone_class, LoadCallback callback) 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(). // The installer called from Impl::load() for the iterator version of load().