mirror of
https://gitlab.isc.org/isc-projects/kea
synced 2025-09-02 23:15:20 +00:00
[trac749] Merge 'master' into trac749
Conflicts: src/bin/auth/auth_srv.h src/bin/resolver/resolver.h src/lib/Makefile.am src/lib/asiodns/dns_lookup.h src/lib/asiodns/io_fetch.cc src/lib/asiodns/io_fetch.h src/lib/asiodns/qid_gen.cc src/lib/asiodns/qid_gen.h src/lib/asiodns/tcp_server.cc src/lib/asiodns/tests/qid_gen_unittest.cc src/lib/asiodns/udp_server.cc src/lib/asiolink/Makefile.am src/lib/asiolink/qid_gen.cc src/lib/asiolink/qid_gen.h src/lib/asiolink/tests/Makefile.am src/lib/asiolink/tests/qid_gen_unittest.cc src/lib/asiolink/tests/tcp_socket_unittest.cc src/lib/asiolink/tests/udp_socket_unittest.cc src/lib/dns/rdata.h src/lib/resolve/recursive_query.cc src/lib/resolve/recursive_query.h src/lib/resolve/tests/recursive_query_unittest_2.cc src/lib/testutils/srv_test.cc src/lib/util/Makefile.am src/lib/util/io_utilities.h src/lib/util/random/qid_gen.cc src/lib/util/random/qid_gen.h src/lib/util/tests/io_utilities_unittest.cc src/lib/util/tests/qid_gen_unittest.cc
This commit is contained in:
@@ -33,6 +33,7 @@
|
||||
#include <asiolink/io_service.h>
|
||||
#include <asiolink/udp_endpoint.h>
|
||||
|
||||
namespace isc {
|
||||
namespace asiolink {
|
||||
|
||||
/// \brief The \c UDPSocket class is a concrete derived class of \c IOAsioSocket
|
||||
@@ -318,5 +319,6 @@ UDPSocket<C>::close() {
|
||||
}
|
||||
|
||||
} // namespace asiolink
|
||||
} // namespace isc
|
||||
|
||||
#endif // __UDP_SOCKET_H
|
||||
|
Reference in New Issue
Block a user