Cleaned up errors and warnings, mostly namespace problems with cout
and cerr, but also some SimGear linking problems.
This commit is contained in:
parent
b0a62b8c67
commit
d2b2afc33d
17 changed files with 36 additions and 6 deletions
|
@ -27,6 +27,9 @@
|
|||
|
||||
#include "clipper.hxx"
|
||||
|
||||
SG_USING_STD(cout);
|
||||
SG_USING_STD(endl);
|
||||
|
||||
|
||||
int main( int argc, char **argv ) {
|
||||
point2d global_min, global_max;
|
||||
|
|
|
@ -19,7 +19,7 @@ fgfs_construct_LDADD = \
|
|||
$(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
|
||||
$(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
|
||||
-lsgbucket -lsgio -lsgmath -lsgmisc -lsgdebug -lsgxml \
|
||||
-lplibsg -lgenpolyclip -lz
|
||||
-lplibsg -lplibul -lgenpolyclip -lz
|
||||
|
||||
fgfs_master_SOURCES = master.cxx
|
||||
|
||||
|
|
|
@ -38,6 +38,9 @@
|
|||
// #include <Match/match.hxx>
|
||||
// #include <Triangulate/triangle.hxx>
|
||||
|
||||
SG_USING_STD(cout);
|
||||
SG_USING_STD(endl);
|
||||
|
||||
|
||||
// return true if file exists
|
||||
static bool file_exists( const string& file ) {
|
||||
|
|
|
@ -71,4 +71,4 @@ int main()
|
|||
cout << "OS Grid Reference = " << OSGridRef.x() << ", " << OSGridRef.y() << "\n\n";
|
||||
*/
|
||||
return(0);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -58,4 +58,4 @@ bool isInUK(Point3D p)
|
|||
inUK = false;
|
||||
|
||||
return(inUK);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -22,4 +22,4 @@
|
|||
|
||||
//Returns true if a point is within the mainland UK, excluding
|
||||
//Northern Ireland. Requires lat and lon to be passed in degrees.
|
||||
bool isInUK(Point3D p);
|
||||
bool isInUK(Point3D p);
|
||||
|
|
|
@ -33,6 +33,9 @@
|
|||
|
||||
#include <simgear/bucket/newbucket.hxx>
|
||||
|
||||
SG_USING_STD(cout);
|
||||
SG_USING_STD(endl);
|
||||
|
||||
|
||||
#define MAXBUF 1024
|
||||
#define BUSY_WAIT_TIME 30
|
||||
|
|
|
@ -2,6 +2,9 @@
|
|||
|
||||
#include "array.hxx"
|
||||
|
||||
SG_USING_STD(cout);
|
||||
SG_USING_STD(endl);
|
||||
|
||||
int main( int argc, char **argv ) {
|
||||
double lon, lat;
|
||||
|
||||
|
|
|
@ -44,6 +44,8 @@ extern "C" {
|
|||
#include "trinodes.hxx"
|
||||
#include "trisegs.hxx"
|
||||
|
||||
SG_USING_STD(cout);
|
||||
SG_USING_STD(endl);
|
||||
|
||||
// Given a line segment specified by two endpoints p1 and p2, return
|
||||
// the slope of the line.
|
||||
|
|
|
@ -226,6 +226,6 @@ private:
|
|||
|
||||
};
|
||||
|
||||
#endif __E00_HXX
|
||||
#endif // __E00_HXX
|
||||
|
||||
// end of e00.hxx
|
||||
|
|
|
@ -7,6 +7,10 @@
|
|||
#include <simgear/misc/sgstream.hxx>
|
||||
#include "e00.hxx"
|
||||
|
||||
SG_USING_STD(cerr);
|
||||
SG_USING_STD(cout);
|
||||
SG_USING_STD(endl);
|
||||
|
||||
int main (int ac, const char ** av)
|
||||
{
|
||||
int i, j, k;
|
||||
|
|
|
@ -80,6 +80,6 @@ private:
|
|||
long HEIGHT;
|
||||
};
|
||||
|
||||
#endif __LANDCOVER_HXX
|
||||
#endif // __LANDCOVER_HXX
|
||||
|
||||
// end of landcover.hxx
|
||||
|
|
|
@ -51,6 +51,9 @@
|
|||
# define FLIP
|
||||
#endif
|
||||
|
||||
SG_USING_STD(cout);
|
||||
SG_USING_STD(cin);
|
||||
|
||||
// return the type of the shapefile record
|
||||
AreaType get_shapefile_type(int rec) {
|
||||
string area;
|
||||
|
|
|
@ -39,6 +39,8 @@
|
|||
|
||||
#include "merger.hxx"
|
||||
|
||||
SG_USING_STD(cout);
|
||||
|
||||
// Constructor
|
||||
FGMerger::FGMerger( void ) {
|
||||
}
|
||||
|
|
|
@ -28,6 +28,9 @@
|
|||
|
||||
#include "merger.hxx"
|
||||
|
||||
SG_USING_STD(cout);
|
||||
SG_USING_STD(endl);
|
||||
|
||||
int main( int argc, char **argv ) {
|
||||
point2d global_min, global_max;
|
||||
|
||||
|
|
|
@ -41,6 +41,7 @@
|
|||
#include <Polygon/polygon.hxx>
|
||||
|
||||
SG_USING_STD(string);
|
||||
SG_USING_STD(cout);
|
||||
|
||||
|
||||
const int MAX_XDIV = 16;
|
||||
|
|
|
@ -4,6 +4,9 @@
|
|||
|
||||
#include <simgear/math/sg_geodesy.hxx>
|
||||
|
||||
SG_USING_STD(cout);
|
||||
SG_USING_STD(endl);
|
||||
|
||||
int main( int argc, char **argv ) {
|
||||
|
||||
if ( argc != 6 ) {
|
||||
|
|
Loading…
Add table
Reference in a new issue