diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2008-12-19 22:33:29 +0000 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2008-12-19 22:33:29 +0000 |
| commit | 5b2f960ceb9c585ebc5b4907811cad1bfbe27dec (patch) | |
| tree | 11aedf21a16ae9780e4f04731bbf377f19609dc9 /indra/test | |
| parent | 796a10d8e08f9672d497f0fc148e7313e30a3c84 (diff) | |
Fixing tut related compile errors on etch:
(1) the LLLand class had to be forward declared in a cpp file that did not include llland.h
(2) ensure_equals(const char*, type, type) requires that type have an operator!=(type, type) defined.
(3) ensure_equals(const char*, type, type) is so overloaded that the compiler can have trouble picking the right version when it has to implicitly cast a std::string to "const char*" AND multiple valid casts exist for type --> S32, F32, etc. To solve this problem we must explicitly pass in a "const char*" instead of a std::string.
Reviewed with CG
Diffstat (limited to 'indra/test')
| -rw-r--r-- | indra/test/lltut.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/test/lltut.cpp b/indra/test/lltut.cpp index b9a46544fa..89ec9a7388 100644 --- a/indra/test/lltut.cpp +++ b/indra/test/lltut.cpp @@ -124,7 +124,7 @@ namespace tut { ensure_equals(msg + " map keys", actual_iter->first, expected_iter->first); - ensure_equals(msg + "[" + actual_iter->first + "]", + ensure_equals((msg + "[" + actual_iter->first + "]").c_str(), actual_iter->second, expected_iter->second); ++actual_iter; ++expected_iter; @@ -137,7 +137,7 @@ namespace tut for(int i = 0; i < actual.size(); ++i) { - ensure_equals(msg + llformat("[%d]", i), + ensure_equals((msg + llformat("[%d]", i)).c_str(), actual[i], expected[i]); } return; |