[GRASS-SVN] r58458 - grass/trunk/imagery/i.atcorr

[svn_grass at osgeo.org]

Author: glynn
Date: 2013-12-14 06:33:08 -0800 (Sat, 14 Dec 2013)
New Revision: 58458

Modified:
   grass/trunk/imagery/i.atcorr/GeomCond.cpp
   grass/trunk/imagery/i.atcorr/common.h
Log:
Eliminate "using namespace std"


Modified: grass/trunk/imagery/i.atcorr/GeomCond.cpp
===================================================================
--- grass/trunk/imagery/i.atcorr/GeomCond.cpp	2013-12-14 14:23:40 UTC (rev 58457)
+++ grass/trunk/imagery/i.atcorr/GeomCond.cpp	2013-12-14 14:33:08 UTC (rev 58458)
@@ -379,7 +379,7 @@
 	landsat(tu);
 	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);
     }
 
 

Modified: grass/trunk/imagery/i.atcorr/common.h
===================================================================
--- grass/trunk/imagery/i.atcorr/common.h	2013-12-14 14:23:40 UTC (rev 58457)
+++ grass/trunk/imagery/i.atcorr/common.h	2013-12-14 14:33:08 UTC (rev 58458)
@@ -10,15 +10,30 @@
 #include <cmath>
 #include <limits>
 #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"
-using namespace std;
 
+
 #ifndef M_PI
 #define M_PI 3.1415926535897932384626433832795
 #endif /* M_PI */
 #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;