diff options
Diffstat (limited to 'indra/test/lltut.cpp')
| -rw-r--r-- | indra/test/lltut.cpp | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/indra/test/lltut.cpp b/indra/test/lltut.cpp index 03a70c714d..da7031b52a 100644 --- a/indra/test/lltut.cpp +++ b/indra/test/lltut.cpp @@ -4,42 +4,39 @@ * @date 5/16/06 * @brief MacTester * - * $LicenseInfo:firstyear=2006&license=viewergpl$ - * - * Copyright (c) 2006-2007, Linden Research, Inc. - * + * $LicenseInfo:firstyear=2006&license=viewerlgpl$ * Second Life Viewer Source Code - * The source code in this file ("Source Code") is provided by Linden Lab - * to you under the terms of the GNU General Public License, version 2.0 - * ("GPL"), unless you have obtained a separate licensing agreement - * ("Other License"), formally executed by you and Linden Lab. Terms of - * the GPL can be found in doc/GPL-license.txt in this distribution, or - * online at http://secondlife.com/developers/opensource/gplv2 + * Copyright (C) 2010, Linden Research, Inc. * - * There are special exceptions to the terms and conditions of the GPL as - * it is applied to this Source Code. View the full text of the exception - * in the file doc/FLOSS-exception.txt in this software distribution, or - * online at http://secondlife.com/developers/opensource/flossexception + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. * - * By copying, modifying or distributing this software, you acknowledge - * that you have read and understood your obligations described above, - * and agree to abide by those obligations. + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO - * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, - * COMPLETENESS OR PERFORMANCE. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ #include "linden_common.h" + #include "lltut.h" +#include "lldate.h" #include "llformat.h" #include "llsd.h" +#include "lluri.h" namespace tut { - template<> void ensure_equals(const char* msg, const LLDate& actual, const LLDate& expected) { @@ -47,7 +44,6 @@ namespace tut actual.secondsSinceEpoch(), expected.secondsSinceEpoch()); } - template<> void ensure_equals(const char* msg, const LLURI& actual, const LLURI& expected) { @@ -55,7 +51,6 @@ namespace tut actual.asString(), expected.asString()); } - template<> void ensure_equals(const char* msg, const std::vector<U8>& actual, const std::vector<U8>& expected) { @@ -73,12 +68,15 @@ namespace tut } } - template<> void ensure_equals(const char* m, const LLSD& actual, const LLSD& expected) + { + ensure_equals(std::string(m), actual, expected); + } + + void ensure_equals(const std::string& msg, const LLSD& actual, + const LLSD& expected) { - const std::string& msg = m; - ensure_equals(msg + " type", actual.type(), expected.type()); switch (actual.type()) { @@ -199,3 +197,4 @@ namespace tut } } } + |