Parcourir la source

- suppress unused-parameter warnings in src/bin/auth/asio_link.cc and
src/lib/cc/session.cc that were triggered by ASIO code.
- move ext/boost and ext/asio each down one level, to ext/boost/boost
and ext/asio/asio. This allows groups of external headers to be
included more selectively: we can switch on asio without also including
boost, or change the boost include directory without losing asio.


git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac168@1952 e5f2f494-b856-4b98-b285-d166d9295462

Evan Hunt il y a 15 ans
Parent
commit
748e5c85b1
100 fichiers modifiés avec 6 ajouts et 3 suppressions
  1. 6 3
      configure.ac
  2. 0 0
      ext/asio/asio.hpp
  3. 0 0
      ext/asio/asio/basic_datagram_socket.hpp
  4. 0 0
      ext/asio/asio/basic_deadline_timer.hpp
  5. 0 0
      ext/asio/asio/basic_io_object.hpp
  6. 0 0
      ext/asio/asio/basic_raw_socket.hpp
  7. 0 0
      ext/asio/asio/basic_serial_port.hpp
  8. 0 0
      ext/asio/asio/basic_socket.hpp
  9. 0 0
      ext/asio/asio/basic_socket_acceptor.hpp
  10. 0 0
      ext/asio/asio/basic_socket_iostream.hpp
  11. 0 0
      ext/asio/asio/basic_socket_streambuf.hpp
  12. 0 0
      ext/asio/asio/basic_stream_socket.hpp
  13. 0 0
      ext/asio/asio/basic_streambuf.hpp
  14. 0 0
      ext/asio/asio/buffer.hpp
  15. 0 0
      ext/asio/asio/buffered_read_stream.hpp
  16. 0 0
      ext/asio/asio/buffered_read_stream_fwd.hpp
  17. 0 0
      ext/asio/asio/buffered_stream.hpp
  18. 0 0
      ext/asio/asio/buffered_stream_fwd.hpp
  19. 0 0
      ext/asio/asio/buffered_write_stream.hpp
  20. 0 0
      ext/asio/asio/buffered_write_stream_fwd.hpp
  21. 0 0
      ext/asio/asio/buffers_iterator.hpp
  22. 0 0
      ext/asio/asio/completion_condition.hpp
  23. 0 0
      ext/asio/asio/datagram_socket_service.hpp
  24. 0 0
      ext/asio/asio/deadline_timer.hpp
  25. 0 0
      ext/asio/asio/deadline_timer_service.hpp
  26. 0 0
      ext/asio/asio/detail/base_from_completion_cond.hpp
  27. 0 0
      ext/asio/asio/detail/bind_handler.hpp
  28. 0 0
      ext/asio/asio/detail/buffer_resize_guard.hpp
  29. 0 0
      ext/asio/asio/detail/buffer_sequence_adapter.hpp
  30. 0 0
      ext/asio/asio/detail/buffered_stream_storage.hpp
  31. 0 0
      ext/asio/asio/detail/call_stack.hpp
  32. 0 0
      ext/asio/asio/detail/completion_handler.hpp
  33. 0 0
      ext/asio/asio/detail/consuming_buffers.hpp
  34. 0 0
      ext/asio/asio/detail/deadline_timer_service.hpp
  35. 0 0
      ext/asio/asio/detail/descriptor_ops.hpp
  36. 0 0
      ext/asio/asio/detail/dev_poll_reactor.hpp
  37. 0 0
      ext/asio/asio/detail/dev_poll_reactor_fwd.hpp
  38. 0 0
      ext/asio/asio/detail/epoll_reactor.hpp
  39. 0 0
      ext/asio/asio/detail/epoll_reactor_fwd.hpp
  40. 0 0
      ext/asio/asio/detail/event.hpp
  41. 0 0
      ext/asio/asio/detail/eventfd_select_interrupter.hpp
  42. 0 0
      ext/asio/asio/detail/fd_set_adapter.hpp
  43. 0 0
      ext/asio/asio/detail/fenced_block.hpp
  44. 0 0
      ext/asio/asio/detail/gcc_fenced_block.hpp
  45. 0 0
      ext/asio/asio/detail/gcc_x86_fenced_block.hpp
  46. 0 0
      ext/asio/asio/detail/handler_alloc_helpers.hpp
  47. 0 0
      ext/asio/asio/detail/handler_invoke_helpers.hpp
  48. 0 0
      ext/asio/asio/detail/hash_map.hpp
  49. 0 0
      ext/asio/asio/detail/io_control.hpp
  50. 0 0
      ext/asio/asio/detail/kqueue_reactor.hpp
  51. 0 0
      ext/asio/asio/detail/kqueue_reactor_fwd.hpp
  52. 0 0
      ext/asio/asio/detail/local_free_on_block_exit.hpp
  53. 0 0
      ext/asio/asio/detail/macos_fenced_block.hpp
  54. 0 0
      ext/asio/asio/detail/mutex.hpp
  55. 0 0
      ext/asio/asio/detail/noncopyable.hpp
  56. 0 0
      ext/asio/asio/detail/null_buffers_op.hpp
  57. 0 0
      ext/asio/asio/detail/null_event.hpp
  58. 0 0
      ext/asio/asio/detail/null_fenced_block.hpp
  59. 0 0
      ext/asio/asio/detail/null_mutex.hpp
  60. 0 0
      ext/asio/asio/detail/null_signal_blocker.hpp
  61. 0 0
      ext/asio/asio/detail/null_thread.hpp
  62. 0 0
      ext/asio/asio/detail/null_tss_ptr.hpp
  63. 0 0
      ext/asio/asio/detail/old_win_sdk_compat.hpp
  64. 0 0
      ext/asio/asio/detail/op_queue.hpp
  65. 0 0
      ext/asio/asio/detail/operation.hpp
  66. 0 0
      ext/asio/asio/detail/pipe_select_interrupter.hpp
  67. 0 0
      ext/asio/asio/detail/pop_options.hpp
  68. 0 0
      ext/asio/asio/detail/posix_event.hpp
  69. 0 0
      ext/asio/asio/detail/posix_fd_set_adapter.hpp
  70. 0 0
      ext/asio/asio/detail/posix_mutex.hpp
  71. 0 0
      ext/asio/asio/detail/posix_signal_blocker.hpp
  72. 0 0
      ext/asio/asio/detail/posix_thread.hpp
  73. 0 0
      ext/asio/asio/detail/posix_tss_ptr.hpp
  74. 0 0
      ext/asio/asio/detail/push_options.hpp
  75. 0 0
      ext/asio/asio/detail/reactive_descriptor_service.hpp
  76. 0 0
      ext/asio/asio/detail/reactive_serial_port_service.hpp
  77. 0 0
      ext/asio/asio/detail/reactive_socket_service.hpp
  78. 0 0
      ext/asio/asio/detail/reactor.hpp
  79. 0 0
      ext/asio/asio/detail/reactor_fwd.hpp
  80. 0 0
      ext/asio/asio/detail/reactor_op.hpp
  81. 0 0
      ext/asio/asio/detail/reactor_op_queue.hpp
  82. 0 0
      ext/asio/asio/detail/resolver_service.hpp
  83. 0 0
      ext/asio/asio/detail/scoped_lock.hpp
  84. 0 0
      ext/asio/asio/detail/select_interrupter.hpp
  85. 0 0
      ext/asio/asio/detail/select_reactor.hpp
  86. 0 0
      ext/asio/asio/detail/select_reactor_fwd.hpp
  87. 0 0
      ext/asio/asio/detail/service_base.hpp
  88. 0 0
      ext/asio/asio/detail/service_id.hpp
  89. 0 0
      ext/asio/asio/detail/service_registry.hpp
  90. 0 0
      ext/asio/asio/detail/service_registry_fwd.hpp
  91. 0 0
      ext/asio/asio/detail/signal_blocker.hpp
  92. 0 0
      ext/asio/asio/detail/signal_init.hpp
  93. 0 0
      ext/asio/asio/detail/socket_holder.hpp
  94. 0 0
      ext/asio/asio/detail/socket_ops.hpp
  95. 0 0
      ext/asio/asio/detail/socket_option.hpp
  96. 0 0
      ext/asio/asio/detail/socket_select_interrupter.hpp
  97. 0 0
      ext/asio/asio/detail/socket_types.hpp
  98. 0 0
      ext/asio/asio/detail/solaris_fenced_block.hpp
  99. 0 0
      ext/asio/asio/detail/strand_service.hpp
  100. 0 0
      ext/asio/detail/task_io_service.hpp

