BIND 10 master, updated. abe73e885b980aace1fd0df492fa321bdd35f01f 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  abe73e885b980aace1fd0df492fa321bdd35f01f (commit)
       via  53d45f54e33d23a5b4df42dc977a3a6ab597f5c5 (commit)
      from  338b54ef4631f0d35601f174eabfa10f1541f46d (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 abe73e885b980aace1fd0df492fa321bdd35f01f
Merge: 53d45f5 338b54e
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Thu Sep 29 19:06:27 2011 +0000

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

commit 53d45f54e33d23a5b4df42dc977a3a6ab597f5c5
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Thu Sep 29 19:05:13 2011 +0000

    [master] introduced a short term workaround to fix build failure with clang++
    on freebsd by reducing the amount of code to be compiled.
    okayed on jabber.  will need to create a ticket for a more complete solution.

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

Summary of changes:
 src/lib/datasrc/tests/database_unittest.cc |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/tests/database_unittest.cc b/src/lib/datasrc/tests/database_unittest.cc
index 94ae022..fe57185 100644
--- a/src/lib/datasrc/tests/database_unittest.cc
+++ b/src/lib/datasrc/tests/database_unittest.cc
@@ -851,7 +851,17 @@ public:
 
 // The following two lines instantiate test cases with concrete accessor
 // classes to be tested.
+// XXX: clang++ installed on our FreeBSD buildbot cannot complete compiling
+// this file, seemingly due to the size of the code.  We'll consider more
+// complete workaround, but for a short term workaround we'll reduce the
+// number of tested accessor classes (thus reducing the amount of code
+// to be compiled) for this particular environment.
+#if defined(__clang__) && defined(__FreeBSD__)
+typedef ::testing::Types<MockAccessor> TestAccessorTypes;
+#else
 typedef ::testing::Types<MockAccessor, TestSQLite3Accessor> TestAccessorTypes;
+#endif
+
 TYPED_TEST_CASE(DatabaseClientTest, TestAccessorTypes);
 
 // In some cases the entire test fixture is for the mock accessor only.