[svn] commit: r3890 - in /trunk: ./ src/bin/bind10/bind10.py.in src/lib/datasrc/Makefile.am src/lib/datasrc/rbtree.h src/lib/datasrc/tests/Makefile.am src/lib/datasrc/tests/rbtree_unittest.cc src/lib/nsas/ src/lib/nsas/tests/

[BIND 10 source code commits]

Author: jinmei
Date: Mon Dec 20 18:36:39 2010
New Revision: 3890

Log:
merged branches/trac397focused (an initial subset of the RBT class,
trac #397).  on behalf of Feng, who reported a conflict issue in merging.

Added:
    trunk/src/lib/datasrc/rbtree.h
      - copied unchanged from r3889, branches/trac397focused/src/lib/datasrc/rbtree.h
    trunk/src/lib/datasrc/tests/rbtree_unittest.cc
      - copied unchanged from r3889, branches/trac397focused/src/lib/datasrc/tests/rbtree_unittest.cc
Modified:
    trunk/   (props changed)
    trunk/src/bin/bind10/bind10.py.in   (props changed)
    trunk/src/lib/datasrc/Makefile.am
    trunk/src/lib/datasrc/tests/Makefile.am
    trunk/src/lib/nsas/   (props changed)
    trunk/src/lib/nsas/tests/   (props changed)

Modified: trunk/src/lib/datasrc/Makefile.am
==============================================================================
--- trunk/src/lib/datasrc/Makefile.am (original)
+++ trunk/src/lib/datasrc/Makefile.am Mon Dec 20 18:36:39 2010
@@ -15,5 +15,6 @@
 libdatasrc_la_SOURCES += sqlite3_datasrc.h sqlite3_datasrc.cc
 libdatasrc_la_SOURCES += query.h query.cc
 libdatasrc_la_SOURCES += cache.h cache.cc
+libdatasrc_la_SOURCES += rbtree.h 
 libdatasrc_la_SOURCES += zonetable.h zonetable.cc
 libdatasrc_la_SOURCES += memory_datasrc.h memory_datasrc.cc

Modified: trunk/src/lib/datasrc/tests/Makefile.am
==============================================================================
--- trunk/src/lib/datasrc/tests/Makefile.am (original)
+++ trunk/src/lib/datasrc/tests/Makefile.am Mon Dec 20 18:36:39 2010
@@ -24,6 +24,7 @@
 run_unittests_SOURCES += query_unittest.cc
 run_unittests_SOURCES += cache_unittest.cc
 run_unittests_SOURCES += test_datasrc.h test_datasrc.cc
+run_unittests_SOURCES += rbtree_unittest.cc
 run_unittests_SOURCES += zonetable_unittest.cc
 run_unittests_SOURCES += memory_datasrc_unittest.cc
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)