fly/terragear
1
0
Fork 0
Code Activity

Adapt to current SimGear version (<iostream> include changes by fredb)

Browse source
This commit is contained in:
Ralf Gerlich 2008-06-17 11:06:35 +02:00
parent 4a96ed8af2
commit e813c093fc
31 changed files with 91 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Airports/GenAirports/main.cxx
View file

@ -40,6 +40,10 @@ SG_USING_STD(vector);
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include STL_STRING #include STL_STRING
#include STL_IOSTREAM
SG_USING_STD(cout);
SG_USING_STD(endl);
#include <simgear/constants.h> #include <simgear/constants.h>
#include <simgear/bucket/newbucket.hxx> #include <simgear/bucket/newbucket.hxx>

3
src/BuildTiles/Clipper/clipper.cxx
View file

@ -37,7 +37,10 @@
#include "clipper.hxx" #include "clipper.hxx"
#include STL_IOSTREAM
SG_USING_STD(cout); SG_USING_STD(cout);
SG_USING_STD(endl);
#define MASK_CLIP 1 #define MASK_CLIP 1

1
src/BuildTiles/Main/main.cxx
View file

@ -64,6 +64,7 @@
#include "construct.hxx" #include "construct.hxx"
SG_USING_STD(cout); SG_USING_STD(cout);
SG_USING_STD(cerr);
SG_USING_STD(endl); SG_USING_STD(endl);
SG_USING_STD(string); SG_USING_STD(string);
SG_USING_STD(vector); SG_USING_STD(vector);

6
src/BuildTiles/Main/master.cxx
View file

@ -24,11 +24,14 @@
# include <config.h> # include <config.h>
#endif #endif
#include <simgear/compiler.h>
#include <stdlib.h> // for system() #include <stdlib.h> // for system()
#include <sys/stat.h> // for stat() #include <sys/stat.h> // for stat()
#include <unistd.h> // for stat() #include <unistd.h> // for stat()
#include <string> #include STL_STRING
#include STL_IOSTREAM
#include <simgear/bucket/newbucket.hxx> #include <simgear/bucket/newbucket.hxx>
@ -41,6 +44,7 @@
// #include <Match/match.hxx> // #include <Match/match.hxx>
// #include <Triangulate/triangle.hxx> // #include <Triangulate/triangle.hxx>
SG_USING_STD(string);
SG_USING_STD(cout); SG_USING_STD(cout);
SG_USING_STD(endl); SG_USING_STD(endl);

1
src/BuildTiles/Parallel/server.cxx
View file

@ -28,6 +28,7 @@
SG_USING_STD( cout ); SG_USING_STD( cout );
SG_USING_STD( cerr ); SG_USING_STD( cerr );
SG_USING_STD( endl ); SG_USING_STD( endl );
SG_USING_STD( string );
#if defined (__sun) || defined (__CYGWIN__) || defined(sgi) #if defined (__sun) || defined (__CYGWIN__) || defined(sgi)
# define WAIT_ANY (pid_t)-1 # define WAIT_ANY (pid_t)-1

1
src/Lib/Array/array.cxx
View file

@ -27,6 +27,7 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include STL_IOSTREAM
#include STL_STRING #include STL_STRING
#include <simgear/constants.h> #include <simgear/constants.h>

2
src/Lib/Array/testarray.cxx
View file

@ -1,5 +1,7 @@
#include <simgear/compiler.h>
#include <simgear/bucket/newbucket.hxx> #include <simgear/bucket/newbucket.hxx>
#include STL_IOSTREAM
#include "array.hxx" #include "array.hxx"
SG_USING_STD(cout); SG_USING_STD(cout);

2
src/Lib/DEM/dem.cxx
View file

@ -33,6 +33,8 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include STL_IOSTREAM
#ifdef HAVE_SYS_STAT_H #ifdef HAVE_SYS_STAT_H
# include <sys/stat.h> // stat() # include <sys/stat.h> // stat()
#endif #endif

10
src/Lib/DEM/dem.hxx
View file

