diff options
Diffstat (limited to 'boost/iostreams/device/array.hpp')
| -rw-r--r--[-rwxr-xr-x] | boost/iostreams/device/array.hpp | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/boost/iostreams/device/array.hpp b/boost/iostreams/device/array.hpp index 3e08f04470..768a5644a1 100755..100644 --- a/boost/iostreams/device/array.hpp +++ b/boost/iostreams/device/array.hpp @@ -8,7 +8,7 @@ #ifndef BOOST_IOSTREAMS_ARRAY_HPP_INCLUDED #define BOOST_IOSTREAMS_ARRAY_HPP_INCLUDED -#if defined(_MSC_VER) && (_MSC_VER >= 1020) +#if defined(_MSC_VER) # pragma once #endif @@ -40,12 +40,10 @@ public: array_adapter(char_type* begin, std::size_t length); array_adapter(const char_type* begin, const char_type* end); array_adapter(const char_type* begin, std::size_t length); -#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) template<int N> array_adapter(char_type (&ar)[N]) : begin_(ar), end_(ar + N) { } -#endif pair_type input_sequence(); pair_type output_sequence(); private: @@ -55,16 +53,6 @@ private: } // End namespace detail. -// Local macros, #undef'd below. -#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300) -# define BOOST_IOSTREAMS_ARRAY_CTOR(name, ch) \ - template<int N> \ - BOOST_PP_CAT(basic_, name)(ch (&ar)[N]) \ - : base_type(ar) { } \ - /**/ -#else -# define BOOST_IOSTREAMS_ARRAY_CTOR(name, ch) -#endif #define BOOST_IOSTREAMS_ARRAY(name, mode) \ template<typename Ch> \ struct BOOST_PP_CAT(basic_, name) : detail::array_adapter<mode, Ch> { \ @@ -81,7 +69,9 @@ private: : base_type(begin, end) { } \ BOOST_PP_CAT(basic_, name)(const char_type* begin, std::size_t length) \ : base_type(begin, length) { } \ - BOOST_IOSTREAMS_ARRAY_CTOR(name, Ch) \ + template<int N> \ + BOOST_PP_CAT(basic_, name)(Ch (&ar)[N]) \ + : base_type(ar) { } \ }; \ typedef BOOST_PP_CAT(basic_, name)<char> name; \ typedef BOOST_PP_CAT(basic_, name)<wchar_t> BOOST_PP_CAT(w, name); \ @@ -89,7 +79,6 @@ private: BOOST_IOSTREAMS_ARRAY(array_source, input_seekable) BOOST_IOSTREAMS_ARRAY(array_sink, output_seekable) BOOST_IOSTREAMS_ARRAY(array, seekable) -#undef BOOST_IOSTREAMS_ARRAY_CTOR #undef BOOST_IOSTREAMS_ARRAY |