Updates to help compilation under gcc 3.03.

This commit is contained in:
Robert Osfield 2002-01-20 16:24:54 +00:00
parent cf66502fe5
commit 604110b245
3 changed files with 27 additions and 13 deletions

View File

@ -28,7 +28,9 @@ class OSGDB_EXPORT Output : public std::ofstream
virtual ~Output();
void open(const char *name);
void open(const char *name,int mode);
// comment out temporarily to avoid compilation problems, RO Jan 2002.
// void open(const char *name,int mode);
Output& indent();

View File

@ -1,13 +1,21 @@
#include <osgDB/FileNameUtils>
// mac requires std::tolower, but IRIX MipsPro doesn't like it,
// so use this preprocessor to allow mac and mipspro to work.
#ifdef macintosh
using std::tolower;
using std::strlen;
#ifdef __sgi
#include <cctype.h>
#else
#include <cctype>
using std::tolower;
using std::strlen;
#endif
//
// // mac requires std::tolower, but IRIX MipsPro doesn't like it,
// // so use this preprocessor to allow mac and mipspro to work.
// #ifdef macintosh
// using std::tolower;
// using std::strlen;
// #endif
std::string osgDB::getFilePath(const std::string& fileName)
{
std::string::size_type slash = fileName.find_last_of('/');

View File

@ -44,12 +44,16 @@ void Output::open(const char *name)
_filename = name;
}
void Output::open(const char *name,int mode)
{
init();
ofstream::open(name,mode);
_filename = name;
}
// Comment out to avoid compile errors under new compilers, the int mode
// is now a replaced by a class to wrap the mode.
// This method is not used right now to hopefully nobody will miss it...
// Jan 2002.
// void Output::open(const char *name,int mode)
// {
// init();
// ofstream::open(name,mode);
// _filename = name;
// }
Output& Output::indent()
{