Permalink
Browse files

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)"
  • Loading branch information...
1 parent 7cc7e58 commit 9c6cd8abc5a39007bfaa7a958e4ef3db9bc5ee82 @osg-training-guest osg-training-guest committed Jul 2, 2013
Showing with 4 additions and 4 deletions.
  1. +4 −4 src/osgPlugins/osg/BinaryStreamOperator.h
@@ -68,9 +68,9 @@ class BinaryOutputIterator : public osgDB::OutputIterator
_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 @@ class BinaryInputIterator : public osgDB::InputIterator
}
}
- 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 )
{

0 comments on commit 9c6cd8a

Please sign in to comment.