From Laurens Voerman, "Recent changes cause a few warnings in MSVC 2012
svn 13587 From David Callu, warning fixes and removal of spaces at end of lines. this can be fixed by adding a space before the comment opening /*. full modified file (openscenegraph\src\osgplugins\osg\BinaryStreamOperator.h) attached in zip Regards, Laurens. openscenegraph\src\osgplugins\osg\BinaryStreamOperator.h(71): warning C4138: '*/' found outside of comment (OpenSceneGraph\src\osgPlugins\osg\ReaderWriterOSG2.cpp) openscenegraph\src\osgplugins\osg\BinaryStreamOperator.h(73): warning C4138: '*/' found outside of comment (OpenSceneGraph\src\osgPlugins\osg\ReaderWriterOSG2.cpp) openscenegraph\src\osgplugins\osg\BinaryStreamOperator.h(211): warning C4138: '*/' found outside of comment (OpenSceneGraph\src\osgPlugins\osg\ReaderWriterOSG2.cpp) openscenegraph\src\osgplugins\osg\BinaryStreamOperator.h(213): warning C4138: '*/' found outside of comment (OpenSceneGraph\src\osgPlugins\osg\ReaderWriterOSG2.cpp)"
This commit is contained in:
@@ -68,9 +68,9 @@ public:
|
||||
_out->write( s.c_str(), s.size() );
|
||||
}
|
||||
|
||||
virtual void writeStream( std::ostream& (*/*fn*/)(std::ostream&) ) {}
|
||||
virtual void writeStream( std::ostream& (* /*fn*/)(std::ostream&) ) {}
|
||||
|
||||
virtual void writeBase( std::ios_base& (*/*fn*/)(std::ios_base&) ) {}
|
||||
virtual void writeBase( std::ios_base& (* /*fn*/)(std::ios_base&) ) {}
|
||||
|
||||
virtual void writeGLenum( const osgDB::ObjectGLenum& value )
|
||||
{ GLenum e = value.get(); _out->write((char*)&e, osgDB::GLENUM_SIZE); }
|
||||
@@ -208,9 +208,9 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
virtual void readStream( std::istream& (*/*fn*/)(std::istream&) ) {}
|
||||
virtual void readStream( std::istream& (* /*fn*/)(std::istream&) ) {}
|
||||
|
||||
virtual void readBase( std::ios_base& (*/*fn*/)(std::ios_base&) ) {}
|
||||
virtual void readBase( std::ios_base& (* /*fn*/)(std::ios_base&) ) {}
|
||||
|
||||
virtual void readGLenum( osgDB::ObjectGLenum& value )
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user