FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes to Windows build in liu of the move to using just std::streams.

Browse Source
This commit is contained in:
Robert Osfield
2001-12-14 23:18:28 +00:00
parent b1f478e5d2
commit 478274ae7d
67 changed files with 533 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osgDB/FieldReaderIterator
View File

@@ -25,7 +25,7 @@ class OSGDB_EXPORT FieldReaderIterator
virtual FieldReaderIterator& operator = (const FieldReaderIterator& ic);
void attach(istream* input);
void attach(std::istream* input);
void detach();
virtual bool eof() const;

12
include/osgDB/Output
View File

@@ -66,8 +66,8 @@ class OSGDB_EXPORT Output : public std::ofstream
protected:
// prevent copy construction and assignment.
Output(const Output&) : ofstream() {}
Output& operator = (const Output&) { return *this; }
Output(const Output&);
Output& operator = (const Output&);
virtual void init();
@@ -88,14 +88,14 @@ class OSGDB_EXPORT Output : public std::ofstream
template<class T>
bool writeArrayBlock(Output& fw,T* start,T* finish)
{
fw.indent() << "{" << endl;
fw.indent() << "{" << std::endl;
fw.moveIn();
int numIndicesThisLine = 0;
for(T* itr=start;itr!=finish;++itr)
{
if (numIndicesThisLine>=fw.getNumIndicesPerLine())
{
fw << endl;
fw << std::endl;
numIndicesThisLine = 0;
}
@@ -107,9 +107,9 @@ bool writeArrayBlock(Output& fw,T* start,T* finish)
++numIndicesThisLine;
}
fw << endl;
fw << std::endl;
fw.moveOut();
fw.indent() << "}" << endl;
fw.indent() << "}" << std::endl;
return true;
}