diff options
Diffstat (limited to 'linden/indra/test/lltut.h')
-rw-r--r-- | linden/indra/test/lltut.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/linden/indra/test/lltut.h b/linden/indra/test/lltut.h index 5c905b2..3a0cc04 100644 --- a/linden/indra/test/lltut.h +++ b/linden/indra/test/lltut.h | |||
@@ -19,7 +19,8 @@ | |||
19 | * There are special exceptions to the terms and conditions of the GPL as | 19 | * There are special exceptions to the terms and conditions of the GPL as |
20 | * it is applied to this Source Code. View the full text of the exception | 20 | * it is applied to this Source Code. View the full text of the exception |
21 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 21 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
22 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | 22 | * online at |
23 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
23 | * | 24 | * |
24 | * By copying, modifying or distributing this software, you acknowledge | 25 | * By copying, modifying or distributing this software, you acknowledge |
25 | * that you have read and understood your obligations described above, | 26 | * that you have read and understood your obligations described above, |
@@ -34,13 +35,13 @@ | |||
34 | #ifndef LL_LLTUT_H | 35 | #ifndef LL_LLTUT_H |
35 | #define LL_LLTUT_H | 36 | #define LL_LLTUT_H |
36 | 37 | ||
37 | #include <tut/tut.h> | 38 | #include "is_approx_equal_fraction.h" // instead of llmath.h |
38 | 39 | ||
39 | #include "lldate.h" | 40 | #include <tut/tut.hpp> |
40 | #include "lluri.h" | ||
41 | #include "llmath.h" | ||
42 | 41 | ||
42 | class LLDate; | ||
43 | class LLSD; | 43 | class LLSD; |
44 | class LLURI; | ||
44 | 45 | ||
45 | namespace tut | 46 | namespace tut |
46 | { | 47 | { |
@@ -108,19 +109,15 @@ namespace tut | |||
108 | const Q& actual,const T& expected) | 109 | const Q& actual,const T& expected) |
109 | { ensure_equals(msg.c_str(), actual, expected); } | 110 | { ensure_equals(msg.c_str(), actual, expected); } |
110 | 111 | ||
111 | template<> | ||
112 | void ensure_equals(const char* msg, | 112 | void ensure_equals(const char* msg, |
113 | const LLDate& actual, const LLDate& expected); | 113 | const LLDate& actual, const LLDate& expected); |
114 | 114 | ||
115 | template<> | ||
116 | void ensure_equals(const char* msg, | 115 | void ensure_equals(const char* msg, |
117 | const LLURI& actual, const LLURI& expected); | 116 | const LLURI& actual, const LLURI& expected); |
118 | 117 | ||
119 | template<> | ||
120 | void ensure_equals(const char* msg, | 118 | void ensure_equals(const char* msg, |
121 | const std::vector<U8>& actual, const std::vector<U8>& expected); | 119 | const std::vector<U8>& actual, const std::vector<U8>& expected); |
122 | 120 | ||
123 | template<> | ||
124 | void ensure_equals(const char* msg, | 121 | void ensure_equals(const char* msg, |
125 | const LLSD& actual, const LLSD& expected); | 122 | const LLSD& actual, const LLSD& expected); |
126 | 123 | ||