diff options
| -rw-r--r-- | ext/asio/asio/detail/epoll_reactor.hpp | 2 | ||||
| -rw-r--r-- | src/bin/resolver/Makefile.am | 1 | ||||
| -rw-r--r-- | src/bin/resolver/resolver.cc | 2 | ||||
| -rw-r--r-- | src/bin/resolver/tests/Makefile.am | 1 | ||||
| -rw-r--r-- | src/lib/Makefile.am | 2 | ||||
| -rw-r--r-- | src/lib/asiolink/Makefile.am | 6 | ||||
| -rw-r--r-- | src/lib/asiolink/asiolink.h | 1 | ||||
| -rw-r--r-- | src/lib/asiolink/tcp_socket.h | 8 | ||||
| -rw-r--r-- | src/lib/asiolink/tests/Makefile.am | 3 | ||||
| -rw-r--r-- | src/lib/resolve/Makefile.am | 1 | ||||
| -rw-r--r-- | src/lib/resolve/recursive_query.cc (renamed from src/lib/asiolink/recursive_query.cc) | 2 | ||||
| -rw-r--r-- | src/lib/resolve/recursive_query.h (renamed from src/lib/asiolink/recursive_query.h) | 0 | ||||
| -rw-r--r-- | src/lib/resolve/tests/Makefile.am | 6 | ||||
| -rw-r--r-- | src/lib/resolve/tests/recursive_query_unittest.cc (renamed from src/lib/asiolink/tests/recursive_query_unittest.cc) | 2 |
14 files changed, 20 insertions, 17 deletions
diff --git a/ext/asio/asio/detail/epoll_reactor.hpp b/ext/asio/asio/detail/epoll_reactor.hpp index 636739863e..0a1eac0265 100644 --- a/ext/asio/asio/detail/epoll_reactor.hpp +++ b/ext/asio/asio/detail/epoll_reactor.hpp @@ -207,7 +207,7 @@ public: // Cancel all operations associated with the given descriptor. The // handlers associated with the descriptor will be invoked with the // operation_aborted error. - void cancel_ops(socket_type descriptor, per_descriptor_data& descriptor_data) + void cancel_ops(socket_type, per_descriptor_data& descriptor_data) { mutex::scoped_lock descriptor_lock(descriptor_data->mutex_); diff --git a/src/bin/resolver/Makefile.am b/src/bin/resolver/Makefile.am index 608e1a9bad..62155eb3e2 100644 --- a/src/bin/resolver/Makefile.am +++ b/src/bin/resolver/Makefile.am @@ -50,6 +50,7 @@ b10_resolver_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la b10_resolver_LDADD += $(top_builddir)/src/lib/log/liblog.la b10_resolver_LDADD += $(top_builddir)/src/lib/cache/libcache.la b10_resolver_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la +b10_resolver_LDADD += $(top_builddir)/src/lib/resolve/libresolve.la b10_resolver_LDADD += $(top_builddir)/src/bin/auth/change_user.o b10_resolver_LDFLAGS = -pthread diff --git a/src/bin/resolver/resolver.cc b/src/bin/resolver/resolver.cc index 8f24441082..af93515407 100644 --- a/src/bin/resolver/resolver.cc +++ b/src/bin/resolver/resolver.cc @@ -40,6 +40,8 @@ #include <dns/message.h> #include <dns/messagerenderer.h> +#include <resolve/recursive_query.h> + #include <log/dummylog.h> #include <resolver/resolver.h> diff --git a/src/bin/resolver/tests/Makefile.am b/src/bin/resolver/tests/Makefile.am index 3dc6b3b5a1..1b0184cea6 100644 --- a/src/bin/resolver/tests/Makefile.am +++ b/src/bin/resolver/tests/Makefile.am @@ -39,6 +39,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la run_unittests_LDADD += $(top_builddir)/src/lib/cache/libcache.la run_unittests_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la +run_unittests_LDADD += $(top_builddir)/src/lib/resolve/libresolve.la # Note the ordering matters: -Wno-... must follow -Wextra (defined in # B10_CXXFLAGS diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 232f4094e6..5f9c4a0d63 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -1,2 +1,2 @@ SUBDIRS = exceptions dns cc config datasrc python xfr bench log \ - resolve cache asiolink nsas testutils + asiolink nsas cache resolve testutils diff --git a/src/lib/asiolink/Makefile.am b/src/lib/asiolink/Makefile.am index b3968f0661..66ab4ce8c9 100644 --- a/src/lib/asiolink/Makefile.am +++ b/src/lib/asiolink/Makefile.am @@ -27,7 +27,6 @@ libasiolink_la_SOURCES += io_fetch.h io_fetch.cc libasiolink_la_SOURCES += io_message.h libasiolink_la_SOURCES += io_service.h io_service.cc libasiolink_la_SOURCES += io_socket.h io_socket.cc -libasiolink_la_SOURCES += recursive_query.h recursive_query.cc libasiolink_la_SOURCES += simple_callback.h libasiolink_la_SOURCES += tcp_endpoint.h libasiolink_la_SOURCES += tcp_server.h tcp_server.cc @@ -39,7 +38,7 @@ libasiolink_la_SOURCES += udp_socket.h # B10_CXXFLAGS) libasiolink_la_CXXFLAGS = $(AM_CXXFLAGS) if USE_GXX -libasiolink_la_CXXFLAGS += -Wno-unused-parameter +#libasiolink_la_CXXFLAGS += -Wno-unused-parameter endif if USE_CLANGPP # Same for clang++, but we need to turn off -Werror completely. @@ -47,6 +46,3 @@ libasiolink_la_CXXFLAGS += -Wno-error endif libasiolink_la_CPPFLAGS = $(AM_CPPFLAGS) libasiolink_la_LIBADD = $(top_builddir)/src/lib/log/liblog.la -libasiolink_la_LIBADD += $(top_builddir)/src/lib/resolve/libresolve.la -libasiolink_la_LIBADD += $(top_builddir)/src/lib/cache/libcache.la -libasiolink_la_LIBADD += $(top_builddir)/src/lib/nsas/libnsas.la diff --git a/src/lib/asiolink/asiolink.h b/src/lib/asiolink/asiolink.h index 03951ae9df..c0b36ce88a 100644 --- a/src/lib/asiolink/asiolink.h +++ b/src/lib/asiolink/asiolink.h @@ -25,7 +25,6 @@ #include <asiolink/dns_lookup.h> #include <asiolink/dns_answer.h> #include <asiolink/simple_callback.h> -#include <asiolink/recursive_query.h> #include <asiolink/interval_timer.h> #include <asiolink/io_address.h> diff --git a/src/lib/asiolink/tcp_socket.h b/src/lib/asiolink/tcp_socket.h index 5a85aaa633..4f5a81ee3d 100644 --- a/src/lib/asiolink/tcp_socket.h +++ b/src/lib/asiolink/tcp_socket.h @@ -200,8 +200,8 @@ TCPSocket<C>::open(const IOEndpoint* endpoint, C&) { // an exception if this is the case. template <typename C> void -TCPSocket<C>::asyncSend(const void* data, size_t length, - const IOEndpoint* endpoint, C& callback) +TCPSocket<C>::asyncSend(const void*, size_t, + const IOEndpoint* endpoint, C&) { if (isopen_) { @@ -232,8 +232,8 @@ TCPSocket<C>::asyncSend(const void* data, size_t length, // the need for the socket to be open. template <typename C> void -TCPSocket<C>::asyncReceive(void* data, size_t length, size_t, - IOEndpoint* endpoint, C& callback) +TCPSocket<C>::asyncReceive(void*, size_t, size_t, + IOEndpoint* endpoint, C&) { if (isopen_) { diff --git a/src/lib/asiolink/tests/Makefile.am b/src/lib/asiolink/tests/Makefile.am index b4f0a87739..fa8af4fc0e 100644 --- a/src/lib/asiolink/tests/Makefile.am +++ b/src/lib/asiolink/tests/Makefile.am @@ -24,7 +24,6 @@ run_unittests_SOURCES += io_fetch_unittest.cc run_unittests_SOURCES += io_socket_unittest.cc run_unittests_SOURCES += io_service_unittest.cc run_unittests_SOURCES += interval_timer_unittest.cc -run_unittests_SOURCES += recursive_query_unittest.cc run_unittests_SOURCES += udp_endpoint_unittest.cc run_unittests_SOURCES += udp_socket_unittest.cc @@ -36,8 +35,6 @@ run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la -run_unittests_LDADD += $(top_builddir)/src/lib/cache/libcache.la -run_unittests_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) diff --git a/src/lib/resolve/Makefile.am b/src/lib/resolve/Makefile.am index c9f1326d55..c6f65a43c0 100644 --- a/src/lib/resolve/Makefile.am +++ b/src/lib/resolve/Makefile.am @@ -14,5 +14,6 @@ libresolve_la_SOURCES = resolve.h resolve.cc libresolve_la_SOURCES += resolver_interface.h libresolve_la_SOURCES += resolver_callback.h resolver_callback.cc libresolve_la_SOURCES += response_classifier.cc response_classifier.h +libresolve_la_SOURCES += recursive_query.cc recursive_query.h libresolve_la_LIBADD = $(top_builddir)/src/lib/dns/libdns++.la libresolve_la_LIBADD += $(top_builddir)/src/lib/exceptions/libexceptions.la diff --git a/src/lib/asiolink/recursive_query.cc b/src/lib/resolve/recursive_query.cc index 08fbe4631b..bf3ef6bc8e 100644 --- a/src/lib/asiolink/recursive_query.cc +++ b/src/lib/resolve/recursive_query.cc @@ -37,7 +37,7 @@ #include <asiolink/dns_service.h> #include <asiolink/io_fetch.h> #include <asiolink/io_service.h> -#include <asiolink/recursive_query.h> +#include <resolve/recursive_query.h> using isc::log::dlog; using namespace isc::dns; diff --git a/src/lib/asiolink/recursive_query.h b/src/lib/resolve/recursive_query.h index 7beae05dd0..7beae05dd0 100644 --- a/src/lib/asiolink/recursive_query.h +++ b/src/lib/resolve/recursive_query.h diff --git a/src/lib/resolve/tests/Makefile.am b/src/lib/resolve/tests/Makefile.am index e669384f65..249b17c18f 100644 --- a/src/lib/resolve/tests/Makefile.am +++ b/src/lib/resolve/tests/Makefile.am @@ -14,12 +14,18 @@ TESTS += run_unittests run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) run_unittests_SOURCES = run_unittests.cc +run_unittests_SOURCES += $(top_srcdir)/src/lib/dns/tests/unittest_util.h +run_unittests_SOURCES += $(top_srcdir)/src/lib/dns/tests/unittest_util.cc run_unittests_SOURCES += resolve_unittest.cc run_unittests_SOURCES += resolver_callback_unittest.cc run_unittests_SOURCES += response_classifier_unittest.cc +run_unittests_SOURCES += recursive_query_unittest.cc run_unittests_LDADD = $(GTEST_LDADD) run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la +run_unittests_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la +run_unittests_LDADD += $(top_builddir)/src/lib/cache/libcache.la +run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la run_unittests_LDADD += $(top_builddir)/src/lib/resolve/libresolve.la run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la diff --git a/src/lib/asiolink/tests/recursive_query_unittest.cc b/src/lib/resolve/tests/recursive_query_unittest.cc index 55d04632ba..4d9ee308ab 100644 --- a/src/lib/asiolink/tests/recursive_query_unittest.cc +++ b/src/lib/resolve/tests/recursive_query_unittest.cc @@ -44,7 +44,7 @@ // if we include asio.hpp unless we specify a special compiler option. // If we need to test something at the level of underlying ASIO and need // their definition, that test should go to asiolink/internal/tests. -#include <asiolink/recursive_query.h> +#include <resolve/recursive_query.h> #include <asiolink/io_socket.h> #include <asiolink/io_service.h> #include <asiolink/io_message.h> |