diff options
author | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
commit | 25c10ed028da5c547b11f1f461916897272b0e6d (patch) | |
tree | 350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/test/message_tut.cpp | |
parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/test/message_tut.cpp')
-rw-r--r-- | indra/test/message_tut.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/test/message_tut.cpp b/indra/test/message_tut.cpp index 57db6dd97a..d426511d24 100644 --- a/indra/test/message_tut.cpp +++ b/indra/test/message_tut.cpp @@ -93,7 +93,7 @@ namespace tut random.generate(); ostr << "message-test-" << random; mTestConfigDir = ostr.str(); - LLFile::mkdir(mTestConfigDir.c_str()); + LLFile::mkdir(mTestConfigDir); writeConfigFile(LLSD()); LLMessageConfig::initClass("simulator", ostr.str()); } @@ -107,11 +107,11 @@ namespace tut // rm contents of temp dir std::ostringstream ostr; ostr << mTestConfigDir << mSep << "message.xml"; - int rmfile = LLFile::remove(ostr.str().c_str()); + int rmfile = LLFile::remove(ostr.str()); ensure_equals("rmfile value", rmfile, 0); // rm temp dir - int rmdir = LLFile::rmdir(mTestConfigDir.c_str()); + int rmdir = LLFile::rmdir(mTestConfigDir); ensure_equals("rmdir value", rmdir, 0); } @@ -119,7 +119,7 @@ namespace tut { std::ostringstream ostr; ostr << mTestConfigDir << mSep << "message.xml"; - llofstream file(ostr.str().c_str()); + llofstream file(ostr.str()); if (file.is_open()) { LLSDSerialize::toPrettyXML(config, file); |