From 63e7894148fdc7064b422bf65a0b75ffcf293496 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 8 May 2008 18:41:20 +0000 Subject: 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. --- indra/llcommon/llfile.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/llcommon/llfile.cpp') diff --git a/indra/llcommon/llfile.cpp b/indra/llcommon/llfile.cpp index 3c590a0d49..4e868eb5a1 100644 --- a/indra/llcommon/llfile.cpp +++ b/indra/llcommon/llfile.cpp @@ -160,7 +160,7 @@ LLFILE * LLFile::_Fiopen(const char *filename, std::ios::openmode mode,int) // p | ios_base::binary, 0}; - FILE *fp = 0; + LLFILE *fp = 0; int n; ios_base::openmode atendflag = mode & ios_base::ate; ios_base::openmode norepflag = mode & ios_base::_Noreplace; @@ -207,7 +207,7 @@ void llifstream::open(const char* _Filename, /* Flawfinder: ignore */ int _Prot) { // open a C stream with specified mode - FILE* filep = LLFile::_Fiopen(_Filename,_Mode | ios_base::in, _Prot); + LLFILE* filep = LLFile::_Fiopen(_Filename,_Mode | ios_base::in, _Prot); if(filep == NULL) { _Myios::setstate(ios_base::failbit); /*Flawfinder: ignore*/ @@ -258,7 +258,7 @@ void llofstream::open(const char* _Filename, /* Flawfinder: ignore */ int _Prot) { // open a C stream with specified mode - FILE* filep = LLFile::_Fiopen(_Filename,_Mode | ios_base::out, _Prot); + LLFILE* filep = LLFile::_Fiopen(_Filename,_Mode | ios_base::out, _Prot); if(filep == NULL) { _Myios::setstate(ios_base::failbit); /*Flawfinder: ignore*/ -- cgit v1.2.3