|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r58761 - in trunk/boost/asio: . impl ip local
From: chris_at_[hidden]
Date: 2010-01-06 07:27:07
Author: chris_kohlhoff
Date: 2010-01-06 07:27:05 EST (Wed, 06 Jan 2010)
New Revision: 58761
URL: http://svn.boost.org/trac/boost/changeset/58761
Log:
Disable iostreams-related functionality if BOOST_NO_IOSTREAMS is defined. Refs #3743.
Text files modified:
trunk/boost/asio/basic_socket_iostream.hpp | 8 ++++++++
trunk/boost/asio/basic_socket_streambuf.hpp | 8 ++++++++
trunk/boost/asio/basic_streambuf.hpp | 8 ++++++++
trunk/boost/asio/impl/read.ipp | 8 ++++++++
trunk/boost/asio/impl/read_at.ipp | 8 ++++++++
trunk/boost/asio/impl/write.ipp | 8 ++++++++
trunk/boost/asio/impl/write_at.ipp | 8 ++++++++
trunk/boost/asio/ip/address.hpp | 9 ++++++++-
trunk/boost/asio/ip/address_v4.hpp | 8 ++++++++
trunk/boost/asio/ip/address_v6.hpp | 8 ++++++++
trunk/boost/asio/ip/basic_endpoint.hpp | 15 +++++++++++----
trunk/boost/asio/ip/tcp.hpp | 2 ++
trunk/boost/asio/local/stream_protocol.hpp | 2 ++
trunk/boost/asio/read.hpp | 8 ++++++++
trunk/boost/asio/read_at.hpp | 8 ++++++++
trunk/boost/asio/read_until.hpp | 9 ++++++++-
trunk/boost/asio/streambuf.hpp | 4 ++++
trunk/boost/asio/write.hpp | 8 ++++++++
trunk/boost/asio/write_at.hpp | 8 ++++++++
19 files changed, 139 insertions(+), 6 deletions(-)
Modified: trunk/boost/asio/basic_socket_iostream.hpp
==============================================================================
--- trunk/boost/asio/basic_socket_iostream.hpp (original)
+++ trunk/boost/asio/basic_socket_iostream.hpp 2010-01-06 07:27:05 EST (Wed, 06 Jan 2010)
@@ -18,6 +18,12 @@
#include <boost/asio/detail/push_options.hpp>
#include <boost/asio/detail/push_options.hpp>
+#include <boost/config.hpp>
+#include <boost/asio/detail/pop_options.hpp>
+
+#if !defined(BOOST_NO_IOSTREAM)
+
+#include <boost/asio/detail/push_options.hpp>
#include <boost/preprocessor/arithmetic/inc.hpp>
#include <boost/preprocessor/repetition/enum_binary_params.hpp>
#include <boost/preprocessor/repetition/enum_params.hpp>
@@ -145,6 +151,8 @@
#undef BOOST_ASIO_PRIVATE_CTR_DEF
#undef BOOST_ASIO_PRIVATE_CONNECT_DEF
+#endif // defined(BOOST_NO_IOSTREAM)
+
#include <boost/asio/detail/pop_options.hpp>
#endif // BOOST_ASIO_BASIC_SOCKET_IOSTREAM_HPP
Modified: trunk/boost/asio/basic_socket_streambuf.hpp
==============================================================================
--- trunk/boost/asio/basic_socket_streambuf.hpp (original)
+++ trunk/boost/asio/basic_socket_streambuf.hpp 2010-01-06 07:27:05 EST (Wed, 06 Jan 2010)
@@ -18,6 +18,12 @@
#include <boost/asio/detail/push_options.hpp>
#include <boost/asio/detail/push_options.hpp>
+#include <boost/config.hpp>
+#include <boost/asio/detail/pop_options.hpp>
+
+#if !defined(BOOST_NO_IOSTREAM)
+
+#include <boost/asio/detail/push_options.hpp>
#include <streambuf>
#include <boost/array.hpp>
#include <boost/preprocessor/arithmetic/inc.hpp>
@@ -282,6 +288,8 @@
#undef BOOST_ASIO_PRIVATE_CONNECT_DEF
+#endif // !defined(BOOST_NO_IOSTREAM)
+
#include <boost/asio/detail/pop_options.hpp>
#endif // BOOST_ASIO_BASIC_SOCKET_STREAMBUF_HPP
Modified: trunk/boost/asio/basic_streambuf.hpp
==============================================================================
--- trunk/boost/asio/basic_streambuf.hpp (original)
+++ trunk/boost/asio/basic_streambuf.hpp 2010-01-06 07:27:05 EST (Wed, 06 Jan 2010)
@@ -18,6 +18,12 @@
#include <boost/asio/detail/push_options.hpp>
#include <boost/asio/detail/push_options.hpp>
+#include <boost/config.hpp>
+#include <boost/asio/detail/pop_options.hpp>
+
+#if !defined(BOOST_NO_IOSTREAM)
+
+#include <boost/asio/detail/push_options.hpp>
#include <algorithm>
#include <cstring>
#include <memory>
@@ -339,4 +345,6 @@
#include <boost/asio/detail/pop_options.hpp>
+#endif // !defined(BOOST_NO_IOSTREAM)
+
#endif // BOOST_ASIO_BASIC_STREAMBUF_HPP
Modified: trunk/boost/asio/impl/read.ipp
==============================================================================
--- trunk/boost/asio/impl/read.ipp (original)
+++ trunk/boost/asio/impl/read.ipp 2010-01-06 07:27:05 EST (Wed, 06 Jan 2010)
@@ -75,6 +75,8 @@
return bytes_transferred;
}
+#if !defined(BOOST_NO_IOSTREAM)
+
template <typename SyncReadStream, typename Allocator,
typename CompletionCondition>
std::size_t read(SyncReadStream& s,
@@ -122,6 +124,8 @@
return bytes_transferred;
}
+#endif // !defined(BOOST_NO_IOSTREAM)
+
namespace detail
{
template <typename AsyncReadStream, typename MutableBufferSequence,
@@ -232,6 +236,8 @@
async_read(s, buffers, transfer_all(), handler);
}
+#if !defined(BOOST_NO_IOSTREAM)
+
namespace detail
{
template <typename AsyncReadStream, typename Allocator,
@@ -341,6 +347,8 @@
async_read(s, b, transfer_all(), handler);
}
+#endif // !defined(BOOST_NO_IOSTREAM)
+
} // namespace asio
} // namespace boost
Modified: trunk/boost/asio/impl/read_at.ipp
==============================================================================
--- trunk/boost/asio/impl/read_at.ipp (original)
+++ trunk/boost/asio/impl/read_at.ipp 2010-01-06 07:27:05 EST (Wed, 06 Jan 2010)
@@ -81,6 +81,8 @@
return bytes_transferred;
}
+#if !defined(BOOST_NO_IOSTREAM)
+
template <typename SyncRandomAccessReadDevice, typename Allocator,
typename CompletionCondition>
std::size_t read_at(SyncRandomAccessReadDevice& d,
@@ -126,6 +128,8 @@
return bytes_transferred;
}
+#endif // !defined(BOOST_NO_IOSTREAM)
+
namespace detail
{
template <typename AsyncRandomAccessReadDevice,
@@ -245,6 +249,8 @@
async_read_at(d, offset, buffers, transfer_all(), handler);
}
+#if !defined(BOOST_NO_IOSTREAM)
+
namespace detail
{
template <typename AsyncRandomAccessReadDevice, typename Allocator,
@@ -359,6 +365,8 @@
async_read_at(d, offset, b, transfer_all(), handler);
}
+#endif // !defined(BOOST_NO_IOSTREAM)
+
} // namespace asio
} // namespace boost
Modified: trunk/boost/asio/impl/write.ipp
==============================================================================
--- trunk/boost/asio/impl/write.ipp (original)
+++ trunk/boost/asio/impl/write.ipp 2010-01-06 07:27:05 EST (Wed, 06 Jan 2010)
@@ -70,6 +70,8 @@
return bytes_transferred;
}
+#if !defined(BOOST_NO_IOSTREAM)
+
template <typename SyncWriteStream, typename Allocator,
typename CompletionCondition>
std::size_t write(SyncWriteStream& s,
@@ -103,6 +105,8 @@
return bytes_transferred;
}
+#endif // !defined(BOOST_NO_IOSTREAM)
+
namespace detail
{
template <typename AsyncWriteStream, typename ConstBufferSequence,
@@ -213,6 +217,8 @@
async_write(s, buffers, transfer_all(), handler);
}
+#if !defined(BOOST_NO_IOSTREAM)
+
namespace detail
{
template <typename AsyncWriteStream, typename Allocator,
@@ -288,6 +294,8 @@
async_write(s, b, transfer_all(), handler);
}
+#endif // !defined(BOOST_NO_IOSTREAM)
+
} // namespace asio
} // namespace boost
Modified: trunk/boost/asio/impl/write_at.ipp
==============================================================================
--- trunk/boost/asio/impl/write_at.ipp (original)
+++ trunk/boost/asio/impl/write_at.ipp 2010-01-06 07:27:05 EST (Wed, 06 Jan 2010)
@@ -76,6 +76,8 @@
return bytes_transferred;
}
+#if !defined(BOOST_NO_IOSTREAM)
+
template <typename SyncRandomAccessWriteDevice, typename Allocator,
typename CompletionCondition>
std::size_t write_at(SyncRandomAccessWriteDevice& d,
@@ -111,6 +113,8 @@
return bytes_transferred;
}
+#endif // !defined(BOOST_NO_IOSTREAM)
+
namespace detail
{
template <typename AsyncRandomAccessWriteDevice, typename ConstBufferSequence,
@@ -227,6 +231,8 @@
async_write_at(d, offset, buffers, transfer_all(), handler);
}
+#if !defined(BOOST_NO_IOSTREAM)
+
namespace detail
{
template <typename AsyncRandomAccessWriteDevice, typename Allocator,
@@ -305,6 +311,8 @@
async_write_at(d, offset, b, transfer_all(), handler);
}
+#endif // !defined(BOOST_NO_IOSTREAM)
+
} // namespace asio
} // namespace boost
Modified: trunk/boost/asio/ip/address.hpp
==============================================================================
--- trunk/boost/asio/ip/address.hpp (original)
+++ trunk/boost/asio/ip/address.hpp 2010-01-06 07:27:05 EST (Wed, 06 Jan 2010)
@@ -18,7 +18,10 @@
#include <boost/asio/detail/push_options.hpp>
#include <boost/asio/detail/push_options.hpp>
-#include <iosfwd>
+#include <boost/config.hpp>
+#if !defined(BOOST_NO_IOSTREAM)
+# include <iosfwd>
+#endif // !defined(BOOST_NO_IOSTREAM)
#include <string>
#include <boost/throw_exception.hpp>
#include <boost/asio/detail/pop_options.hpp>
@@ -250,6 +253,8 @@
boost::asio::ip::address_v6 ipv6_address_;
};
+#if !defined(BOOST_NO_IOSTREAM)
+
/// Output an address as a string.
/**
* Used to output a human-readable string for a specified address.
@@ -270,6 +275,8 @@
return os;
}
+#endif // !defined(BOOST_NO_IOSTREAM)
+
} // namespace ip
} // namespace asio
} // namespace boost
Modified: trunk/boost/asio/ip/address_v4.hpp
==============================================================================
--- trunk/boost/asio/ip/address_v4.hpp (original)
+++ trunk/boost/asio/ip/address_v4.hpp 2010-01-06 07:27:05 EST (Wed, 06 Jan 2010)
@@ -18,6 +18,10 @@
#include <boost/asio/detail/push_options.hpp>
#include <boost/asio/detail/push_options.hpp>
+#include <boost/config.hpp>
+#if !defined(BOOST_NO_IOSTREAM)
+# include <iosfwd>
+#endif // !defined(BOOST_NO_IOSTREAM)
#include <climits>
#include <string>
#include <stdexcept>
@@ -269,6 +273,8 @@
boost::asio::detail::in4_addr_type addr_;
};
+#if !defined(BOOST_NO_IOSTREAM)
+
/// Output an address as a string.
/**
* Used to output a human-readable string for a specified address.
@@ -300,6 +306,8 @@
return os;
}
+#endif // !defined(BOOST_NO_IOSTREAM)
+
} // namespace ip
} // namespace asio
} // namespace boost
Modified: trunk/boost/asio/ip/address_v6.hpp
==============================================================================
--- trunk/boost/asio/ip/address_v6.hpp (original)
+++ trunk/boost/asio/ip/address_v6.hpp 2010-01-06 07:27:05 EST (Wed, 06 Jan 2010)
@@ -18,6 +18,10 @@
#include <boost/asio/detail/push_options.hpp>
#include <boost/asio/detail/push_options.hpp>
+#include <boost/config.hpp>
+#if !defined(BOOST_NO_IOSTREAM)
+# include <iosfwd>
+#endif // !defined(BOOST_NO_IOSTREAM)
#include <cstring>
#include <string>
#include <stdexcept>
@@ -383,6 +387,8 @@
unsigned long scope_id_;
};
+#if !defined(BOOST_NO_IOSTREAM)
+
/// Output an address as a string.
/**
* Used to output a human-readable string for a specified address.
@@ -414,6 +420,8 @@
return os;
}
+#endif // !defined(BOOST_NO_IOSTREAM)
+
} // namespace ip
} // namespace asio
} // namespace boost
Modified: trunk/boost/asio/ip/basic_endpoint.hpp
==============================================================================
--- trunk/boost/asio/ip/basic_endpoint.hpp (original)
+++ trunk/boost/asio/ip/basic_endpoint.hpp 2010-01-06 07:27:05 EST (Wed, 06 Jan 2010)
@@ -18,13 +18,16 @@
#include <boost/asio/detail/push_options.hpp>
#include <boost/asio/detail/push_options.hpp>
+#include <boost/config.hpp>
#include <boost/throw_exception.hpp>
#include <boost/detail/workaround.hpp>
#include <cstring>
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
-# include <ostream>
-#endif // BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
-#include <sstream>
+#if !defined(BOOST_NO_IOSTREAM)
+# if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+# include <ostream>
+# endif // BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+# include <sstream>
+#endif // !defined(BOOST_NO_IOSTREAM)
#include <boost/asio/detail/pop_options.hpp>
#include <boost/asio/error.hpp>
@@ -297,6 +300,8 @@
} data_;
};
+#if !defined(BOOST_NO_IOSTREAM)
+
/// Output an endpoint as a string.
/**
* Used to output a human-readable string for a specified endpoint.
@@ -368,6 +373,8 @@
}
#endif // BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#endif // !defined(BOOST_NO_IOSTREAM)
+
} // namespace ip
} // namespace asio
} // namespace boost
Modified: trunk/boost/asio/ip/tcp.hpp
==============================================================================
--- trunk/boost/asio/ip/tcp.hpp (original)
+++ trunk/boost/asio/ip/tcp.hpp 2010-01-06 07:27:05 EST (Wed, 06 Jan 2010)
@@ -93,8 +93,10 @@
/// The TCP resolver type.
typedef basic_resolver<tcp> resolver;
+#if !defined(BOOST_NO_IOSTREAM)
/// The TCP iostream type.
typedef basic_socket_iostream<tcp> iostream;
+#endif // !defined(BOOST_NO_IOSTREAM)
/// Socket option for disabling the Nagle algorithm.
/**
Modified: trunk/boost/asio/local/stream_protocol.hpp
==============================================================================
--- trunk/boost/asio/local/stream_protocol.hpp (original)
+++ trunk/boost/asio/local/stream_protocol.hpp 2010-01-06 07:27:05 EST (Wed, 06 Jan 2010)
@@ -72,8 +72,10 @@
/// The UNIX domain acceptor type.
typedef basic_socket_acceptor<stream_protocol> acceptor;
+#if !defined(BOOST_NO_IOSTREAM)
/// The UNIX domain iostream type.
typedef basic_socket_iostream<stream_protocol> iostream;
+#endif // !defined(BOOST_NO_IOSTREAM)
};
} // namespace local
Modified: trunk/boost/asio/read.hpp
==============================================================================
--- trunk/boost/asio/read.hpp (original)
+++ trunk/boost/asio/read.hpp 2010-01-06 07:27:05 EST (Wed, 06 Jan 2010)
@@ -170,6 +170,8 @@
std::size_t read(SyncReadStream& s, const MutableBufferSequence& buffers,
CompletionCondition completion_condition, boost::system::error_code& ec);
+#if !defined(BOOST_NO_IOSTREAM)
+
/// Attempt to read a certain amount of data from a stream before returning.
/**
* This function is used to read a certain number of bytes of data from a
@@ -274,6 +276,8 @@
std::size_t read(SyncReadStream& s, basic_streambuf<Allocator>& b,
CompletionCondition completion_condition, boost::system::error_code& ec);
+#endif // !defined(BOOST_NO_IOSTREAM)
+
/*@}*/
/**
* @defgroup async_read boost::asio::async_read
@@ -413,6 +417,8 @@
void async_read(AsyncReadStream& s, const MutableBufferSequence& buffers,
CompletionCondition completion_condition, ReadHandler handler);
+#if !defined(BOOST_NO_IOSTREAM)
+
/// Start an asynchronous operation to read a certain amount of data from a
/// stream.
/**
@@ -516,6 +522,8 @@
void async_read(AsyncReadStream& s, basic_streambuf<Allocator>& b,
CompletionCondition completion_condition, ReadHandler handler);
+#endif // !defined(BOOST_NO_IOSTREAM)
+
/*@}*/
} // namespace asio
Modified: trunk/boost/asio/read_at.hpp
==============================================================================
--- trunk/boost/asio/read_at.hpp (original)
+++ trunk/boost/asio/read_at.hpp 2010-01-06 07:27:05 EST (Wed, 06 Jan 2010)
@@ -186,6 +186,8 @@
boost::uint64_t offset, const MutableBufferSequence& buffers,
CompletionCondition completion_condition, boost::system::error_code& ec);
+#if !defined(BOOST_NO_IOSTREAM)
+
/// Attempt to read a certain amount of data at the specified offset before
/// returning.
/**
@@ -305,6 +307,8 @@
boost::uint64_t offset, basic_streambuf<Allocator>& b,
CompletionCondition completion_condition, boost::system::error_code& ec);
+#endif // !defined(BOOST_NO_IOSTREAM)
+
/*@}*/
/**
* @defgroup async_read_at boost::asio::async_read_at
@@ -449,6 +453,8 @@
boost::uint64_t offset, const MutableBufferSequence& buffers,
CompletionCondition completion_condition, ReadHandler handler);
+#if !defined(BOOST_NO_IOSTREAM)
+
/// Start an asynchronous operation to read a certain amount of data at the
/// specified offset.
/**
@@ -558,6 +564,8 @@
boost::uint64_t offset, basic_streambuf<Allocator>& b,
CompletionCondition completion_condition, ReadHandler handler);
+#endif // !defined(BOOST_NO_IOSTREAM)
+
/*@}*/
} // namespace asio
Modified: trunk/boost/asio/read_until.hpp
==============================================================================
--- trunk/boost/asio/read_until.hpp (original)
+++ trunk/boost/asio/read_until.hpp 2010-01-06 07:27:05 EST (Wed, 06 Jan 2010)
@@ -18,8 +18,13 @@
#include <boost/asio/detail/push_options.hpp>
#include <boost/asio/detail/push_options.hpp>
-#include <cstddef>
#include <boost/config.hpp>
+#include <boost/asio/detail/pop_options.hpp>
+
+#if !defined(BOOST_NO_IOSTREAM)
+
+#include <boost/asio/detail/push_options.hpp>
+#include <cstddef>
#include <boost/regex.hpp>
#include <boost/type_traits/is_function.hpp>
#include <boost/type_traits/remove_pointer.hpp>
@@ -836,6 +841,8 @@
#include <boost/asio/impl/read_until.ipp>
+#endif // !defined(BOOST_NO_IOSTREAM)
+
#include <boost/asio/detail/pop_options.hpp>
#endif // BOOST_ASIO_READ_UNTIL_HPP
Modified: trunk/boost/asio/streambuf.hpp
==============================================================================
--- trunk/boost/asio/streambuf.hpp (original)
+++ trunk/boost/asio/streambuf.hpp 2010-01-06 07:27:05 EST (Wed, 06 Jan 2010)
@@ -19,6 +19,8 @@
#include <boost/asio/basic_streambuf.hpp>
+#if !defined(BOOST_NO_IOSTREAM)
+
namespace boost {
namespace asio {
@@ -28,6 +30,8 @@
} // namespace asio
} // namespace boost
+#endif // !defined(BOOST_NO_IOSTREAM)
+
#include <boost/asio/detail/pop_options.hpp>
#endif // BOOST_ASIO_STREAMBUF_HPP
Modified: trunk/boost/asio/write.hpp
==============================================================================
--- trunk/boost/asio/write.hpp (original)
+++ trunk/boost/asio/write.hpp 2010-01-06 07:27:05 EST (Wed, 06 Jan 2010)
@@ -169,6 +169,8 @@
std::size_t write(SyncWriteStream& s, const ConstBufferSequence& buffers,
CompletionCondition completion_condition, boost::system::error_code& ec);
+#if !defined(BOOST_NO_IOSTREAM)
+
/// Write all of the supplied data to a stream before returning.
/**
* This function is used to write a certain number of bytes of data to a stream.
@@ -279,6 +281,8 @@
std::size_t write(SyncWriteStream& s, basic_streambuf<Allocator>& b,
CompletionCondition completion_condition, boost::system::error_code& ec);
+#endif // !defined(BOOST_NO_IOSTREAM)
+
/*@}*/
/**
* @defgroup async_write boost::asio::async_write
@@ -411,6 +415,8 @@
void async_write(AsyncWriteStream& s, const ConstBufferSequence& buffers,
CompletionCondition completion_condition, WriteHandler handler);
+#if !defined(BOOST_NO_IOSTREAM)
+
/// Start an asynchronous operation to write all of the supplied data to a
/// stream.
/**
@@ -510,6 +516,8 @@
void async_write(AsyncWriteStream& s, basic_streambuf<Allocator>& b,
CompletionCondition completion_condition, WriteHandler handler);
+#endif // !defined(BOOST_NO_IOSTREAM)
+
/*@}*/
} // namespace asio
Modified: trunk/boost/asio/write_at.hpp
==============================================================================
--- trunk/boost/asio/write_at.hpp (original)
+++ trunk/boost/asio/write_at.hpp 2010-01-06 07:27:05 EST (Wed, 06 Jan 2010)
@@ -182,6 +182,8 @@
boost::uint64_t offset, const ConstBufferSequence& buffers,
CompletionCondition completion_condition, boost::system::error_code& ec);
+#if !defined(BOOST_NO_IOSTREAM)
+
/// Write all of the supplied data at the specified offset before returning.
/**
* This function is used to write a certain number of bytes of data to a random
@@ -303,6 +305,8 @@
basic_streambuf<Allocator>& b, CompletionCondition completion_condition,
boost::system::error_code& ec);
+#endif // !defined(BOOST_NO_IOSTREAM)
+
/*@}*/
/**
* @defgroup async_write_at boost::asio::async_write_at
@@ -440,6 +444,8 @@
boost::uint64_t offset, const ConstBufferSequence& buffers,
CompletionCondition completion_condition, WriteHandler handler);
+#if !defined(BOOST_NO_IOSTREAM)
+
/// Start an asynchronous operation to write all of the supplied data at the
/// specified offset.
/**
@@ -545,6 +551,8 @@
basic_streambuf<Allocator>& b, CompletionCondition completion_condition,
WriteHandler handler);
+#endif // !defined(BOOST_NO_IOSTREAM)
+
/*@}*/
} // namespace asio
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk