Browse Source

Eliminate "using namespace std"

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@58458 15284696-431f-4ddb-bdfa-cd5b030d7da7
Glynn Clements 11 years ago
parent
commit
fcbefa6289
2 changed files with 19 additions and 4 deletions
  1. 1 1
      imagery/i.atcorr/GeomCond.cpp
  2. 18 3
      imagery/i.atcorr/common.h

+ 1 - 1
imagery/i.atcorr/GeomCond.cpp

@@ -379,7 +379,7 @@ void GeomCond::parse()
 	landsat(tu);
 	landsat(tu);
 	break;
 	break;
     }
     }
-    default: G_fatal_error(_("Unsupported/unreadable format in control file (found igeom=%d)"), igeom);
+    default: G_fatal_error(_("Unsupported/unreadable format in control file (found igeom=%ld)"), igeom);
     }
     }
 
 
 
 

+ 18 - 3
imagery/i.atcorr/common.h

@@ -10,15 +10,30 @@
 #include <cmath>
 #include <cmath>
 #include <limits>
 #include <limits>
 #include <iomanip>
 #include <iomanip>
+
+using std::string;
+
+using std::ios;
+using std::ifstream;
+using std::ofstream;
+using std::ostringstream;
+using std::cin;
+using std::cout;
+using std::cerr;
+using std::endl;
+using std::setprecision;
+using std::setw;
+using std::ends;
+
+using std::numeric_limits;
+
 #include "Output.h"
 #include "Output.h"
-using namespace std;
+
 
 
 #ifndef M_PI
 #ifndef M_PI
 #define M_PI 3.1415926535897932384626433832795
 #define M_PI 3.1415926535897932384626433832795
 #endif /* M_PI */
 #endif /* M_PI */
 #define M_PI2 6.283185307179586476925286766559
 #define M_PI2 6.283185307179586476925286766559
-#define MIN(X,Y) ((X) <= (Y) ? (X) : (Y))
-#define ROUND(X) ((X) - (int)(X) < 0.5 ? (int)(X) : (int)((X)+1))
 
 
 const long int nt	= 26;
 const long int nt	= 26;