summaryrefslogtreecommitdiff
path: root/indra/newview/tests
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2015-04-10 11:02:37 -0400
committerOz Linden <oz@lindenlab.com>2015-04-10 11:02:37 -0400
commit5c6cf3e7fb9f592e3a293921175b64b515bac23f (patch)
tree15933c1910c4b337e0c181434b6d653628f62eed /indra/newview/tests
parent6b9b4c91d122dccabf7541af70ed68a623ad8810 (diff)
restore the ll[io]fstream because we need them as wrappers on Windows for wide char paths; on other platforms they are now just typedefs to the std classes
Diffstat (limited to 'indra/newview/tests')
-rwxr-xr-xindra/newview/tests/llsechandler_basic_test.cpp4
-rwxr-xr-xindra/newview/tests/llslurl_test.cpp6
-rwxr-xr-xindra/newview/tests/llviewernetwork_test.cpp4
3 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/tests/llsechandler_basic_test.cpp b/indra/newview/tests/llsechandler_basic_test.cpp
index a2f91fa55d..2a8dc15346 100755
--- a/indra/newview/tests/llsechandler_basic_test.cpp
+++ b/indra/newview/tests/llsechandler_basic_test.cpp
@@ -585,7 +585,7 @@ namespace tut
LLMachineID::getUniqueID(unique_id, sizeof(unique_id));
LLXORCipher cipher2(unique_id, sizeof(unique_id));
cipher2.encrypt((U8*)&decoded_password[0], length);
- std::ofstream password_file("test_password.dat", std::ofstream::binary);
+ llofstream password_file("test_password.dat", std::ofstream::binary);
password_file.write(&decoded_password[0], length);
password_file.close();
@@ -719,7 +719,7 @@ namespace tut
test_store=NULL;
// instantiate a cert store from a file
- std::ofstream certstorefile("mycertstore.pem", std::ios::out);
+ llofstream certstorefile("mycertstore.pem", std::ios::out);
certstorefile << mPemChildCert << std::endl << mPemTestCert << std::endl;
certstorefile.close();
// validate loaded certs
diff --git a/indra/newview/tests/llslurl_test.cpp b/indra/newview/tests/llslurl_test.cpp
index 272c2d4eb7..2bc0d5a086 100755
--- a/indra/newview/tests/llslurl_test.cpp
+++ b/indra/newview/tests/llslurl_test.cpp
@@ -152,7 +152,7 @@ namespace tut
template<> template<>
void slurlTestObject::test<1>()
{
- std::ofstream gridfile(TEST_FILENAME);
+ llofstream gridfile(TEST_FILENAME);
gridfile << gSampleGridFile;
gridfile.close();
@@ -269,7 +269,7 @@ namespace tut
template<> template<>
void slurlTestObject::test<2>()
{
- std::ofstream gridfile(TEST_FILENAME);
+ llofstream gridfile(TEST_FILENAME);
gridfile << gSampleGridFile;
gridfile.close();
@@ -302,7 +302,7 @@ namespace tut
template<> template<>
void slurlTestObject::test<3>()
{
- std::ofstream gridfile(TEST_FILENAME);
+ llofstream gridfile(TEST_FILENAME);
gridfile << gSampleGridFile;
gridfile.close();
diff --git a/indra/newview/tests/llviewernetwork_test.cpp b/indra/newview/tests/llviewernetwork_test.cpp
index 2b0330a5b3..0eb0ab6500 100755
--- a/indra/newview/tests/llviewernetwork_test.cpp
+++ b/indra/newview/tests/llviewernetwork_test.cpp
@@ -245,7 +245,7 @@ namespace tut
template<> template<>
void viewerNetworkTestObject::test<2>()
{
- std::ofstream gridfile(TEST_FILENAME);
+ llofstream gridfile(TEST_FILENAME);
gridfile << gSampleGridFile;
gridfile.close();
@@ -376,7 +376,7 @@ namespace tut
void viewerNetworkTestObject::test<7>()
{
// adding a grid with simply a name will populate the values.
- std::ofstream gridfile(TEST_FILENAME);
+ llofstream gridfile(TEST_FILENAME);
gridfile << gSampleGridFile;
gridfile.close();