Eliminate "using namespace std"

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@58455 15284696-431f-4ddb-bdfa-cd5b030d7da7

include/iostream/ami_stream.h

@@ -51,7 +51,12 @@
 
 #include <cstring>
 #include <iostream>
-using namespace std;
+using std::cout;
+using std::cerr;
+using std::endl;
+using std::ostream;
+using std::ofstream;
+using std::istream;
 
 extern "C" {
 #include <grass/gis.h>

include/iostream/empq_impl.h

@@ -39,7 +39,6 @@
 
 #include <ostream>
 #include <vector>
-using namespace std;
 
 #include "empq.h"
 

include/iostream/mem_stream.h

@@ -42,7 +42,6 @@
 
 #include <cstring>
 #include <iostream>
-using namespace std;
 
 template<class T>
 class MEM_STREAM {

include/iostream/minmaxheap.h

@@ -47,7 +47,6 @@
 #endif
 
 #include <sstream>
-using namespace std;
 
 #include "mm_utils.h"
 #include "ami_config.h"  //for SAVE_MEMORY flag

include/iostream/queue.h

@@ -38,7 +38,6 @@
 
 #include <assert.h>
 #include <iostream>
-using namespace std;
 
 template<class T> 
 class queue {

raster/r.terraflow/3scan.h

@@ -20,7 +20,6 @@
 #define __3SCAN_H
 
 #include <iostream>
-using namespace std;
 
 #include <grass/iostream/ami.h>
 #include "types.h"

raster/r.terraflow/ccforest.h

@@ -22,7 +22,6 @@
 
 #include <assert.h>
 #include <iostream>
-using namespace std;
 
 #include <grass/iostream/ami.h>
 

raster/r.terraflow/common.cpp

@@ -30,7 +30,6 @@
 #endif
 
 #include <iostream>
-using namespace std;
 
 #include "common.h"
 

raster/r.terraflow/common.h

@@ -22,7 +22,6 @@
 
 #include <sys/types.h>
 #include <iostream>
-using namespace std;
 
 #include <grass/iostream/ami.h>
 

raster/r.terraflow/direction.cpp

@@ -53,11 +53,11 @@ encodeDirectionMFD(const genericWindow<elevation_type>& elevwin,
   
   if(!is_nodata(elevwin.get())) {
     dir = 0;
-    if (elevwin.get(5) < elevwin.get() && !elevation_type_is_void(elevwin.get(5))) dir |= 1;
-    if (elevwin.get(3) < elevwin.get() && !elevation_type_is_void(elevwin.get(3))) dir |= 16;
+    if (elevwin.get(5) < elevwin.get() && !is_void(elevwin.get(5))) dir |= 1;
+    if (elevwin.get(3) < elevwin.get() && !is_void(elevwin.get(3))) dir |= 16;
     for(int i=0; i<3; i++) {
-      if(elevwin.get(i) < elevwin.get() && !elevation_type_is_void(elevwin.get(i))) dir |= 32<<i;
-      if(elevwin.get(i+6) < elevwin.get() && !elevation_type_is_void(elevwin.get(6+i))) dir |= 8>>i;
+      if(elevwin.get(i) < elevwin.get() && !is_void(elevwin.get(i))) dir |= 32<<i;
+      if(elevwin.get(i+6) < elevwin.get() && !is_void(elevwin.get(6+i))) dir |= 8>>i;
     }
   }
   

raster/r.terraflow/direction.h

@@ -28,7 +28,6 @@
 #include <ostream.h>
 #endif
 
-using namespace std;
 
 #include <grass/iostream/ami.h>
 

raster/r.terraflow/nodata.cpp

@@ -73,7 +73,7 @@ is_nodata(float x) {
 
 
 int
-elevation_type_is_void(elevation_type el) {
+is_void(elevation_type el) {
   return (el == nodataType::ELEVATION_NODATA);
 }
 

raster/r.terraflow/nodata.h

@@ -37,7 +37,7 @@
 int is_nodata(elevation_type el);
 int is_nodata(int x);
 int is_nodata(float x);
-int elevation_type_is_void(elevation_type el);
+int is_void(elevation_type el);
 
 
 class nodataType : public ijBaseType {

raster/r.terraflow/sortutils.h

@@ -20,7 +20,6 @@
 #define SORTUTILS_H
 
 #include <fstream>
-using namespace std;
 
 #include <grass/iostream/ami.h>
 #include "common.h"

raster/r.terraflow/stats.h

@@ -24,7 +24,6 @@
 
 #include <fstream>
 #include <iostream>
-using namespace std;
 
 #include <grass/iostream/ami.h>
 

raster/r.terraflow/streamutils.h

@@ -20,7 +20,6 @@
 #define STREAMUTILS_H
 
 #include <fstream>
-using namespace std;
 
 #include <grass/iostream/ami.h>
 #include "types.h"

raster/r.terraflow/types.cpp

@@ -37,8 +37,8 @@ ijBaseType::compare(const ijBaseType &a, const ijBaseType &b) {
 
 
 
-ostream&
-operator << (ostream& s, const ijBaseType &p) {
+std::ostream&
+operator << (std::ostream& s, const ijBaseType &p) {
   return s << "(" << p.i << "," << p.j << ")";
 }
 

raster/r.terraflow/types.h

@@ -21,7 +21,6 @@
 
 #include <limits.h>
 #include <iostream>
-using namespace std;
 
 
 /* input parameters type */
@@ -118,7 +117,7 @@ public:
   friend int operator!=(const ijBaseType &a, const ijBaseType &b) {
 	return (compare(a,b) != 0);
   }
-  friend ostream& operator << (ostream& s, const ijBaseType &p);
+  friend std::ostream& operator << (std::ostream& s, const ijBaseType &p);
   static int compare(const ijBaseType &a, const ijBaseType &b);
 };
 

raster/r.terraflow/unionFind.h

@@ -23,7 +23,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <iostream>
-using namespace std;
 
 /* initial range guesstimate */
 #define UNION_INITIAL_SIZE 2000

raster/r.terraflow/water.cpp

@@ -19,7 +19,6 @@
 
 #include <assert.h>
 #include <iostream>
-using namespace std;
 
 #include <grass/iostream/ami.h>
 

raster/r.viewshed/rbbst.cpp

@@ -104,7 +104,7 @@ RBTree *create_tree(TreeValue tv)
 }
 
 /*LT: not sure if this is correct */
-int rbtree_is_empty(RBTree * t)
+int is_empty(RBTree * t)
 {
     assert(t);
     return (t->root == NIL);

raster/r.viewshed/rbbst.h

@@ -96,7 +96,7 @@ TreeNode *search_for_node_with_key(RBTree * rbt, double key);
 double find_max_gradient_within_key(RBTree * rbt, double key, double angle, double gradient);
 
 /*LT: not sure if this is correct */
-int rbtree_is_empty(RBTree * t);
+int is_empty(RBTree * t);
 
 
 

raster/r.viewshed/statusstructure.cpp

@@ -98,7 +98,7 @@ long long get_active_str_size_bytes(GridHeader * hd)
     G_verbose_message(_(" (key=%d, ptr=%d, total node=%d B)"),
 	   (int)sizeof(TreeValue),
 	   (int)sizeof(TreeNode *), (int)sizeof(TreeNode));
-    sizeBytes = sizeof(TreeNode) * max(hd->ncols, hd->nrows);
+    sizeBytes = sizeof(TreeNode) * std::max(hd->ncols, hd->nrows);
     G_verbose_message(_(" Total= %lld B"), sizeBytes);
     return sizeBytes;
 }
@@ -292,7 +292,7 @@ double find_max_gradient_in_status_struct(StatusList * sl, double dist, double a
     assert(sl);
     /*note: if there is nothing in the status struccture, it means this
        cell is VISIBLE */
-    if (status_list_is_empty(sl))
+    if (is_empty(sl))
 	return SMALLEST_GRADIENT;
     /*it is also possible that the status structure is not empty, but
        there are no events with key < dist ---in this case it returns
@@ -301,9 +301,9 @@ double find_max_gradient_in_status_struct(StatusList * sl, double dist, double a
 }
 
 /*returns true if it is empty */
-int status_list_is_empty(StatusList * sl)
+int is_empty(StatusList * sl)
 {
     assert(sl);
-    return (rbtree_is_empty(sl->rbt) ||
+    return (is_empty(sl->rbt) ||
 	    sl->rbt->root->value.maxGradient == SMALLEST_GRADIENT);
 }

raster/r.viewshed/statusstructure.h

@@ -89,7 +89,7 @@ StatusList *create_status_struct();
 void delete_status_structure(StatusList * sl);
 
 /*returns true is it is empty */
-int status_list_is_empty(StatusList * sl);
+int is_empty(StatusList * sl);
 
 
 /*delete the statusNode with the given key */