--- trunk/src/utils/Tuple.hpp 2005/01/12 22:41:40 246 +++ trunk/src/utils/Tuple.hpp 2005/04/15 22:04:00 507 @@ -1,4 +1,4 @@ - /* +/* * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved. * * The University of Notre Dame grants you ("Licensee") a @@ -44,8 +44,8 @@ namespace oopse { namespace oopse { -template -struct tuple3 { + template + struct tuple3 { typedef T1 first_type; typedef T2 second_type; typedef T3 third_type; @@ -55,16 +55,16 @@ struct tuple3 { T3 third; tuple3() {} tuple3(const T1& a, const T2& b, const T3& c) : first(a), second(b), third(c) {} -}; + }; -template -tuple3 make_tuple3( T1 t1, T2 t2, T3 t3 ) { + template + tuple3 make_tuple3( T1 t1, T2 t2, T3 t3 ) { return tuple3( t1, t2, t3 ); -} + } -template -struct tuple4 { + template + struct tuple4 { typedef T1 first_type; typedef T2 second_type; typedef T3 third_type; @@ -76,13 +76,13 @@ struct tuple4 { T4 fourth; tuple4() {} tuple4(const T1& a, const T2& b, const T3& c, const T4& d) - : first(a), second(b), third(c), fourth(d) {} -}; + : first(a), second(b), third(c), fourth(d) {} + }; -template -tuple4 make_tuple4( T1 t1, T2 t2, T3 t3, T4 t4 ) { + template + tuple4 make_tuple4( T1 t1, T2 t2, T3 t3, T4 t4 ) { return tuple4( t1, t2, t3, t4 ); -} + } } #endif //UTILS_TUPLE_HPP