From: Tomek Mrugalski Date: Thu, 25 Sep 2014 10:42:17 +0000 (+0200) Subject: [master] Compilation fix after 3591 merge. X-Git-Tag: rt3470_base~11 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93e45f80d564e693d4c50031c374222707d931e4;p=thirdparty%2Fkea.git [master] Compilation fix after 3591 merge. --- diff --git a/src/lib/dhcpsrv/tests/daemon_unittest.cc b/src/lib/dhcpsrv/tests/daemon_unittest.cc index bd9c3a37f3..059f7940a0 100644 --- a/src/lib/dhcpsrv/tests/daemon_unittest.cc +++ b/src/lib/dhcpsrv/tests/daemon_unittest.cc @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include @@ -50,7 +50,7 @@ public: /// settings (when configureLogger is called), the logging is reset to /// the default after each test completes. ~DaemonTest() { - isc::log::resetUnitTestRootLogger(); + isc::log::setDefaultLoggingOutput(); } }; diff --git a/src/lib/dhcpsrv/tests/dbaccess_parser_unittest.cc b/src/lib/dhcpsrv/tests/dbaccess_parser_unittest.cc index 65b372857e..ac5837fa65 100644 --- a/src/lib/dhcpsrv/tests/dbaccess_parser_unittest.cc +++ b/src/lib/dhcpsrv/tests/dbaccess_parser_unittest.cc @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include @@ -53,7 +53,7 @@ public: /// the logging is reset to the default after each test completes. ~DbAccessParserTest() { LeaseMgrFactory::destroy(); - isc::log::resetUnitTestRootLogger(); + isc::log::setDefaultLoggingOutput(); } /// @brief Build JSON String diff --git a/src/lib/dhcpsrv/tests/logging_unittest.cc b/src/lib/dhcpsrv/tests/logging_unittest.cc index 9310bba8cc..d73fec55cf 100644 --- a/src/lib/dhcpsrv/tests/logging_unittest.cc +++ b/src/lib/dhcpsrv/tests/logging_unittest.cc @@ -41,7 +41,7 @@ class LoggingTest : public ::testing::Test { /// /// Reset root logger back to defaults. ~LoggingTest() { - isc::log::resetUnitTestRootLogger(); + isc::log::setDefaultLoggingOutput(); } };