diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-05-08 18:41:20 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-05-08 18:41:20 +0000 |
| commit | 63e7894148fdc7064b422bf65a0b75ffcf293496 (patch) | |
| tree | 4cca89d9da518f264001e7cb4950f453647f2e5f /indra/test | |
| parent | a75b85112ffa4b7140561083c2e5de05fb510805 (diff) | |
QAR-570 maint-render-4 merge
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
Diffstat (limited to 'indra/test')
| -rw-r--r-- | indra/test/llblowfish_tut.cpp | 4 | ||||
| -rw-r--r-- | indra/test/lldatapacker_tut.cpp | 4 | ||||
| -rw-r--r-- | indra/test/llpermissions_tut.cpp | 4 | ||||
| -rw-r--r-- | indra/test/llsaleinfo_tut.cpp | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/indra/test/llblowfish_tut.cpp b/indra/test/llblowfish_tut.cpp index b220755941..3859d6c3b1 100644 --- a/indra/test/llblowfish_tut.cpp +++ b/indra/test/llblowfish_tut.cpp @@ -60,13 +60,13 @@ namespace tut bool matchFile(const char* filename, const std::string& data) { - FILE* fp = fopen(filename, "rb"); + LLFILE* fp = LLFile::fopen(filename, "rb"); if (!fp) { // sometimes test is run inside the indra directory std::string path = "test/"; path += filename; - fp = fopen(path.c_str(), "rb"); + fp = LLFile::fopen(path.c_str(), "rb"); } if (!fp) { diff --git a/indra/test/lldatapacker_tut.cpp b/indra/test/lldatapacker_tut.cpp index a010ed0f4e..2b2085e0ae 100644 --- a/indra/test/lldatapacker_tut.cpp +++ b/indra/test/lldatapacker_tut.cpp @@ -351,7 +351,7 @@ namespace tut { F32 f_val = 44.44f, f_unpkval; - FILE* fp = fopen(TEST_FILE_NAME, "w+"); + LLFILE* fp = LLFile::fopen(TEST_FILE_NAME, "w+"); if(!fp) { llerrs << "File couldnt be open" <<llendl; @@ -406,7 +406,7 @@ namespace tut LLVector4 unpkllvec4; LLUUID unpkuuid; - FILE* fp = fopen(TEST_FILE_NAME,"w+"); + LLFILE* fp = LLFile::fopen(TEST_FILE_NAME,"w+"); if(!fp) { llerrs << "File couldnt be open" <<llendl; diff --git a/indra/test/llpermissions_tut.cpp b/indra/test/llpermissions_tut.cpp index 8d5223e2bc..69f832049c 100644 --- a/indra/test/llpermissions_tut.cpp +++ b/indra/test/llpermissions_tut.cpp @@ -421,7 +421,7 @@ namespace tut template<> template<> void permission_object_t::test<20>() { - FILE* fp = fopen("linden_file.dat","w+"); + LLFILE* fp = LLFile::fopen("linden_file.dat","w+"); if(!fp) { llerrs << "file coudnt be opened\n" << llendl; @@ -444,7 +444,7 @@ namespace tut perm.exportFile(fp); fclose(fp); - fp = fopen("linden_file.dat","r+"); + fp = LLFile::fopen("linden_file.dat","r+"); if(!fp) { llerrs << "file coudnt be opened\n" << llendl; diff --git a/indra/test/llsaleinfo_tut.cpp b/indra/test/llsaleinfo_tut.cpp index 96da93a6ce..0d0c52a2dd 100644 --- a/indra/test/llsaleinfo_tut.cpp +++ b/indra/test/llsaleinfo_tut.cpp @@ -113,7 +113,7 @@ namespace tut void llsaleinfo_test_t::test<2>() { - FILE* fp = fopen("linden_file.dat","w+"); + LLFILE* fp = LLFile::fopen("linden_file.dat","w+"); if(!fp) { llerrs << "file could not be opened\n" << llendl; @@ -129,7 +129,7 @@ namespace tut LLSaleInfo llsaleinfo1; U32 perm_mask; BOOL has_perm_mask; - fp = fopen("linden_file.dat","r"); + fp = LLFile::fopen("linden_file.dat","r"); if(!fp) { |