Removed all references to using namespace std to help solve compilation problems

under Windows and IRIX.

Also integrated small change to lib3ds from Drew for IRIX compilation.
This commit is contained in:
Robert Osfield
2001-12-14 10:02:27 +00:00
parent f848c54ba3
commit a4e4d4fa7c
14 changed files with 7 additions and 65 deletions

View File

@@ -14,7 +14,7 @@
#include <iostream.h>
#else
#include <iostream>
using namespace std;
using std::istream;
#endif
namespace osgDB {

View File

@@ -16,7 +16,7 @@
#include <fstream.h>
#else
#include <fstream>
using namespace std;
using std::ofstream;
#endif
namespace osgDB {

View File

@@ -22,13 +22,14 @@
#include <string>
/*
#ifdef OSG_USE_IO_DOT_H
#include <iostream.h>
#else
#include <iostream>
using namespace std;
#endif
*/
namespace osgGLUT{
/** A basic viewer base class which provides a window, simple keyboard and mouse interaction.

View File

@@ -7,11 +7,6 @@
#include <dlfcn.h>
#endif
#ifndef OSG_USE_IO_DOT_H
#include <iostream>
using namespace std;
#endif
#include <osg/Notify>
#include <osgDB/DynamicLibrary>

View File

@@ -10,20 +10,8 @@
#include "Record.h"
#include "Registry.h"
#ifdef __sgi
using std::string;
#endif
#ifdef OSG_USE_IO_DOT_H
#include <iostream.h>
#else
#include <iostream>
using namespace std;
#endif
using namespace flt;
FileInput::FileInput()
{
_init();

View File

@@ -15,13 +15,6 @@
#include "Input.h"
#include "RecordVisitor.h"
#ifdef OSG_USE_IO_DOT_H
#include <iostream.h>
#else
#include <iostream>
using namespace std;
#endif
using namespace flt;
////////////////////////////////////////////////////////////////////

View File

@@ -10,19 +10,9 @@
#include "Input.h"
#include "FltFile.h"
#include "Registry.h"
/*
#ifdef OSG_USE_IO_DOT_H
//#include <ostream.h>
#else
#include <iostream>
using namespace std;
#endif
*/
//#include <stdio.h>
using namespace flt;
// static
Registry* Registry::instance()
{

View File

@@ -244,7 +244,7 @@ lib3ds_quat_ln(Lib3dsQuat c)
Lib3dsDouble om,s,t;
s=sqrt(c[0]*c[0] + c[1]*c[1] + c[2]*c[2]);
om=atan2(s,c[3]);
om=atan2(s,(Lib3dsDouble)c[3]);
if (fabs(s)<LIB3DS_EPSILON) {
t=0.0f;
}

View File

@@ -32,13 +32,6 @@
#include <Performer/pr/pfMaterial.h>
#include <Performer/pr/pfTexture.h>
#ifdef OSG_USE_IO_DOT_H
#include <iostream.h>
#else
#include <iostream>
using namespace std;
#endif
extern "C"
{

View File

@@ -29,13 +29,6 @@
#include <Performer/pr/pfMaterial.h>
#include <Performer/pr/pfTexture.h>
#ifdef OSG_USE_IO_DOT_H
#include <iostream.h>
#else
#include <iostream>
using namespace std;
#endif
extern "C"
{

View File

@@ -2,8 +2,6 @@
#include "FTGlyphContainer.h"
#include "FTTextureGlyph.h"
using namespace std;
inline GLuint NextPowerOf2( GLuint in)
{
in -= 1;

View File

@@ -42,7 +42,8 @@ TARGET_INCLUDE_FILES = \
osgText/Text\
osgText/Version
C++FLAGS += -I../../include -I/usr/include/freetype2 -I/usr/local/include/freetype2
C++FLAGS += -I../../include -I/usr/include/freetype2 -I/usr/local/include -I/usr/local/include/freetype2
LDFLAGS += -L/usr/local/lib
include ../../Make/makerules

View File

@@ -15,11 +15,6 @@
#include <float.h>
#include <algorithm>
#ifndef OSG_USE_IO_DOT_H
#include <iostream>
using namespace std;
#endif
using namespace osg;
using namespace osgUtil;

View File

@@ -9,11 +9,6 @@
#include <algorithm>
#include <map>
#ifndef OSG_USE_IO_DOT_H
#include <iostream>
using namespace std;
#endif
using namespace osg;
using namespace osgUtil;