summaryrefslogtreecommitdiff
path: root/indra/test/test.cpp
diff options
context:
space:
mode:
authorJonathan Yap <jhwelch@gmail.com>2018-01-12 09:08:49 -0500
committerJonathan Yap <jhwelch@gmail.com>2018-01-12 09:08:49 -0500
commit1e586749efeeb8c40503330572680a8709ae5487 (patch)
tree5c1ebee5dbdb5004f354b9fb0837d60f6dd3cfcc /indra/test/test.cpp
parent32f16633c77564d567ed0752e56eb38abb916ccd (diff)
parent1693ccba58eef676df1f91e50627545ac35bb819 (diff)
STORM-2145 Merge up to viewer-release
Diffstat (limited to 'indra/test/test.cpp')
-rw-r--r--indra/test/test.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/test/test.cpp b/indra/test/test.cpp
index e42374d56b..1c0317df1d 100644
--- a/indra/test/test.cpp
+++ b/indra/test/test.cpp
@@ -34,6 +34,7 @@
*
*/
+
#include "linden_common.h"
#include "llerrorcontrol.h"
#include "lltut.h"
@@ -135,7 +136,7 @@ public:
private:
NamedTempFile mTempFile;
- std::ofstream mFile;
+ llofstream mFile;
};
class LLReplayLogReal: public LLReplayLog, public boost::noncopyable
@@ -568,7 +569,7 @@ int main(int argc, char **argv)
apr_status_t apr_err;
const char* opt_arg = NULL;
int opt_id = 0;
- boost::scoped_ptr<std::ofstream> output;
+ boost::scoped_ptr<llofstream> output;
const char *touch = NULL;
while(true)
@@ -598,7 +599,7 @@ int main(int argc, char **argv)
verbose_mode = true;
break;
case 'o':
- output.reset(new std::ofstream);
+ output.reset(new llofstream);
output->open(opt_arg);
break;
case 's': // --sourcedir
@@ -672,7 +673,7 @@ int main(int argc, char **argv)
if (touch && success)
{
- std::ofstream s;
+ llofstream s;
s.open(touch);
s << "ok" << std::endl;
s.close();
@@ -684,4 +685,5 @@ int main(int argc, char **argv)
return retval;
//delete mycallback;
+
}