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

Convert NOTIFY to OSG_NOTIFY to avoid problems with polution of users apps with the NOTIFY macro

Browse Source
This commit is contained in:
Robert Osfield
2010-02-10 12:44:59 +00:00
parent 6ab51c7c47
commit f17e401347
42 changed files with 884 additions and 884 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/osgPlugins/ive/DataInputStream.cpp
View File

@@ -153,7 +153,7 @@ DataInputStream::DataInputStream(std::istream* istream, const osgDB::ReaderWrite
if (_options.get())
{
setLoadExternalReferenceFiles(_options->getOptionString().find("noLoadExternalReferenceFiles")==std::string::npos);
NOTIFY(osg::DEBUG_INFO) << "ive::DataInputStream.setLoadExternalReferenceFiles()=" << getLoadExternalReferenceFiles() << std::endl;
OSG_NOTIFY(osg::DEBUG_INFO) << "ive::DataInputStream.setLoadExternalReferenceFiles()=" << getLoadExternalReferenceFiles() << std::endl;
}
if(!istream){
@@ -167,7 +167,7 @@ DataInputStream::DataInputStream(std::istream* istream, const osgDB::ReaderWrite
if ( endianType != OPPOSITE_ENDIAN_TYPE ) {
throwException("DataInputStream::DataInputStream(): This file has an unreadable endian type.") ;
}
NOTIFY(osg::INFO)<<"DataInputStream::DataInputStream: Reading a byteswapped file" << std::endl ;
OSG_NOTIFY(osg::INFO)<<"DataInputStream::DataInputStream: Reading a byteswapped file" << std::endl ;
_byteswap = 1 ;
}
@@ -184,7 +184,7 @@ DataInputStream::DataInputStream(std::istream* istream, const osgDB::ReaderWrite
if (compressionLevel>0)
{
NOTIFY(osg::INFO)<<"compressed ive stream"<<std::endl;
OSG_NOTIFY(osg::INFO)<<"compressed ive stream"<<std::endl;
unsigned int maxSize = readUInt();
@@ -202,7 +202,7 @@ DataInputStream::DataInputStream(std::istream* istream, const osgDB::ReaderWrite
}
else
{
NOTIFY(osg::INFO)<<"uncompressed ive stream"<<std::endl;
OSG_NOTIFY(osg::INFO)<<"uncompressed ive stream"<<std::endl;
}
}
}
@@ -238,7 +238,7 @@ bool DataInputStream::uncompress(std::istream& fin, std::string& destination) co
);
if (ret != Z_OK)
{
NOTIFY(osg::INFO)<<"failed to init"<<std::endl;
OSG_NOTIFY(osg::INFO)<<"failed to init"<<std::endl;
return ret != 0;
}