@ -34,9 +34,11 @@
# include <config.h> # include <config.h>
#endif #endif
#include <simgear/compiler.h>
#include <simgear/bucket/newbucket.hxx> #include <simgear/bucket/newbucket.hxx>
#include <simgear/misc/sgstream.hxx> #include <simgear/misc/sgstream.hxx>
#include STL_STRING
#define DEM_SIZE 1200 #define DEM_SIZE 1200
#define DEM_SIZE_1 1201 #define DEM_SIZE_1 1201
@ -82,7 +84,7 @@ private:
int z_units; // 1 = feet, 2 = meters int z_units; // 1 = feet, 2 = meters
// return next token from input stream // return next token from input stream
string next_token(); std::string next_token();
// return next integer from input stream // return next integer from input stream
int next_int(); int next_int();
@ -97,13 +99,13 @@ public:
// Constructor // Constructor
TGDem(); TGDem();
TGDem( const string& file ); TGDem( const std::string& file );
// Destructor // Destructor
~TGDem(); ~TGDem();
// open a DEM file (use "-" if input is coming from stdin) // open a DEM file (use "-" if input is coming from stdin)
bool open ( const string& file ); bool open ( const std::string& file );
// close a DEM file // close a DEM file
bool close(); bool close();
@ -120,7 +122,7 @@ public:
// write out the area of data covered by the specified bucket. // write out the area of data covered by the specified bucket.
// Data is written out column by column starting at the lower left // Data is written out column by column starting at the lower left
// hand corner. // hand corner.
bool write_area( const string& root, SGBucket& b, bool compress ); bool write_area( const std::string& root, SGBucket& b, bool compress );
// Informational methods // Informational methods
inline double get_originx() const { return originx; } inline double get_originx() const { return originx; }

4
src/Lib/Geometry/trisegs.cxx
View file

@ -20,10 +20,12 @@
// //
// $Id: trisegs.cxx,v 1.10 2004-11-19 22:25:50 curt Exp $ // $Id: trisegs.cxx,v 1.10 2004-11-19 22:25:50 curt Exp $
#include <simgear/compiler.h>
#include <simgear/constants.h> #include <simgear/constants.h>
#include <simgear/math/point3d.hxx> #include <simgear/math/point3d.hxx>
#include STL_IOSTREAM
#include "trinodes.hxx" #include "trinodes.hxx"
#include "trisegs.hxx" #include "trisegs.hxx"

1
src/Lib/HGT/hgt.cxx
View file

@ -28,6 +28,7 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include <stdlib.h> // atof() #include <stdlib.h> // atof()
#include STL_IOSTREAM
#ifdef SG_HAVE_STD_INCLUDES #ifdef SG_HAVE_STD_INCLUDES
# include <cerrno> # include <cerrno>

4
src/Lib/Polygon/chop-bin.cxx
View file

@ -30,6 +30,10 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include STL_STRING #include STL_STRING
#include STL_IOSTREAM
SG_USING_STD(cout);
SG_USING_STD(endl);
#include <simgear/bucket/newbucket.hxx> #include <simgear/bucket/newbucket.hxx>
#include <simgear/debug/logstream.hxx> #include <simgear/debug/logstream.hxx>

1
src/Lib/e00/e00.cxx
View file

@ -11,6 +11,7 @@
#include <cctype> #include <cctype>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
SG_USING_STD(vector); SG_USING_STD(vector);
SG_USING_STD(map); SG_USING_STD(map);

2
src/Lib/e00/teste00.cxx
View file

@ -4,6 +4,8 @@
# include <config.h> # include <config.h>
#endif #endif
#include <stdlib.h>
#include <simgear/misc/sgstream.hxx> #include <simgear/misc/sgstream.hxx>
#include "e00.hxx" #include "e00.hxx"

14
src/Lib/vpf/table.cxx
View file

@ -1,14 +1,18 @@
// table.cxx - implementation of VpfTable // table.cxx - implementation of VpfTable
// This file is released into the Public Domain, and comes with NO WARRANTY! // This file is released into the Public Domain, and comes with NO WARRANTY!
#include <string> #include <simgear/compiler.h>
#include <fstream>
#include STL_STRING
#include STL_FSTREAM
#include <simgear/misc/zfstream.hxx> // ios_binary #include <simgear/misc/zfstream.hxx> // ios_binary
using std::string; #include <stdlib.h>
using std::ifstream;
using std::istream; SG_USING_STD(string);
SG_USING_STD(ifstream);
SG_USING_STD(istream);
#include "vpfbase.hxx" #include "vpfbase.hxx"
#include "table.hxx" #include "table.hxx"

18
src/Lib/vpf/vpf-topology.cxx
View file

