--- trunk/src/utils/Tuple.hpp 2004/10/27 06:07:09 164 +++ trunk/src/utils/Tuple.hpp 2005/04/15 22:04:00 507 @@ -1,10 +1,51 @@ +/* + * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved. + * + * The University of Notre Dame grants you ("Licensee") a + * non-exclusive, royalty free, license to use, modify and + * redistribute this software in source and binary code form, provided + * that the following conditions are met: + * + * 1. Acknowledgement of the program authors must be made in any + * publication of scientific results based in part on use of the + * program. An acceptable form of acknowledgement is citation of + * the article in which the program was described (Matthew + * A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher + * J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented + * Parallel Simulation Engine for Molecular Dynamics," + * J. Comput. Chem. 26, pp. 252-271 (2005)) + * + * 2. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 3. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the + * distribution. + * + * This software is provided "AS IS," without a warranty of any + * kind. All express or implied conditions, representations and + * warranties, including any implied warranty of merchantability, + * fitness for a particular purpose or non-infringement, are hereby + * excluded. The University of Notre Dame and its licensors shall not + * be liable for any damages suffered by licensee as a result of + * using, modifying or distributing the software or its + * derivatives. In no event will the University of Notre Dame or its + * licensors be liable for any lost revenue, profit or data, or for + * direct, indirect, special, consequential, incidental or punitive + * damages, however caused and regardless of the theory of liability, + * arising out of the use of or inability to use software, even if the + * University of Notre Dame has been advised of the possibility of + * such damages. + */ + #ifndef UTILS_TUPLE_HPP #define UTILS_TUPLE_HPP namespace oopse { -template -struct tuple3 { + template + struct tuple3 { typedef T1 first_type; typedef T2 second_type; typedef T3 third_type; @@ -14,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; @@ -35,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