Revert "Issue 4550 (1/2) Avoid "using namespace std;" in included files"

This reverts commit f127e14af04f474d20406ca0e0f76f05061ee103.

18 files changed, 1 insertions, 34 deletions

diff --git a/flower/file-name.cc b/flower/file-name.cc
index 71b3bf27b5..c65d8fc7ed 100644
--- a/flower/file-name.cc
+++ b/flower/file-name.cc
@@ -33,9 +33,6 @@ using namespace std;
 #include <sys/stat.h>
 #endif
 
-using std::string;
-using std::vector;
-
 #ifndef ROOTSEP
 #define ROOTSEP ':'
 #endif
diff --git a/flower/file-path.cc b/flower/file-path.cc
index b2bbb286f3..65cd517e5a 100644
--- a/flower/file-path.cc
+++ b/flower/file-path.cc
@@ -41,9 +41,6 @@
 
 #include <algorithm>
 
-using std::string;
-using std::vector;
-
 vector<string>
 File_path::directories () const
 {
diff --git a/flower/getopt-long.cc b/flower/getopt-long.cc
index 49f7c8831d..9adc0c3592 100644
--- a/flower/getopt-long.cc
+++ b/flower/getopt-long.cc
@@ -36,8 +36,6 @@ gettext (char const *s)
 #include <libintl.h>
 #endif
 
-using std::string;
-
 long
 Getopt_long::get_argument_index ()
 {
diff --git a/flower/include/std-string.hh b/flower/include/std-string.hh
index bdb85795ab..0a34d05049 100644
--- a/flower/include/std-string.hh
+++ b/flower/include/std-string.hh
@@ -36,7 +36,7 @@
 using namespace std;
 
 typedef size_t ssize;
-#define NPOS std::string::npos
+#define NPOS string::npos
 
 string to_string (const string&);
 string to_string (char c, int n = 1);
diff --git a/flower/international.cc b/flower/international.cc
index 21f3ef97a1..1518182a2c 100644
--- a/flower/international.cc
+++ b/flower/international.cc
@@ -32,8 +32,6 @@ gettext (char const *s)
 #include <libintl.h>
 #endif
 
-using std::string;
-
 string
 _ (char const *ch)
 {
diff --git a/flower/interval-set.cc b/flower/interval-set.cc
index acc282bbdb..da857f277c 100644
--- a/flower/interval-set.cc
+++ b/flower/interval-set.cc
@@ -19,8 +19,6 @@
 
 #include "interval-set.hh"
 
-using std::vector;
-
 /*
   A union of intervals in the real line.
 
diff --git a/flower/interval.cc b/flower/interval.cc
index 31cb3914b3..a73da9e788 100644
--- a/flower/interval.cc
+++ b/flower/interval.cc
@@ -21,8 +21,6 @@
 
 #include "interval.tcc"
 
-using std::string;
-
 template<>
 Real
 Interval_t<Real>::infinity ()
diff --git a/flower/offset.cc b/flower/offset.cc
index 2fc9bf9aa6..7cb2677481 100644
--- a/flower/offset.cc
+++ b/flower/offset.cc
@@ -19,8 +19,6 @@
 
 #include "offset.hh"
 
-using std::string;
-
 #ifndef STANDALONE
 string
 Offset::to_string () const
diff --git a/flower/polynomial.cc b/flower/polynomial.cc
index a3f679cd60..ec8605058c 100644
--- a/flower/polynomial.cc
+++ b/flower/polynomial.cc
@@ -24,7 +24,6 @@
 #include <cmath>
 
 using namespace std;
-using std::vector;
 
 /*
   Een beter milieu begint bij uzelf. Hergebruik!
diff --git a/flower/rational.cc b/flower/rational.cc
index e93f65112e..559e1646a0 100644
--- a/flower/rational.cc
+++ b/flower/rational.cc
@@ -27,8 +27,6 @@ using namespace std;
 #include "string-convert.hh"
 #include "libc-extension.hh"
 
-using std::string;
-
 double
 Rational::to_double () const
 {
diff --git a/flower/std-string.cc b/flower/std-string.cc
index b03d3cca59..593a286d84 100644
--- a/flower/std-string.cc
+++ b/flower/std-string.cc
@@ -21,9 +21,6 @@
 #include "string-convert.hh"
 #include "std-vector.hh"
 
-using std::string;
-using std::vector;
-
 string
 to_string (const string &s)
 {
diff --git a/flower/string-convert.cc b/flower/string-convert.cc
index 13788a4a84..e3e8bc824d 100644
--- a/flower/string-convert.cc
+++ b/flower/string-convert.cc
@@ -14,8 +14,6 @@ using namespace std;
 #include "rational.hh"
 #include "std-vector.hh"
 
-using std::string;
-
 /**
    A safe length for stringconversion buffers.
 
diff --git a/flower/test-file-name.cc b/flower/test-file-name.cc
index 04ee34b51f..adbaa52913 100644
--- a/flower/test-file-name.cc
+++ b/flower/test-file-name.cc
@@ -3,7 +3,6 @@
 #include "yaffut-parameters.hh"
 
 using namespace std;
-using std::string;
 
 string slashify (string file_name);
 
diff --git a/flower/test-file-path.cc b/flower/test-file-path.cc
index e55309a3f7..a20364b98c 100644
--- a/flower/test-file-path.cc
+++ b/flower/test-file-path.cc
@@ -6,8 +6,6 @@
 #include "yaffut.hh"
 #include "config.hh"
 
-using std::string;
-
 TEST (File_path, Find)
 {
   char const *extensions[] = {"ly", "", 0};
diff --git a/flower/test-interval-set.cc b/flower/test-interval-set.cc
index 6d8d3823d3..5b4d1f637e 100644
--- a/flower/test-interval-set.cc
+++ b/flower/test-interval-set.cc
@@ -22,7 +22,6 @@
 #include "yaffut.hh"
 
 using namespace std;
-using std::vector;
 
 FUNC (interval_set_union)
 {
diff --git a/flower/test-std.cc b/flower/test-std.cc
index 711e9237b6..4add05a625 100644
--- a/flower/test-std.cc
+++ b/flower/test-std.cc
@@ -7,7 +7,6 @@
 #include "yaffut.hh"
 
 using namespace std;
-using std::vector;
 
 template<typename T>
 void
diff --git a/flower/test-string.cc b/flower/test-string.cc
index f5524bba74..1967d43751 100644
--- a/flower/test-string.cc
+++ b/flower/test-string.cc
@@ -6,8 +6,6 @@
 #include "yaffut.hh"
 
 using namespace std;
-using std::string;
-using std::vector;
 
 FUNC (string_split_join)
 {
diff --git a/flower/warn.cc b/flower/warn.cc
index 422dea8027..f17a36483f 100644
--- a/flower/warn.cc
+++ b/flower/warn.cc
@@ -26,8 +26,6 @@
 #include "international.hh"
 
 using namespace std;
-using std::string;
-using std::vector;
 
 /** We have several different loglevels, each with its own message function(s):
       ERROR: error, non_fatal_error, programming_error