From 08be3cbe0432d62054c994da49a7f93f7562f434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaakko=20J=C3=A4rvi?= Date: Thu, 9 May 2002 17:26:37 +0000 Subject: [PATCH] removing tabs [SVN r13783] --- include/boost/tuple/detail/tuple_basic.hpp | 4 +-- include/boost/tuple/tuple.hpp | 4 +-- include/boost/tuple/tuple_comparison.hpp | 2 +- include/boost/tuple/tuple_io.hpp | 40 ++++++++++------------ test/io_test.cpp | 2 +- test/tuple_test_bench.cpp | 6 ++-- 6 files changed, 28 insertions(+), 30 deletions(-) diff --git a/include/boost/tuple/detail/tuple_basic.hpp b/include/boost/tuple/detail/tuple_basic.hpp index 553a453..0263f96 100644 --- a/include/boost/tuple/detail/tuple_basic.hpp +++ b/include/boost/tuple/detail/tuple_basic.hpp @@ -42,7 +42,7 @@ #include "boost/type_traits/cv_traits.hpp" #include "boost/type_traits/function_traits.hpp" - + namespace boost { namespace tuples { @@ -862,6 +862,6 @@ tie(T1& t1, T2& t2, T3& t3, T4& t4, T5& t5, T6& t6, T7& t7, T8& t8, #undef BOOST_TUPLE_DUMMY_PARM #undef BOOST_TUPLE_SINGLE_DUMMY_PARM -#endif // BOOST_TUPLE_BASIC_HPP +#endif // BOOST_TUPLE_BASIC_HPP diff --git a/include/boost/tuple/tuple.hpp b/include/boost/tuple/tuple.hpp index 5960314..71d6dab 100644 --- a/include/boost/tuple/tuple.hpp +++ b/include/boost/tuple/tuple.hpp @@ -32,7 +32,7 @@ #endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION -namespace boost { +namespace boost { using tuples::tuple; using tuples::make_tuple; @@ -85,4 +85,4 @@ get(const tuples::cons& t, tuples::detail::workaround_holder* = 0 } // end namespace boost -#endif // BOOST_TUPLE_HPP +#endif // BOOST_TUPLE_HPP diff --git a/include/boost/tuple/tuple_comparison.hpp b/include/boost/tuple/tuple_comparison.hpp index cf3d2c9..2062c60 100644 --- a/include/boost/tuple/tuple_comparison.hpp +++ b/include/boost/tuple/tuple_comparison.hpp @@ -177,4 +177,4 @@ inline bool operator>=(const cons& lhs, const cons& rhs) } // end of namespace boost -#endif // BOOST_TUPLE_COMPARISON_HPP +#endif // BOOST_TUPLE_COMPARISON_HPP diff --git a/include/boost/tuple/tuple_io.hpp b/include/boost/tuple/tuple_io.hpp index 188d43d..2869ff3 100644 --- a/include/boost/tuple/tuple_io.hpp +++ b/include/boost/tuple/tuple_io.hpp @@ -25,7 +25,7 @@ # if (__GNUC__ == 2 && __GNUC_MINOR__ <= 97) #define BOOST_NO_TEMPLATED_STREAMS #endif -#endif // __GNUC__ +#endif // __GNUC__ #if defined BOOST_NO_TEMPLATED_STREAMS #include @@ -36,8 +36,6 @@ #include "boost/tuple/tuple.hpp" - - namespace boost { namespace tuples { @@ -71,8 +69,8 @@ public: // parentheses and space are the default manipulators if (!c) { switch(m) { - case open : c = '('; break; - case close : c = ')'; break; + case open : c = '('; break; + case close : c = ')'; break; case delimiter : c = ' '; break; } } @@ -94,8 +92,8 @@ public: // parentheses and space are the default manipulators if (!c) { switch(m) { - case open : c = i.widen('('); break; - case close : c = i.widen(')'); break; + case open : c = i.widen('('); break; + case close : c = i.widen(')'); break; case delimiter : c = i.widen(' '); break; } } @@ -112,7 +110,7 @@ public: // convertible long. i.iword(get_stream_index(m)) = static_cast(c); } -#endif // BOOST_NO_TEMPLATED_STREAMS +#endif // BOOST_NO_TEMPLATED_STREAMS }; } // end of namespace detail @@ -141,8 +139,8 @@ public: void set(std::basic_ios &io) const { detail::format_info::set_manipulator(io, mt, f_c); } -#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION -#endif // BOOST_NO_TEMPLATED_STREAMS +#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION +#endif // BOOST_NO_TEMPLATED_STREAMS }; #if defined (BOOST_NO_TEMPLATED_STREAMS) @@ -212,7 +210,7 @@ template inline std::ostream& print(std::ostream& o, const cons& t) { return o << t.head; } -#endif // BOOST_NO_TEMPLATED_STREAMS +#endif // BOOST_NO_TEMPLATED_STREAMS inline std::ostream& print(std::ostream& o, const null_type&) { return o; } @@ -226,7 +224,7 @@ print(std::ostream& o, const cons& t) { #if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) if (tuples::length::value == 0) - return o; + return o; #endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION o << d; @@ -263,14 +261,14 @@ print(std::basic_ostream& o, const cons& t) { #if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) if (tuples::length::value == 0) - return o; + return o; #endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION o << d; return print(o, t.tail); } -#endif // BOOST_NO_TEMPLATED_STREAMS +#endif // BOOST_NO_TEMPLATED_STREAMS } // namespace detail @@ -314,7 +312,7 @@ operator<<(std::basic_ostream& o, return o; } -#endif // BOOST_NO_TEMPLATED_STREAMS +#endif // BOOST_NO_TEMPLATED_STREAMS // ------------------------------------------------------------- @@ -357,7 +355,7 @@ read (std::istream &is, cons& t1) { } #else inline std::istream& read(std::istream& i, const null_type&) { return i; } -#endif // !BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION +#endif // !BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION template inline std::istream& @@ -369,7 +367,7 @@ read(std::istream &is, cons& t1) { #if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) if (tuples::length::value == 0) - return is; + return is; #endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION extract_and_check_delimiter(is, format_info::delimiter); @@ -444,7 +442,7 @@ template inline std::basic_istream& read(std::basic_istream& i, const null_type&) { return i; } -#endif // !BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION +#endif // !BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION template inline std::basic_istream& @@ -456,7 +454,7 @@ read(std::basic_istream &is, cons& t1) { #if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) if (tuples::length::value == 0) - return is; + return is; #endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION extract_and_check_delimiter(is, format_info::delimiter); @@ -494,11 +492,11 @@ operator>>(std::basic_istream& is, cons& t1) { return is; } -#endif // BOOST_NO_TEMPLATED_STREAMS +#endif // BOOST_NO_TEMPLATED_STREAMS } // end of namespace tuples } // end of namespace boost -#endif // BOOST_TUPLE_IO_HPP +#endif // BOOST_TUPLE_IO_HPP diff --git a/test/io_test.cpp b/test/io_test.cpp index 38fc6f1..ef3d7ee 100644 --- a/test/io_test.cpp +++ b/test/io_test.cpp @@ -75,7 +75,7 @@ int test_main(int argc, char * argv[] ) { // When teading tuples from a stream, manipulators must be set correctly: ifstream tmp3("temp.tmp"); - tuple j; + tuple j; #if !defined (BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) tmp3 >> j; diff --git a/test/tuple_test_bench.cpp b/test/tuple_test_bench.cpp index 5aa03ff..24cb661 100644 --- a/test/tuple_test_bench.cpp +++ b/test/tuple_test_bench.cpp @@ -186,7 +186,7 @@ void element_access_test() double e = get<1>(t); BOOST_TEST(e > 2.69 && e < 2.71); - + get<1>(t) = 3.14+i; BOOST_TEST(get<1>(t) > 4.13 && get<1>(t) < 4.15); @@ -214,7 +214,7 @@ void element_access_test() double e = get<1>(t); BOOST_TEST(e > 2.69 && e < 2.71); - + get<1>(t) = 3.14+i; BOOST_TEST(get<1>(t) > 4.13 && get<1>(t) < 4.15); @@ -308,7 +308,7 @@ make_tuple_test() // the result of make_tuple is assignable: BOOST_TEST(make_tuple(2, 4, 6) == - (make_tuple(1, 2, 3) = make_tuple(2, 4, 6))); + (make_tuple(1, 2, 3) = make_tuple(2, 4, 6))); #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) make_tuple("Donald", "Daisy"); // should work;