diff options
| author | skolb <none@none> | 2009-10-14 10:10:46 -0700 |
|---|---|---|
| committer | skolb <none@none> | 2009-10-14 10:10:46 -0700 |
| commit | 1b1550f284316b244a10a4a6604fedb5d6b18965 (patch) | |
| tree | 2416742bb0fa10c646c8490c39c3442fa73f1924 /indra/llprimitive/tests | |
| parent | 1d63b145481021c5d0ed16bd0c10c320170d0cf5 (diff) | |
| parent | b5768a69b18936282cf55f0a1ecb72ba19849836 (diff) | |
Merge
Diffstat (limited to 'indra/llprimitive/tests')
| -rw-r--r-- | indra/llprimitive/tests/llmediaentry_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/tests/llmediaentry_test.cpp b/indra/llprimitive/tests/llmediaentry_test.cpp index 72478d0459..9ce6560923 100644 --- a/indra/llprimitive/tests/llmediaentry_test.cpp +++ b/indra/llprimitive/tests/llmediaentry_test.cpp @@ -157,7 +157,7 @@ namespace tut void ensure_llsd_equals(const std::string& msg, const LLSD& expected, const LLSD& actual) { - if (! llsd_equals(expected, actual)) + if (!tut::llsd_equals(expected, actual)) { std::string message = msg; message += ": actual: "; |