[GRASS-SVN] r68990 - in grass/branches/releasebranch_6_4: include/iostream raster/r.terraflow
svn_grass at osgeo.org
svn_grass at osgeo.org
Sat Jul 16 14:57:04 PDT 2016
Author: neteler
Date: 2016-07-16 14:57:04 -0700 (Sat, 16 Jul 2016)
New Revision: 68990
Modified:
grass/branches/releasebranch_6_4/include/iostream/ami_stream.h
grass/branches/releasebranch_6_4/include/iostream/empq_impl.h
grass/branches/releasebranch_6_4/include/iostream/mem_stream.h
grass/branches/releasebranch_6_4/include/iostream/minmaxheap.h
grass/branches/releasebranch_6_4/include/iostream/queue.h
grass/branches/releasebranch_6_4/raster/r.terraflow/3scan.h
grass/branches/releasebranch_6_4/raster/r.terraflow/ccforest.h
grass/branches/releasebranch_6_4/raster/r.terraflow/common.cpp
grass/branches/releasebranch_6_4/raster/r.terraflow/common.h
grass/branches/releasebranch_6_4/raster/r.terraflow/direction.h
grass/branches/releasebranch_6_4/raster/r.terraflow/sortutils.h
grass/branches/releasebranch_6_4/raster/r.terraflow/stats.h
grass/branches/releasebranch_6_4/raster/r.terraflow/streamutils.h
grass/branches/releasebranch_6_4/raster/r.terraflow/types.cpp
grass/branches/releasebranch_6_4/raster/r.terraflow/types.h
grass/branches/releasebranch_6_4/raster/r.terraflow/unionFind.h
grass/branches/releasebranch_6_4/raster/r.terraflow/water.cpp
Log:
r.terraflow: Eliminate 'using namespace std' (trunk, r58455), needed for gcc6
Modified: grass/branches/releasebranch_6_4/include/iostream/ami_stream.h
===================================================================
--- grass/branches/releasebranch_6_4/include/iostream/ami_stream.h 2016-07-16 21:49:07 UTC (rev 68989)
+++ grass/branches/releasebranch_6_4/include/iostream/ami_stream.h 2016-07-16 21:57:04 UTC (rev 68990)
@@ -32,7 +32,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;
#include <grass/config.h>
Modified: grass/branches/releasebranch_6_4/include/iostream/empq_impl.h
===================================================================
--- grass/branches/releasebranch_6_4/include/iostream/empq_impl.h 2016-07-16 21:49:07 UTC (rev 68989)
+++ grass/branches/releasebranch_6_4/include/iostream/empq_impl.h 2016-07-16 21:57:04 UTC (rev 68990)
@@ -36,7 +36,6 @@
#define __EMPQ_IMPL_H
#include <ostream>
-using namespace std;
#include "empq.h"
Modified: grass/branches/releasebranch_6_4/include/iostream/mem_stream.h
===================================================================
--- grass/branches/releasebranch_6_4/include/iostream/mem_stream.h 2016-07-16 21:49:07 UTC (rev 68989)
+++ grass/branches/releasebranch_6_4/include/iostream/mem_stream.h 2016-07-16 21:57:04 UTC (rev 68990)
@@ -25,7 +25,6 @@
#include <cstring>
#include <iostream>
-using namespace std;
template<class T>
class MEM_STREAM {
Modified: grass/branches/releasebranch_6_4/include/iostream/minmaxheap.h
===================================================================
--- grass/branches/releasebranch_6_4/include/iostream/minmaxheap.h 2016-07-16 21:49:07 UTC (rev 68989)
+++ grass/branches/releasebranch_6_4/include/iostream/minmaxheap.h 2016-07-16 21:57:04 UTC (rev 68990)
@@ -45,7 +45,6 @@
#endif
#include <sstream>
-using namespace std;
#include "mm_utils.h"
#include "ami_config.h" //for SAVE_MEMORY flag
Modified: grass/branches/releasebranch_6_4/include/iostream/queue.h
===================================================================
--- grass/branches/releasebranch_6_4/include/iostream/queue.h 2016-07-16 21:49:07 UTC (rev 68989)
+++ grass/branches/releasebranch_6_4/include/iostream/queue.h 2016-07-16 21:57:04 UTC (rev 68990)
@@ -21,7 +21,6 @@
#include <assert.h>
#include <iostream>
-using namespace std;
template<class T>
class queue {
Modified: grass/branches/releasebranch_6_4/raster/r.terraflow/3scan.h
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.terraflow/3scan.h 2016-07-16 21:49:07 UTC (rev 68989)
+++ grass/branches/releasebranch_6_4/raster/r.terraflow/3scan.h 2016-07-16 21:57:04 UTC (rev 68990)
@@ -20,7 +20,6 @@
#define __3SCAN_H
#include <iostream>
-using namespace std;
#include <grass/iostream/ami.h>
#include "types.h"
Modified: grass/branches/releasebranch_6_4/raster/r.terraflow/ccforest.h
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.terraflow/ccforest.h 2016-07-16 21:49:07 UTC (rev 68989)
+++ grass/branches/releasebranch_6_4/raster/r.terraflow/ccforest.h 2016-07-16 21:57:04 UTC (rev 68990)
@@ -22,7 +22,6 @@
#include <assert.h>
#include <iostream>
-using namespace std;
#include <grass/iostream/ami.h>
Modified: grass/branches/releasebranch_6_4/raster/r.terraflow/common.cpp
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.terraflow/common.cpp 2016-07-16 21:49:07 UTC (rev 68989)
+++ grass/branches/releasebranch_6_4/raster/r.terraflow/common.cpp 2016-07-16 21:57:04 UTC (rev 68990)
@@ -30,7 +30,6 @@
#endif
#include <iostream>
-using namespace std;
#include "common.h"
Modified: grass/branches/releasebranch_6_4/raster/r.terraflow/common.h
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.terraflow/common.h 2016-07-16 21:49:07 UTC (rev 68989)
+++ grass/branches/releasebranch_6_4/raster/r.terraflow/common.h 2016-07-16 21:57:04 UTC (rev 68990)
@@ -22,7 +22,6 @@
#include <sys/types.h>
#include <iostream>
-using namespace std;
#include <grass/iostream/ami.h>
Modified: grass/branches/releasebranch_6_4/raster/r.terraflow/direction.h
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.terraflow/direction.h 2016-07-16 21:49:07 UTC (rev 68989)
+++ grass/branches/releasebranch_6_4/raster/r.terraflow/direction.h 2016-07-16 21:57:04 UTC (rev 68990)
@@ -28,7 +28,6 @@
#include <ostream.h>
#endif
-using namespace std;
#include <grass/iostream/ami.h>
Modified: grass/branches/releasebranch_6_4/raster/r.terraflow/sortutils.h
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.terraflow/sortutils.h 2016-07-16 21:49:07 UTC (rev 68989)
+++ grass/branches/releasebranch_6_4/raster/r.terraflow/sortutils.h 2016-07-16 21:57:04 UTC (rev 68990)
@@ -20,7 +20,6 @@
#define SORTUTILS_H
#include <fstream>
-using namespace std;
#include <grass/iostream/ami.h>
#include "common.h"
Modified: grass/branches/releasebranch_6_4/raster/r.terraflow/stats.h
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.terraflow/stats.h 2016-07-16 21:49:07 UTC (rev 68989)
+++ grass/branches/releasebranch_6_4/raster/r.terraflow/stats.h 2016-07-16 21:57:04 UTC (rev 68990)
@@ -24,7 +24,6 @@
#include <fstream>
#include <iostream>
-using namespace std;
#include <grass/iostream/ami.h>
Modified: grass/branches/releasebranch_6_4/raster/r.terraflow/streamutils.h
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.terraflow/streamutils.h 2016-07-16 21:49:07 UTC (rev 68989)
+++ grass/branches/releasebranch_6_4/raster/r.terraflow/streamutils.h 2016-07-16 21:57:04 UTC (rev 68990)
@@ -20,7 +20,6 @@
#define STREAMUTILS_H
#include <fstream>
-using namespace std;
#include <grass/iostream/ami.h>
#include "types.h"
Modified: grass/branches/releasebranch_6_4/raster/r.terraflow/types.cpp
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.terraflow/types.cpp 2016-07-16 21:49:07 UTC (rev 68989)
+++ grass/branches/releasebranch_6_4/raster/r.terraflow/types.cpp 2016-07-16 21:57:04 UTC (rev 68990)
@@ -37,8 +37,8 @@
-ostream&
-operator << (ostream& s, const ijBaseType &p) {
+std::ostream&
+operator << (std::ostream& s, const ijBaseType &p) {
return s << "(" << p.i << "," << p.j << ")";
}
Modified: grass/branches/releasebranch_6_4/raster/r.terraflow/types.h
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.terraflow/types.h 2016-07-16 21:49:07 UTC (rev 68989)
+++ grass/branches/releasebranch_6_4/raster/r.terraflow/types.h 2016-07-16 21:57:04 UTC (rev 68990)
@@ -21,7 +21,6 @@
#include <limits.h>
#include <iostream>
-using namespace std;
/* input parameters type */
@@ -118,7 +117,7 @@
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);
};
Modified: grass/branches/releasebranch_6_4/raster/r.terraflow/unionFind.h
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.terraflow/unionFind.h 2016-07-16 21:49:07 UTC (rev 68989)
+++ grass/branches/releasebranch_6_4/raster/r.terraflow/unionFind.h 2016-07-16 21:57:04 UTC (rev 68990)
@@ -23,7 +23,6 @@
#include <stdlib.h>
#include <string.h>
#include <iostream>
-using namespace std;
/* initial range guesstimate */
#define UNION_INITIAL_SIZE 2000
Modified: grass/branches/releasebranch_6_4/raster/r.terraflow/water.cpp
===================================================================
--- grass/branches/releasebranch_6_4/raster/r.terraflow/water.cpp 2016-07-16 21:49:07 UTC (rev 68989)
+++ grass/branches/releasebranch_6_4/raster/r.terraflow/water.cpp 2016-07-16 21:57:04 UTC (rev 68990)
@@ -19,7 +19,6 @@
#include <assert.h>
#include <iostream>
-using namespace std;
#include <grass/iostream/ami.h>
More information about the grass-commit
mailing list