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

Updated OSG so that the old OSG_USE_IO_DOT_H has be removed from all headers

Browse Source 
that used it, all references to the Standard C++ stream classes use the
std::ostream etc convention, all references to "using namespace std" and
"using namespace std::ostream etc" have been removed.
This commit is contained in:
Robert Osfield
2001-12-14 21:49:04 +00:00
parent 6070a9e1b1
commit b1f478e5d2
16 changed files with 36 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Demos/sgv/sgv.cpp
View File

@@ -149,8 +149,8 @@ int main( int argc, char **argv )
osgGLUT::Viewer viewer;
viewer.addViewport( rootnode );
//osgUtil::SceneView* sceneview = viewer.getViewportSceneView(0);
//sceneview->setStereoMode(osgUtil::SceneView::ANAGLYPHIC_STEREO);
// osgUtil::SceneView* sceneview = viewer.getViewportSceneView(0);
// sceneview->setStereoMode(osgUtil::SceneView::ANAGLYPHIC_STEREO);
// register trackball, flight and drive.
viewer.registerCameraManipulator(new osgUtil::TrackballManipulator);

12
src/osgPlugins/flt/OldVertexRecords.h
View File

@@ -8,13 +8,7 @@
#include "RecordVisitor.h"
#include <map>
#ifdef OSG_USE_IO_DOT_H
#include <iostream.h>
#else
#include <iostream>
using namespace std;
#endif
namespace flt {
@@ -46,7 +40,7 @@ class OldVertexRecord : public PrimNodeRecord
virtual void accept(RecordVisitor& rv) { rv.apply(*this); }
// virtual void traverse(RecordVisitor& rv);
virtual SOldVertex* getData() const { return (SOldVertex*)_pData; }
// friend ostream& operator << (ostream& output, const OldVertexRecord& rec);
// friend std::ostream& operator << (std::ostream& output, const OldVertexRecord& rec);
protected:
virtual ~OldVertexRecord();
@@ -87,7 +81,7 @@ class OldVertexColorRecord : public PrimNodeRecord
virtual void accept(RecordVisitor& rv) { rv.apply(*this); }
// virtual void traverse(RecordVisitor& rv);
virtual SOldVertexColor* getData() const { return (SOldVertexColor*)_pData; }
// friend ostream& operator << (ostream& output, const OldVertexColorRecord& rec);
// friend std::ostream& operator << (std::ostream& output, const OldVertexColorRecord& rec);
protected:
virtual ~OldVertexColorRecord();
@@ -128,7 +122,7 @@ class OldVertexColorNormalRecord : public PrimNodeRecord
virtual void accept(RecordVisitor& rv) { rv.apply(*this); }
// virtual void traverse(RecordVisitor& rv);
virtual SOldVertexColorNormal* getData() const { return (SOldVertexColorNormal*)_pData; }
// friend ostream& operator << (ostream& output, const OldVertexColorNormalRecord& rec);
// friend std::ostream& operator << (std::ostream& output, const OldVertexColorNormalRecord& rec);
protected:
virtual ~OldVertexColorNormalRecord();

12
src/osgPlugins/flt/ReaderWriterATTR.cpp
View File

@@ -42,10 +42,6 @@
#include <iostream>
#include <fstream>
#ifndef OSG_USE_IO_DOT_H
using std::ios;
#endif
typedef signed char int8;
typedef unsigned char uint8;
typedef signed short int16;
@@ -161,7 +157,7 @@ class Attr
Attr(int version) : _flt_version(version) { init(); }
void init();
void readField(ifstream& file, void* buf, size_t size);
void readField(std::ifstream& file, void* buf, size_t size);
bool readAttrFile(const char* szName);
StateSet* createOsgStateSet();
@@ -456,7 +452,7 @@ void Attr::init()
}
void Attr::readField(ifstream& file, void* buf, size_t size)
void Attr::readField(std::ifstream& file, void* buf, size_t size)
{
if (file.eof()) return;
file.read((char*)buf, size);
@@ -468,9 +464,9 @@ void Attr::readField(ifstream& file, void* buf, size_t size)
bool Attr::readAttrFile(const char* szName)
{
int n;
ifstream file;
std::ifstream file;
file.open (szName, ios::in | ios::binary);
file.open (szName, std::ios::in | std::ios::binary);
READ( texels_u );
READ( textel_v );

7
src/osgPlugins/flt/Record.h
View File

@@ -9,12 +9,7 @@
#include "FltRecords.h"
#ifdef OSG_USE_IO_DOT_H
#include <iostream.h>
#else
#include <iostream>
using namespace std;
#endif
namespace flt {
@@ -70,7 +65,7 @@ class Record : public osg::Referenced
int getFlightVersion();
friend ostream& operator << (ostream& output, const Record& rec);
friend std::ostream& operator << (std::ostream& output, const Record& rec);
protected:

7
src/osgPlugins/flt/VertexPoolRecords.h
View File

@@ -9,12 +9,7 @@
#include "Record.h"
#include "RecordVisitor.h"
#ifdef OSG_USE_IO_DOT_H
#include <iostream.h>
#else
#include <iostream>
using namespace std;
#endif
namespace flt {
@@ -48,7 +43,7 @@ class VertexPaletteRecord : public AncillaryRecord
virtual size_t sizeofData() const { return sizeof(SVertexTableHeader); }
virtual void accept(RecordVisitor& rv) { rv.apply(*this); }
// virtual void traverse(RecordVisitor& rv);
friend ostream& operator << (ostream& output, const VertexPaletteRecord& rec);
friend std::ostream& operator << (std::ostream& output, const VertexPaletteRecord& rec);
protected:
virtual ~VertexPaletteRecord();

13
src/osgPlugins/flt/flt.h
View File

@@ -4,12 +4,7 @@
#include <osg/Vec4>
#ifdef OSG_USE_IO_DOT_H
#include <iostream.h>
#else
#include <iostream>
using namespace std;
#endif
namespace flt {
@@ -81,7 +76,7 @@ struct float32x2
ENDIAN( _v[1] );
}
friend inline ostream& operator << (ostream& output, const float32x2& f)
friend inline std::ostream& operator << (std::ostream& output, const float32x2& f)
{
output << f._v[0] << " "
<< f._v[1];
@@ -103,7 +98,7 @@ struct float32x3
ENDIAN( _v[2] );
}
friend inline ostream& operator << (ostream& output, const float32x3& f)
friend inline std::ostream& operator << (std::ostream& output, const float32x3& f)
{
output << f._v[0] << " "
<< f._v[1] << " "
@@ -124,7 +119,7 @@ struct float64x2
ENDIAN( _v[1] );
}
friend inline ostream& operator << (ostream& output, const float64x2& f)
friend inline std::ostream& operator << (std::ostream& output, const float64x2& f)
{
output << f._v[0] << " "
<< f._v[1];
@@ -147,7 +142,7 @@ struct float64x3
ENDIAN( _v[2] );
}
friend inline ostream& operator << (ostream& output, const float64x3& f)
friend inline std::ostream& operator << (std::ostream& output, const float64x3& f)
{
output << f._v[0] << " "
<< f._v[1] << " "