@ -1,14 +1,18 @@
// vpf-topology.cxx - program to dump a topology to output. // vpf-topology.cxx - program to dump a topology to output.
// This file is released into the Public Domain, and comes with NO WARRANTY! // This file is released into the Public Domain, and comes with NO WARRANTY!
#include <iostream> #include <simgear/compiler.h>
using std::cout;
using std::cerr;
using std::endl;
using std::ostream;
#include <string> #include STL_IOSTREAM
using std::string; #include STL_STRING
#include <stdlib.h>
SG_USING_STD(cout);
SG_USING_STD(cerr);
SG_USING_STD(endl);
SG_USING_STD(ostream);
SG_USING_STD(string);
#include "vpf.hxx" #include "vpf.hxx"

2
src/Prep/DemChop/demchop.cxx
View file

@ -27,6 +27,7 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include STL_IOSTREAM
#include STL_STRING #include STL_STRING
#include <simgear/bucket/newbucket.hxx> #include <simgear/bucket/newbucket.hxx>
@ -40,6 +41,7 @@
#include "point2d.hxx" #include "point2d.hxx"
SG_USING_STD(endl);
SG_USING_STD(cout); SG_USING_STD(cout);
SG_USING_STD(string); SG_USING_STD(string);

2
src/Prep/DemChop/fillvoids.cxx
View file

@ -27,6 +27,7 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include STL_STRING #include STL_STRING
#include STL_IOSTREAM
#include <simgear/bucket/newbucket.hxx> #include <simgear/bucket/newbucket.hxx>
#include <simgear/debug/logstream.hxx> #include <simgear/debug/logstream.hxx>
@ -35,6 +36,7 @@
#include <Array/array.hxx> #include <Array/array.hxx>
SG_USING_STD(cout); SG_USING_STD(cout);
SG_USING_STD(endl);
SG_USING_STD(string); SG_USING_STD(string);

2
src/Prep/DemChop/hgtchop.cxx
View file

@ -28,6 +28,7 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include STL_STRING #include STL_STRING
#include STL_IOSTREAM
#include <simgear/bucket/newbucket.hxx> #include <simgear/bucket/newbucket.hxx>
#include <simgear/debug/logstream.hxx> #include <simgear/debug/logstream.hxx>
@ -40,6 +41,7 @@
#endif #endif
SG_USING_STD(cout); SG_USING_STD(cout);
SG_USING_STD(endl);
SG_USING_STD(string); SG_USING_STD(string);

2
src/Prep/DemChop/testassem.cxx
View file

@ -28,6 +28,7 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include STL_STRING #include STL_STRING
#include STL_IOSTREAM
#include <simgear/bucket/newbucket.hxx> #include <simgear/bucket/newbucket.hxx>
#include <simgear/debug/logstream.hxx> #include <simgear/debug/logstream.hxx>
@ -40,6 +41,7 @@
#endif #endif
SG_USING_STD(cout); SG_USING_STD(cout);
SG_USING_STD(endl);
SG_USING_STD(string); SG_USING_STD(string);

6
src/Prep/DemInfo/deminfo.cxx
View file

@ -21,15 +21,19 @@
// $Id: deminfo.cxx,v 1.7 2004-11-19 22:25:51 curt Exp $ // $Id: deminfo.cxx,v 1.7 2004-11-19 22:25:51 curt Exp $
// //
#include <simgear/compiler.h>
#include STL_IOSTREAM
#include STL_STRING
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <string>
#include <DEM/dem.hxx> #include <DEM/dem.hxx>
SG_USING_STD(cout); SG_USING_STD(cout);
SG_USING_STD(string);
// static float dem_data[DEM_SIZE_1][DEM_SIZE_1]; // static float dem_data[DEM_SIZE_1][DEM_SIZE_1];

1
src/Prep/E00Lines/main.cxx
View file

@ -39,6 +39,7 @@
SG_USING_STD(cerr); SG_USING_STD(cerr);
SG_USING_STD(cout); SG_USING_STD(cout);
SG_USING_STD(endl);
SG_USING_STD(string); SG_USING_STD(string);
SG_USING_STD(vector); SG_USING_STD(vector);

2
src/Prep/GSHHS/debug.cxx
View file

@ -30,6 +30,7 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include STL_STRING #include STL_STRING
#include STL_IOSTREAM
#include <zlib.h> #include <zlib.h>
@ -48,6 +49,7 @@
SG_USING_STD(cout); SG_USING_STD(cout);
SG_USING_STD(cin); SG_USING_STD(cin);
SG_USING_STD(endl);
// write result to unique file name // write result to unique file name
void write_result( const TGPolygon& result ) { void write_result( const TGPolygon& result ) {

2
src/Prep/GSHHS/gshhs_split.cxx
View file

@ -27,6 +27,7 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include STL_STRING #include STL_STRING
#include STL_IOSTREAM
#include <simgear/bucket/newbucket.hxx> #include <simgear/bucket/newbucket.hxx>
#include <simgear/debug/logstream.hxx> #include <simgear/debug/logstream.hxx>
@ -39,6 +40,7 @@
#include "gshhs_split.hxx" #include "gshhs_split.hxx"
SG_USING_STD(cout); SG_USING_STD(cout);
SG_USING_STD(endl);
SG_USING_STD(string); SG_USING_STD(string);

2
src/Prep/GSHHS/main.cxx
View file

@ -29,6 +29,7 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include STL_IOSTREAM
#include STL_STRING #include STL_STRING
#include <zlib.h> #include <zlib.h>
@ -47,6 +48,7 @@
SG_USING_STD( string ); SG_USING_STD( string );
SG_USING_STD( cout ); SG_USING_STD( cout );
SG_USING_STD( endl );
// hackity, hackity, hack ... cough cough // hackity, hackity, hack ... cough cough
#ifdef i386 #ifdef i386

2
src/Prep/Photo/photo.cxx
View file

@ -30,6 +30,7 @@
#include <stdlib.h> #include <stdlib.h>
#include STL_STRING #include STL_STRING
#include STL_IOSTREAM
#include <simgear/bucket/newbucket.hxx> #include <simgear/bucket/newbucket.hxx>
#include <simgear/debug/logstream.hxx> #include <simgear/debug/logstream.hxx>
@ -45,6 +46,7 @@
SG_USING_STD(string); SG_USING_STD(string);
SG_USING_STD(cout); SG_USING_STD(cout);
SG_USING_STD(endl);
const int MAX_XDIV = 16; const int MAX_XDIV = 16;

4
src/Prep/Photo/wgs84offset.cxx
View file

@ -1,5 +1,9 @@
// calc wgs84 offset given starting lon/lat/alt, radial and distance // calc wgs84 offset given starting lon/lat/alt, radial and distance
#include <simgear/compiler.h>
#include STL_IOSTREAM
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

2
src/Prep/ShapeFile/shape-decode.cxx
View file

@ -30,6 +30,7 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include STL_STRING #include STL_STRING
#include STL_IOSTREAM
#include <map> #include <map>
#include <simgear/debug/logstream.hxx> #include <simgear/debug/logstream.hxx>
@ -49,6 +50,7 @@
#endif #endif
SG_USING_STD( cout ); SG_USING_STD( cout );
SG_USING_STD( endl );
SG_USING_STD( string ); SG_USING_STD( string );
SG_USING_STD( map ); SG_USING_STD( map );

1
src/Prep/TGVPF/tgvpf.cxx
View file

@ -40,6 +40,7 @@
SG_USING_STD(cerr); SG_USING_STD(cerr);
SG_USING_STD(cout); SG_USING_STD(cout);
SG_USING_STD(endl);
SG_USING_STD(string); SG_USING_STD(string);
SG_USING_STD(vector); SG_USING_STD(vector);

2
src/Prep/Terra/Array.h
View file

@ -1,6 +1,8 @@
#ifndef ARRAY_INCLUDED // -*- C++ -*- #ifndef ARRAY_INCLUDED // -*- C++ -*-
#define ARRAY_INCLUDED #define ARRAY_INCLUDED
#include <string.h>
// //
// Array classes // Array classes
// //

4
src/Prep/UserDef/tguserdef.cxx
View file

@ -13,10 +13,14 @@
#include <Polygon/index.hxx> #include <Polygon/index.hxx>
#include <Polygon/polygon.hxx> #include <Polygon/polygon.hxx>
#include STL_IOSTREAM
#include <stdlib.h> #include <stdlib.h>
#include <vector> #include <vector>
SG_USING_STD(vector); SG_USING_STD(vector);
SG_USING_STD(cerr);
SG_USING_STD(endl);
static string prog_name; static string prog_name;
static string work_dir = "."; static string work_dir = ".";