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

22
include/osg/Notify
View File

@@ -7,19 +7,8 @@
#include <osg/Export>
#ifdef OSG_USE_IO_DOT_H
#include <iostream.h>
#include <fstream.h>
#else
#include <iostream>
#include <fstream>
using std::ostream;
using std::ofstream;
using std::endl;
using std::cout;
using std::cerr;
#endif
namespace osg {
@@ -43,7 +32,7 @@ enum NotifySeverity {
SG_EXPORT extern NotifySeverity g_NotifyLevel;
/** global notify nul stream. added for Mac OSX */
SG_EXPORT extern ofstream *g_NotifyNulStream;
SG_EXPORT extern std::ofstream *g_NotifyNulStream;
/** global notify nul stream. added for Mac OSX */
SG_EXPORT extern bool g_NotifyInit;
@@ -79,19 +68,20 @@ SG_EXPORT extern bool initNotifyLevel();
// previous implementation was causing Mac OSX to misbehave. This version
// places less stress on compiler and runs on Mac
inline ostream& notify(const NotifySeverity severity)
inline std::ostream& notify(const NotifySeverity severity)
{
if (!g_NotifyInit) initNotifyLevel();
if (severity<=g_NotifyLevel)
{
if (severity<=osg::WARN) return cerr;
else return cout;
if (severity<=osg::WARN) return std::cerr;
else return std::cout;
}
return *osg::g_NotifyNulStream;
}
inline ostream& notify(void) { return notify(osg::INFO); }
inline std::ostream& notify(void) { return notify(osg::INFO); }
};
#endif