mirror of
https://github.com/boostorg/asio.git
synced 2026-01-28 06:42:08 +00:00
Merge from trunk:
* Chrono support. * Added object_handle support. * Need to enable the basic_handle class when object_handle is supported. * Update copyright notices. * Fix MSVC "performance warning". * Fix for NetBSD. Fixes #6098. * Fix regression in buffered_write_stream. Fixes #6310. * Fix deadlock on Mac OS X. Fixes #6275. * On linux, connect can return EAGAIN in certain circumstances. Remap to another error so that it doesn't look like a non-blocking operation. Fixes #6048. * Fix non-paged pool "leak" on Windows when io_service is repeatedly run without anything to do. Fixes #6321. * Disable object_handle on Windows CE. * Add extra include required for OVERLAPPED struct. * Fix doxygen comments. * Update documentation. * Add missing class. * Update copyright year. [SVN r76516]
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
// basic_deadline_timer.cpp
|
||||
// ~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
//
|
||||
// Copyright (c) 2003-2011 Christopher M. Kohlhoff (chris at kohlhoff dot com)
|
||||
// Copyright (c) 2003-2012 Christopher M. Kohlhoff (chris at kohlhoff dot com)
|
||||
//
|
||||
// Distributed under the Boost Software License, Version 1.0. (See accompanying
|
||||
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
Reference in New Issue
Block a user