Subject: [Boost-commit] svn:boost r52412 - trunk/boost/asio/detail
From: chris_at_[hidden]
Date: 2009-04-15 23:27:59
Author: chris_kohlhoff
Date: 2009-04-15 23:27:58 EDT (Wed, 15 Apr 2009)
New Revision: 52412
URL: http://svn.boost.org/trac/boost/changeset/52412
Log:
Fix incompatibility between asio and ncurses.h due to the latter defining
a macro called "timeout". Fixes #2156.
Text files modified:
trunk/boost/asio/detail/socket_option.hpp | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
Modified: trunk/boost/asio/detail/socket_option.hpp
==============================================================================
--- trunk/boost/asio/detail/socket_option.hpp (original)
+++ trunk/boost/asio/detail/socket_option.hpp 2009-04-15 23:27:58 EDT (Wed, 15 Apr 2009)
@@ -223,7 +223,7 @@
linger(bool e, int t)
{
enabled(e);
- timeout(t);
+ timeout BOOST_PREVENT_MACRO_SUBSTITUTION(t);
}
// Set the value for whether linger is enabled.
@@ -239,7 +239,7 @@
}
// Set the value for the linger timeout.
- void timeout(int value)
+ void timeout BOOST_PREVENT_MACRO_SUBSTITUTION(int value)
{
#if defined(WIN32)
value_.l_linger = static_cast<u_short>(value);
@@ -249,7 +249,7 @@
}
// Get the value for the linger timeout.
- int timeout() const
+ int timeout BOOST_PREVENT_MACRO_SUBSTITUTION() const
{
return static_cast<int>(value_.l_linger);
}