Made sure that any #include-instruction comes before the first "using"-declaration, so that we can spot buggy header-files more easily.
This commit is contained in:
parent
4a35fedf64
commit
e4ac5911ae
13 changed files with 38 additions and 40 deletions
|
@ -34,14 +34,14 @@
|
|||
#include <simgear/constants.h>
|
||||
#include <simgear/structure/exception.hxx>
|
||||
|
||||
using std::less;
|
||||
using std::map;
|
||||
|
||||
#include <simgear/constants.h>
|
||||
|
||||
#include "convex_hull.hxx"
|
||||
#include "point2d.hxx"
|
||||
|
||||
using std::less;
|
||||
using std::map;
|
||||
|
||||
|
||||
// stl map typedefs
|
||||
typedef map < double, double, less<double> > map_container;
|
||||
|
|
|
@ -35,16 +35,12 @@
|
|||
|
||||
#include <list>
|
||||
#include <vector>
|
||||
using std::vector;
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
|
||||
using std::cout;
|
||||
using std::endl;
|
||||
|
||||
#include <simgear/constants.h>
|
||||
#include <simgear/bucket/newbucket.hxx>
|
||||
#include <simgear/debug/logstream.hxx>
|
||||
|
@ -61,6 +57,9 @@ using std::endl;
|
|||
# include <Win32/mkdir.hpp>
|
||||
#endif
|
||||
|
||||
using std::vector;
|
||||
using std::cout;
|
||||
using std::endl;
|
||||
|
||||
|
||||
int nudge = 10;
|
||||
|
|
|
@ -90,14 +90,14 @@
|
|||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
using std::string;
|
||||
|
||||
/******************* simgear ********************************/
|
||||
#include <simgear/constants.h>
|
||||
#include <simgear/math/sg_geodesy.hxx>
|
||||
#include <simgear/misc/sg_path.hxx>
|
||||
/************************************************************/
|
||||
|
||||
using std::string;
|
||||
|
||||
|
||||
// Configure the following for your particular directory structure ...
|
||||
const string dafift_base = "/usr/local/share/DAFIFT";
|
||||
|
|
|
@ -32,9 +32,6 @@
|
|||
#include <string>
|
||||
#include <iostream>
|
||||
|
||||
using std::cout;
|
||||
using std::endl;
|
||||
|
||||
#include <simgear/bucket/newbucket.hxx>
|
||||
#include <simgear/debug/logstream.hxx>
|
||||
#include <simgear/structure/exception.hxx>
|
||||
|
@ -49,6 +46,8 @@ using std::endl;
|
|||
#include "simple_clip.hxx"
|
||||
#include "chop.hxx"
|
||||
|
||||
using std::cout;
|
||||
using std::endl;
|
||||
|
||||
static void clip_and_write_poly( string root, long int p_index,
|
||||
const string &poly_type,
|
||||
|
|
|
@ -35,14 +35,14 @@ extern "C" {
|
|||
#include <simgear/math/sg_geodesy.hxx>
|
||||
#include <simgear/structure/exception.hxx>
|
||||
|
||||
using std::endl;
|
||||
|
||||
#include <Geometry/trinodes.hxx>
|
||||
#include <poly2tri/interface.h>
|
||||
|
||||
#include "polygon.hxx"
|
||||
#include "point2d.hxx"
|
||||
|
||||
using std::endl;
|
||||
|
||||
// Constructor
|
||||
TGPolygon::TGPolygon( void )
|
||||
{
|
||||
|
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "vpfbase.hxx"
|
||||
#include "table.hxx"
|
||||
|
||||
using std::string;
|
||||
using std::ifstream;
|
||||
using std::istream;
|
||||
|
||||
#include "vpfbase.hxx"
|
||||
#include "table.hxx"
|
||||
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
|
|
@ -4,12 +4,12 @@
|
|||
#include <iostream>
|
||||
#include <string>
|
||||
|
||||
using std::ostream;
|
||||
using std::string;
|
||||
|
||||
#include "vpfbase.hxx"
|
||||
#include "value.hxx"
|
||||
|
||||
using std::ostream;
|
||||
using std::string;
|
||||
|
||||
VpfValue::VpfValue ()
|
||||
: _raw_type('X'),
|
||||
_element_count(0)
|
||||
|
|
|
@ -17,12 +17,12 @@
|
|||
|
||||
#include <iostream>
|
||||
|
||||
#include "vpf.hxx"
|
||||
|
||||
using std::cout;
|
||||
using std::cerr;
|
||||
using std::endl;
|
||||
|
||||
#include "vpf.hxx"
|
||||
|
||||
|
||||
/**
|
||||
* Get a printable name for a value type.
|
||||
|
|
|
@ -26,14 +26,14 @@
|
|||
#include <iostream>
|
||||
#include <string>
|
||||
|
||||
#include "vpf.hxx"
|
||||
|
||||
using std::string;
|
||||
|
||||
using std::cout;
|
||||
using std::cerr;
|
||||
using std::endl;
|
||||
|
||||
#include "vpf.hxx"
|
||||
|
||||
/**
|
||||
* Get a printable name for a value type.
|
||||
*/
|
||||
|
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "vpf.hxx"
|
||||
|
||||
using std::cout;
|
||||
using std::cerr;
|
||||
using std::endl;
|
||||
using std::ostream;
|
||||
using std::string;
|
||||
|
||||
#include "vpf.hxx"
|
||||
|
||||
|
||||
ostream &
|
||||
operator<< (ostream &output, const VpfRectangle &rect)
|
||||
|
|
|
@ -37,12 +37,6 @@
|
|||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
using std::cerr;
|
||||
using std::cout;
|
||||
using std::endl;
|
||||
using std::string;
|
||||
using std::vector;
|
||||
|
||||
#include <Geometry/rectangle.hxx>
|
||||
#include <Geometry/util.hxx>
|
||||
#include <Polygon/chop.hxx>
|
||||
|
@ -54,6 +48,12 @@ using std::vector;
|
|||
# include <Win32/mkdir.hpp>
|
||||
#endif
|
||||
|
||||
using std::cerr;
|
||||
using std::cout;
|
||||
using std::endl;
|
||||
using std::string;
|
||||
using std::vector;
|
||||
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
#include <plib/sg.h>
|
||||
|
||||
#include <simgear/math/sg_geodesy.hxx>
|
||||
|
||||
using std::cout;
|
||||
using std::endl;
|
||||
|
||||
#include <simgear/math/sg_geodesy.hxx>
|
||||
|
||||
int main( int argc, char **argv ) {
|
||||
|
||||
if ( argc != 11 ) {
|
||||
|
|
|
@ -38,12 +38,6 @@
|
|||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
using std::cerr;
|
||||
using std::cout;
|
||||
using std::endl;
|
||||
using std::string;
|
||||
using std::vector;
|
||||
|
||||
#include <Geometry/line.hxx>
|
||||
#include <Geometry/util.hxx>
|
||||
#include <Polygon/chop.hxx>
|
||||
|
@ -55,6 +49,12 @@ using std::vector;
|
|||
# include <Win32/mkdir.hpp>
|
||||
#endif
|
||||
|
||||
using std::cerr;
|
||||
using std::cout;
|
||||
using std::endl;
|
||||
using std::string;
|
||||
using std::vector;
|
||||
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
|
Loading…
Reference in a new issue