+ 6 - 3
configure.ac

@@ -205,7 +205,7 @@ if test "$with_boost_system" != "no"; then
 	LDFLAGS_SAVED="$LDFLAGS"
 	LIBS_SAVED="$LIBS"
 	CPPFLAGS_SAVED="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS -Iext"
+	CPPFLAGS="$CPPFLAGS -Iext/boost"
 
 	for BOOST_TRY_LIB in boost_system boost_system-mt; do
 		LDFLAGS="$LDFLAGS_SAVED ${BOOST_LDFLAGS}"
@@ -340,19 +340,22 @@ AC_SUBST(GTEST_LDADD)
 
 PKG_CHECK_MODULES(SQLITE, sqlite3 >= 3.3.9, enable_features="$enable_features SQLite3")
 
+# Use local ASIO headers from ext
+CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/ext/asio"
+
 # Check for headers from required devel kits.
 # boost/shared_ptr.hpp is in ext in svn but not in tarball.
 CPPFLAGS_SAVED=$CPPFLAGS
 if test "X$BOOST_INCLUDES" = "X"; then
 	# abs_top_srcdir not defined yet
 	# so this is only useful to check.  We'll replace it after the check.
-	CPPFLAGS="$CPPFLAGS -Iext"
+	CPPFLAGS="$CPPFLAGS -Iext/boost"
 fi
 AC_CHECK_HEADERS([boost/shared_ptr.hpp boost/foreach.hpp],,
   AC_MSG_ERROR([Missing required header files.]))
 CPPFLAGS=$CPPFLAGS_SAVED
 if test "X$BOOST_INCLUDES" = "X"; then
