diff options
author | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-10-06 10:41:18 +0900 |
---|---|---|
committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-10-06 10:43:11 +0900 |
commit | f763a99a501650eff2c60288aa6f10ef916d769e (patch) | |
tree | 02af7e13f9a38c888ebf340fe764cbe7dae99da9 /boost/iostreams/compose.hpp | |
parent | 5cde13f21d36c7224b0e13d11c4b49379ae5210d (diff) | |
download | boost-f763a99a501650eff2c60288aa6f10ef916d769e.tar.gz boost-f763a99a501650eff2c60288aa6f10ef916d769e.tar.bz2 boost-f763a99a501650eff2c60288aa6f10ef916d769e.zip |
Imported Upstream version 1.62.0upstream/1.62.0
Change-Id: I9d4c1ddb7b7d8f0069217ecc582700f9fda6dd4c
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'boost/iostreams/compose.hpp')
-rw-r--r-- | boost/iostreams/compose.hpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/boost/iostreams/compose.hpp b/boost/iostreams/compose.hpp index dfc3df6658..6d62721f33 100644 --- a/boost/iostreams/compose.hpp +++ b/boost/iostreams/compose.hpp @@ -10,7 +10,7 @@ #ifndef BOOST_IOSTREAMS_COMPOSE_HPP_INCLUDED #define BOOST_IOSTREAMS_COMPOSE_HPP_INCLUDED -#if defined(_MSC_VER) && (_MSC_VER >= 1020) +#if defined(_MSC_VER) # pragma once #endif @@ -379,7 +379,6 @@ compose( const Filter& flt, const FilterOrDevice& fod { return compose(flt, fod, is_std_io<FilterOrDevice>()); } # if !BOOST_WORKAROUND(__BORLANDC__, < 0x600) && \ - !BOOST_WORKAROUND(BOOST_MSVC, <= 1300) && \ !defined(__GNUC__) // ---------------------------------------------------// template<typename Filter, typename FilterOrDevice> @@ -387,7 +386,7 @@ composite<Filter, FilterOrDevice> compose (const Filter& filter, FilterOrDevice& fod) { return composite<Filter, FilterOrDevice>(filter, fod); } -# endif // Borland 5.x, VC6-7.0 or GCC 2.9x //--------------------------------// +# endif // Borland 5.x or GCC //--------------------------------// #endif // #ifndef BOOST_IOSTREAMS_BROKEN_OVERLOAD_RESOLUTION //---------------// //----------------------------------------------------------------------------// |