diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2014-10-23 20:23:08 -0700 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2014-10-23 20:23:08 -0700 |
| commit | 918e2b629bd3dadfbe5288c0d72d93bcca1b8cfe (patch) | |
| tree | b5ae202882071bf8e954b5bcb875305e37d0dc41 /indra/llcommon/tests/llstring_test.cpp | |
| parent | 642c334efa2dbd0bafca5b0dbb11a986cd5ab4a9 (diff) | |
Bring in new TUT library build. Clean up ensure_equals() overloads.
The new TUT library build eliminates the ambiguity about ensure_equals(const
char*, ...) versus ensure_equals(const std::string&, ...). Now it's all based
on const std::string&. Remove pointless const char* overloads and ambiguous
forwarding templates.
With clang in Xcode 6, any new datatypes we intend to use with ensure_equals()
must have operator<<(std::ostream&, datatype) declared BEFORE lltut.h
#includes tut.hpp. Reorder code in certain test source files to guarantee that
visibility.
Diffstat (limited to 'indra/llcommon/tests/llstring_test.cpp')
| -rwxr-xr-x | indra/llcommon/tests/llstring_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/tests/llstring_test.cpp b/indra/llcommon/tests/llstring_test.cpp index 93d3968dbf..a7aa347222 100755 --- a/indra/llcommon/tests/llstring_test.cpp +++ b/indra/llcommon/tests/llstring_test.cpp @@ -27,11 +27,11 @@ */ #include "linden_common.h" -#include "../test/lltut.h" #include <boost/assign/list_of.hpp> #include "../llstring.h" -#include "StringVec.h" +#include "StringVec.h" // must come BEFORE lltut.h +#include "../test/lltut.h" using boost::assign::list_of; |