-	CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/ext"
+	CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/ext/boost"
 fi
 
 AC_ARG_ENABLE(man, [AC_HELP_STRING([--enable-man],

ext/asio.hpp → ext/asio/asio.hpp


ext/asio/basic_datagram_socket.hpp → ext/asio/asio/basic_datagram_socket.hpp


ext/asio/basic_deadline_timer.hpp → ext/asio/asio/basic_deadline_timer.hpp


ext/asio/basic_io_object.hpp → ext/asio/asio/basic_io_object.hpp


ext/asio/basic_raw_socket.hpp → ext/asio/asio/basic_raw_socket.hpp


ext/asio/basic_serial_port.hpp → ext/asio/asio/basic_serial_port.hpp


ext/asio/basic_socket.hpp → ext/asio/asio/basic_socket.hpp


ext/asio/basic_socket_acceptor.hpp → ext/asio/asio/basic_socket_acceptor.hpp


ext/asio/basic_socket_iostream.hpp → ext/asio/asio/basic_socket_iostream.hpp


ext/asio/basic_socket_streambuf.hpp → ext/asio/asio/basic_socket_streambuf.hpp


ext/asio/basic_stream_socket.hpp → ext/asio/asio/basic_stream_socket.hpp


ext/asio/basic_streambuf.hpp → ext/asio/asio/basic_streambuf.hpp


ext/asio/buffer.hpp → ext/asio/asio/buffer.hpp


ext/asio/buffered_read_stream.hpp → ext/asio/asio/buffered_read_stream.hpp


ext/asio/buffered_read_stream_fwd.hpp → ext/asio/asio/buffered_read_stream_fwd.hpp


ext/asio/buffered_stream.hpp → ext/asio/asio/buffered_stream.hpp


ext/asio/buffered_stream_fwd.hpp → ext/asio/asio/buffered_stream_fwd.hpp


ext/asio/buffered_write_stream.hpp → ext/asio/asio/buffered_write_stream.hpp


ext/asio/buffered_write_stream_fwd.hpp → ext/asio/asio/buffered_write_stream_fwd.hpp


ext/asio/buffers_iterator.hpp → ext/asio/asio/buffers_iterator.hpp


ext/asio/completion_condition.hpp → ext/asio/asio/completion_condition.hpp


ext/asio/datagram_socket_service.hpp → ext/asio/asio/datagram_socket_service.hpp


ext/asio/deadline_timer.hpp → ext/asio/asio/deadline_timer.hpp


ext/asio/deadline_timer_service.hpp → ext/asio/asio/deadline_timer_service.hpp


ext/asio/detail/base_from_completion_cond.hpp → ext/asio/asio/detail/base_from_completion_cond.hpp


ext/asio/detail/bind_handler.hpp → ext/asio/asio/detail/bind_handler.hpp


ext/asio/detail/buffer_resize_guard.hpp → ext/asio/asio/detail/buffer_resize_guard.hpp


ext/asio/detail/buffer_sequence_adapter.hpp → ext/asio/asio/detail/buffer_sequence_adapter.hpp


ext/asio/detail/buffered_stream_storage.hpp → ext/asio/asio/detail/buffered_stream_storage.hpp


ext/asio/detail/call_stack.hpp → ext/asio/asio/detail/call_stack.hpp


ext/asio/detail/completion_handler.hpp → ext/asio/asio/detail/completion_handler.hpp


ext/asio/detail/consuming_buffers.hpp → ext/asio/asio/detail/consuming_buffers.hpp


ext/asio/detail/deadline_timer_service.hpp → ext/asio/asio/detail/deadline_timer_service.hpp


ext/asio/detail/descriptor_ops.hpp → ext/asio/asio/detail/descriptor_ops.hpp


ext/asio/detail/dev_poll_reactor.hpp → ext/asio/asio/detail/dev_poll_reactor.hpp


ext/asio/detail/dev_poll_reactor_fwd.hpp → ext/asio/asio/detail/dev_poll_reactor_fwd.hpp


ext/asio/detail/epoll_reactor.hpp → ext/asio/asio/detail/epoll_reactor.hpp


ext/asio/detail/epoll_reactor_fwd.hpp → ext/asio/asio/detail/epoll_reactor_fwd.hpp


ext/asio/detail/event.hpp → ext/asio/asio/detail/event.hpp


ext/asio/detail/eventfd_select_interrupter.hpp → ext/asio/asio/detail/eventfd_select_interrupter.hpp


ext/asio/detail/fd_set_adapter.hpp → ext/asio/asio/detail/fd_set_adapter.hpp


ext/asio/detail/fenced_block.hpp → ext/asio/asio/detail/fenced_block.hpp


ext/asio/detail/gcc_fenced_block.hpp → ext/asio/asio/detail/gcc_fenced_block.hpp


ext/asio/detail/gcc_x86_fenced_block.hpp → ext/asio/asio/detail/gcc_x86_fenced_block.hpp


ext/asio/detail/handler_alloc_helpers.hpp → ext/asio/asio/detail/handler_alloc_helpers.hpp


ext/asio/detail/handler_invoke_helpers.hpp → ext/asio/asio/detail/handler_invoke_helpers.hpp


ext/asio/detail/hash_map.hpp → ext/asio/asio/detail/hash_map.hpp


ext/asio/detail/io_control.hpp → ext/asio/asio/detail/io_control.hpp


ext/asio/detail/kqueue_reactor.hpp → ext/asio/asio/detail/kqueue_reactor.hpp


ext/asio/detail/kqueue_reactor_fwd.hpp → ext/asio/asio/detail/kqueue_reactor_fwd.hpp


ext/asio/detail/local_free_on_block_exit.hpp → ext/asio/asio/detail/local_free_on_block_exit.hpp


ext/asio/detail/macos_fenced_block.hpp → ext/asio/asio/detail/macos_fenced_block.hpp


ext/asio/detail/mutex.hpp → ext/asio/asio/detail/mutex.hpp


ext/asio/detail/noncopyable.hpp → ext/asio/asio/detail/noncopyable.hpp


ext/asio/detail/null_buffers_op.hpp → ext/asio/asio/detail/null_buffers_op.hpp


ext/asio/detail/null_event.hpp → ext/asio/asio/detail/null_event.hpp


ext/asio/detail/null_fenced_block.hpp → ext/asio/asio/detail/null_fenced_block.hpp


ext/asio/detail/null_mutex.hpp → ext/asio/asio/detail/null_mutex.hpp


ext/asio/detail/null_signal_blocker.hpp → ext/asio/asio/detail/null_signal_blocker.hpp


ext/asio/detail/null_thread.hpp → ext/asio/asio/detail/null_thread.hpp


ext/asio/detail/null_tss_ptr.hpp → ext/asio/asio/detail/null_tss_ptr.hpp


ext/asio/detail/old_win_sdk_compat.hpp → ext/asio/asio/detail/old_win_sdk_compat.hpp


ext/asio/detail/op_queue.hpp → ext/asio/asio/detail/op_queue.hpp


ext/asio/detail/operation.hpp → ext/asio/asio/detail/operation.hpp


ext/asio/detail/pipe_select_interrupter.hpp → ext/asio/asio/detail/pipe_select_interrupter.hpp


ext/asio/detail/pop_options.hpp → ext/asio/asio/detail/pop_options.hpp


ext/asio/detail/posix_event.hpp → ext/asio/asio/detail/posix_event.hpp


ext/asio/detail/posix_fd_set_adapter.hpp → ext/asio/asio/detail/posix_fd_set_adapter.hpp


ext/asio/detail/posix_mutex.hpp → ext/asio/asio/detail/posix_mutex.hpp


ext/asio/detail/posix_signal_blocker.hpp → ext/asio/asio/detail/posix_signal_blocker.hpp


ext/asio/detail/posix_thread.hpp → ext/asio/asio/detail/posix_thread.hpp


ext/asio/detail/posix_tss_ptr.hpp → ext/asio/asio/detail/posix_tss_ptr.hpp


ext/asio/detail/push_options.hpp → ext/asio/asio/detail/push_options.hpp


ext/asio/detail/reactive_descriptor_service.hpp → ext/asio/asio/detail/reactive_descriptor_service.hpp


ext/asio/detail/reactive_serial_port_service.hpp → ext/asio/asio/detail/reactive_serial_port_service.hpp


ext/asio/detail/reactive_socket_service.hpp → ext/asio/asio/detail/reactive_socket_service.hpp


ext/asio/detail/reactor.hpp → ext/asio/asio/detail/reactor.hpp


ext/asio/detail/reactor_fwd.hpp → ext/asio/asio/detail/reactor_fwd.hpp


ext/asio/detail/reactor_op.hpp → ext/asio/asio/detail/reactor_op.hpp


ext/asio/detail/reactor_op_queue.hpp → ext/asio/asio/detail/reactor_op_queue.hpp


ext/asio/detail/resolver_service.hpp → ext/asio/asio/detail/resolver_service.hpp


ext/asio/detail/scoped_lock.hpp → ext/asio/asio/detail/scoped_lock.hpp


ext/asio/detail/select_interrupter.hpp → ext/asio/asio/detail/select_interrupter.hpp


ext/asio/detail/select_reactor.hpp → ext/asio/asio/detail/select_reactor.hpp


ext/asio/detail/select_reactor_fwd.hpp → ext/asio/asio/detail/select_reactor_fwd.hpp


ext/asio/detail/service_base.hpp → ext/asio/asio/detail/service_base.hpp


ext/asio/detail/service_id.hpp → ext/asio/asio/detail/service_id.hpp


ext/asio/detail/service_registry.hpp → ext/asio/asio/detail/service_registry.hpp


ext/asio/detail/service_registry_fwd.hpp → ext/asio/asio/detail/service_registry_fwd.hpp


ext/asio/detail/signal_blocker.hpp → ext/asio/asio/detail/signal_blocker.hpp


ext/asio/detail/signal_init.hpp → ext/asio/asio/detail/signal_init.hpp


ext/asio/detail/socket_holder.hpp → ext/asio/asio/detail/socket_holder.hpp


ext/asio/detail/socket_ops.hpp → ext/asio/asio/detail/socket_ops.hpp


ext/asio/detail/socket_option.hpp → ext/asio/asio/detail/socket_option.hpp


ext/asio/detail/socket_select_interrupter.hpp → ext/asio/asio/detail/socket_select_interrupter.hpp


ext/asio/detail/socket_types.hpp → ext/asio/asio/detail/socket_types.hpp


ext/asio/detail/solaris_fenced_block.hpp → ext/asio/asio/detail/solaris_fenced_block.hpp


ext/asio/detail/strand_service.hpp → ext/asio/asio/detail/strand_service.hpp


+ 0 - 0
ext/asio/detail/task_io_service.hpp


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff