FG_ to SG_ namespace changes.
This commit is contained in:
parent
17ca0ad2ea
commit
0b31b493d3
41 changed files with 76 additions and 76 deletions
|
@ -36,7 +36,7 @@
|
|||
|
||||
#include <vector>
|
||||
|
||||
FG_USING_STD(vector);
|
||||
SG_USING_STD(vector);
|
||||
|
||||
|
||||
class FGTexParams {
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
|
||||
#include "clipper.hxx"
|
||||
|
||||
FG_USING_STD(cout);
|
||||
SG_USING_STD(cout);
|
||||
|
||||
|
||||
#define MASK_CLIP 1
|
||||
|
|
|
@ -41,8 +41,8 @@
|
|||
#include STL_STRING
|
||||
#include <vector>
|
||||
|
||||
FG_USING_STD(string);
|
||||
FG_USING_STD(vector);
|
||||
SG_USING_STD(string);
|
||||
SG_USING_STD(vector);
|
||||
|
||||
|
||||
#define FG_MAX_AREA_TYPES 128 // FIXME also defined in
|
||||
|
|
|
@ -35,8 +35,8 @@
|
|||
|
||||
#include "genobj.hxx"
|
||||
|
||||
FG_USING_STD(cout);
|
||||
FG_USING_STD(endl);
|
||||
SG_USING_STD(cout);
|
||||
SG_USING_STD(endl);
|
||||
|
||||
|
||||
// calculate the global bounding sphere. Center is the center of the
|
||||
|
|
|
@ -44,8 +44,8 @@
|
|||
#include <Main/construct.hxx>
|
||||
#include <Triangulate/triangle.hxx>
|
||||
|
||||
FG_USING_STD(string);
|
||||
FG_USING_STD(vector);
|
||||
SG_USING_STD(string);
|
||||
SG_USING_STD(vector);
|
||||
|
||||
|
||||
typedef vector < int_list > tex_list;
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
#include <Clipper/clipper.hxx>
|
||||
#include <Triangulate/trieles.hxx>
|
||||
|
||||
FG_USING_STD(string);
|
||||
SG_USING_STD(string);
|
||||
|
||||
|
||||
typedef vector < int_list > belongs_to_list;
|
||||
|
|
|
@ -56,10 +56,10 @@
|
|||
|
||||
#include "construct.hxx"
|
||||
|
||||
FG_USING_STD(cout);
|
||||
FG_USING_STD(endl);
|
||||
FG_USING_STD(string);
|
||||
FG_USING_STD(vector);
|
||||
SG_USING_STD(cout);
|
||||
SG_USING_STD(endl);
|
||||
SG_USING_STD(string);
|
||||
SG_USING_STD(vector);
|
||||
|
||||
vector<string> load_dirs;
|
||||
|
||||
|
|
|
@ -35,8 +35,8 @@
|
|||
|
||||
#include "match.hxx"
|
||||
|
||||
FG_USING_STD(cout);
|
||||
FG_USING_STD(endl);
|
||||
SG_USING_STD(cout);
|
||||
SG_USING_STD(endl);
|
||||
|
||||
|
||||
FGMatch::FGMatch( void ) {
|
||||
|
|
|
@ -34,8 +34,8 @@
|
|||
#define MAXBUF 1024
|
||||
#define BUSY_WAIT_TIME 30
|
||||
|
||||
FG_USING_STD(string);
|
||||
FG_USING_STD(vector);
|
||||
SG_USING_STD(string);
|
||||
SG_USING_STD(vector);
|
||||
|
||||
string work_base = ".";
|
||||
string output_base = ".";
|
||||
|
|
|
@ -27,8 +27,8 @@
|
|||
|
||||
#include "triangle.hxx"
|
||||
|
||||
FG_USING_STD(cout);
|
||||
FG_USING_STD(endl);
|
||||
SG_USING_STD(cout);
|
||||
SG_USING_STD(endl);
|
||||
|
||||
|
||||
// Constructor
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
#include <vector>
|
||||
|
||||
FG_USING_STD(vector);
|
||||
SG_USING_STD(vector);
|
||||
|
||||
|
||||
// a segment is two integer pointers into the node list
|
||||
|
|
|
@ -57,9 +57,9 @@
|
|||
|
||||
#include "array.hxx"
|
||||
|
||||
FG_USING_STD(string);
|
||||
FG_USING_STD(cout);
|
||||
FG_USING_STD(endl);
|
||||
SG_USING_STD(string);
|
||||
SG_USING_STD(cout);
|
||||
SG_USING_STD(endl);
|
||||
|
||||
|
||||
FGArray::FGArray( void ) {
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
#include <simgear/misc/fgstream.hxx>
|
||||
|
||||
|
||||
FG_USING_STD(vector);
|
||||
SG_USING_STD(vector);
|
||||
|
||||
|
||||
#define ARRAY_SIZE 1200
|
||||
|
|
|
@ -57,8 +57,8 @@
|
|||
|
||||
#include "dem.hxx"
|
||||
|
||||
FG_USING_STD(cout);
|
||||
FG_USING_STD(endl);
|
||||
SG_USING_STD(cout);
|
||||
SG_USING_STD(endl);
|
||||
|
||||
|
||||
#define MAX_EX_NODES 10000
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
|
||||
#include <vector>
|
||||
|
||||
FG_USING_STD(vector);
|
||||
SG_USING_STD(vector);
|
||||
|
||||
|
||||
// forward declaration
|
||||
|
|
|
@ -28,8 +28,8 @@
|
|||
|
||||
#include "trisegs.hxx"
|
||||
|
||||
FG_USING_STD(cout);
|
||||
FG_USING_STD(endl);
|
||||
SG_USING_STD(cout);
|
||||
SG_USING_STD(endl);
|
||||
|
||||
|
||||
// Constructor
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
|
||||
#include "trinodes.hxx"
|
||||
|
||||
FG_USING_STD(vector);
|
||||
SG_USING_STD(vector);
|
||||
|
||||
|
||||
// a segment is two integer pointers into the node list
|
||||
|
|
|
@ -27,8 +27,8 @@
|
|||
|
||||
#include "genfans.hxx"
|
||||
|
||||
FG_USING_STD( cout );
|
||||
FG_USING_STD( endl );
|
||||
SG_USING_STD( cout );
|
||||
SG_USING_STD( endl );
|
||||
|
||||
|
||||
// make sure the list is expanded at least to hold "n" and then push
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
|
||||
#include <Triangulate/trieles.hxx>
|
||||
|
||||
FG_USING_STD(vector);
|
||||
SG_USING_STD(vector);
|
||||
|
||||
|
||||
typedef vector < int_list > opt_list;
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
|
||||
#include <Triangulate/trieles.hxx>
|
||||
|
||||
FG_USING_STD(vector);
|
||||
SG_USING_STD(vector);
|
||||
|
||||
|
||||
typedef vector < int_list > opt_list;
|
||||
|
|
|
@ -45,8 +45,8 @@
|
|||
# include <Win32/mkdir.hpp>
|
||||
#endif
|
||||
|
||||
FG_USING_STD( cout );
|
||||
FG_USING_STD( endl );
|
||||
SG_USING_STD( cout );
|
||||
SG_USING_STD( endl );
|
||||
|
||||
|
||||
void write_polygon( const FGPolygon& poly, const string& base ) {
|
||||
|
|
|
@ -29,8 +29,8 @@
|
|||
|
||||
#include "index.hxx"
|
||||
|
||||
FG_USING_STD(cout);
|
||||
FG_USING_STD(endl);
|
||||
SG_USING_STD(cout);
|
||||
SG_USING_STD(endl);
|
||||
|
||||
|
||||
static long int poly_index;
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
#include STL_STRING
|
||||
|
||||
FG_USING_STD(string);
|
||||
SG_USING_STD(string);
|
||||
|
||||
|
||||
// initialize the unique polygon index counter stored in path
|
||||
|
|
|
@ -28,10 +28,10 @@
|
|||
|
||||
#include "names.hxx"
|
||||
|
||||
FG_USING_STD(string);
|
||||
FG_USING_STD(map);
|
||||
FG_USING_STD(cout);
|
||||
FG_USING_STD(endl);
|
||||
SG_USING_STD(string);
|
||||
SG_USING_STD(map);
|
||||
SG_USING_STD(cout);
|
||||
SG_USING_STD(endl);
|
||||
|
||||
|
||||
typedef map<AreaType, string> area_type_map;
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
#include STL_STRING
|
||||
|
||||
FG_USING_STD(string);
|
||||
SG_USING_STD(string);
|
||||
|
||||
|
||||
// Posible shape file types. Note the order of these is important and
|
||||
|
|
|
@ -36,8 +36,8 @@ extern "C" {
|
|||
|
||||
#include "polygon.hxx"
|
||||
|
||||
FG_USING_STD(cout);
|
||||
FG_USING_STD(endl);
|
||||
SG_USING_STD(cout);
|
||||
SG_USING_STD(endl);
|
||||
|
||||
|
||||
// Constructor
|
||||
|
|
|
@ -37,9 +37,9 @@
|
|||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
FG_USING_STD(ostream);
|
||||
FG_USING_STD(string);
|
||||
FG_USING_STD(vector);
|
||||
SG_USING_STD(ostream);
|
||||
SG_USING_STD(string);
|
||||
SG_USING_STD(vector);
|
||||
|
||||
|
||||
#define FG_MAX_VERTICES 1500000
|
||||
|
|
|
@ -28,8 +28,8 @@
|
|||
|
||||
#include "simple_clip.hxx"
|
||||
|
||||
FG_USING_STD(cout);
|
||||
FG_USING_STD(endl);
|
||||
SG_USING_STD(cout);
|
||||
SG_USING_STD(endl);
|
||||
|
||||
#define CLIP_EPSILON 0.000000000001
|
||||
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
#include "simple_clip.hxx"
|
||||
#include "split.hxx"
|
||||
|
||||
FG_USING_STD(cout);
|
||||
SG_USING_STD(cout);
|
||||
|
||||
|
||||
static void clip_and_write_poly( string root, long int p_index, AreaType area,
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
#include "names.hxx"
|
||||
#include "split.hxx"
|
||||
|
||||
FG_USING_STD(cout);
|
||||
SG_USING_STD(cout);
|
||||
|
||||
|
||||
static void clip_and_write_poly( string root, long int p_index, AreaType area,
|
||||
|
|
|
@ -43,8 +43,8 @@
|
|||
|
||||
#include "polygon.hxx"
|
||||
|
||||
FG_USING_STD(string);
|
||||
FG_USING_STD(vector);
|
||||
SG_USING_STD(string);
|
||||
SG_USING_STD(vector);
|
||||
|
||||
|
||||
class FGSuperPoly {
|
||||
|
|
|
@ -10,8 +10,8 @@
|
|||
|
||||
#include "landcover.hxx"
|
||||
|
||||
FG_USING_STD(ifstream);
|
||||
FG_USING_STD(string);
|
||||
SG_USING_STD(ifstream);
|
||||
SG_USING_STD(string);
|
||||
|
||||
LandCover::LandCover( const string &filename )
|
||||
{
|
||||
|
|
|
@ -12,8 +12,8 @@
|
|||
#include STL_STRING
|
||||
#include <fstream>
|
||||
|
||||
FG_USING_STD(ifstream);
|
||||
FG_USING_STD(string);
|
||||
SG_USING_STD(ifstream);
|
||||
SG_USING_STD(string);
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
@ -37,8 +37,8 @@
|
|||
|
||||
#include "point2d.hxx"
|
||||
|
||||
FG_USING_STD(cout);
|
||||
FG_USING_STD(string);
|
||||
SG_USING_STD(cout);
|
||||
SG_USING_STD(string);
|
||||
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
#include <DEM/dem.hxx>
|
||||
|
||||
FG_USING_STD(cout);
|
||||
SG_USING_STD(cout);
|
||||
|
||||
|
||||
// static float dem_data[DEM_SIZE_1][DEM_SIZE_1];
|
||||
|
|
|
@ -33,10 +33,10 @@
|
|||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
FG_USING_STD(cerr);
|
||||
FG_USING_STD(cout);
|
||||
FG_USING_STD(string);
|
||||
FG_USING_STD(vector);
|
||||
SG_USING_STD(cerr);
|
||||
SG_USING_STD(cout);
|
||||
SG_USING_STD(string);
|
||||
SG_USING_STD(vector);
|
||||
|
||||
#include <Polygon/index.hxx>
|
||||
#include <Polygon/names.hxx>
|
||||
|
|
|
@ -36,8 +36,8 @@
|
|||
|
||||
#include "gshhs_split.hxx"
|
||||
|
||||
FG_USING_STD(cout);
|
||||
FG_USING_STD(string);
|
||||
SG_USING_STD(cout);
|
||||
SG_USING_STD(string);
|
||||
|
||||
|
||||
// process shape front end ... split shape into lon = -180 ... 180,
|
||||
|
|
|
@ -42,8 +42,8 @@
|
|||
#include "gshhs.h"
|
||||
#include "gshhs_split.hxx"
|
||||
|
||||
FG_USING_STD( string );
|
||||
FG_USING_STD( cout );
|
||||
SG_USING_STD( string );
|
||||
SG_USING_STD( cout );
|
||||
|
||||
// hackity, hackity, hack ... cough cough
|
||||
#ifdef i386
|
||||
|
|
|
@ -40,8 +40,8 @@
|
|||
#include STL_STRING
|
||||
#include <vector>
|
||||
|
||||
FG_USING_STD(string);
|
||||
FG_USING_STD(vector);
|
||||
SG_USING_STD(string);
|
||||
SG_USING_STD(vector);
|
||||
|
||||
#define FG_MAX_AREA_TYPES 128 // FIXME: also defined in clipper.hxx
|
||||
|
||||
|
|
|
@ -39,8 +39,8 @@
|
|||
# include <Win32/mkdir.hpp>
|
||||
#endif
|
||||
|
||||
FG_USING_STD( cout );
|
||||
FG_USING_STD( string );
|
||||
SG_USING_STD( cout );
|
||||
SG_USING_STD( string );
|
||||
|
||||
// return the type of the shapefile record
|
||||
AreaType get_shapefile_type(DBFHandle& hDBF, int rec) {
|
||||
|
|
|
@ -39,8 +39,8 @@
|
|||
# include <Win32/mkdir.hpp>
|
||||
#endif
|
||||
|
||||
FG_USING_STD( cout );
|
||||
FG_USING_STD( string );
|
||||
SG_USING_STD( cout );
|
||||
SG_USING_STD( string );
|
||||
|
||||
// return the type of the shapefile record
|
||||
AreaType get_shapefile_type(DBFHandle& hDBF, int rec) {
|
||||
|
|
Loading…
Add table
Reference in a new issue