fix string type usage

diff --git a/pdns/version.cc b/pdns/version.cc
index e46b49652fb927dff8926e238404129fc35d474b..577d4bb348e2f23cc547e92568240dabbbf97c8d 100644 (file)
--- a/pdns/version.cc
+++ b/pdns/version.cc
@@ -20,8 +20,6 @@
 #include "version.hh"
 #include "version_generated.h"
 
-using namespace std;
-
 static string productName("");
 
 string compilerVersion()
@@ -50,7 +48,7 @@ void showProductVersion()
 
 string fullVersionString()
 {
-  stringstream s;
+  ostringstream s;
   s << "PowerDNS "<<productName<<" "PDNS_VERSION" ("DIST_HOST" built "BUILD_DATE" "BUILD_HOST")";
   return s.str();
 }

diff --git a/pdns/version.hh b/pdns/version.hh
index 26d569ab9143641b120a7af028e47c76a14edc94..09058558da0f5765ce1b2e484b3fb236dd254a27 100644 (file)
--- a/pdns/version.hh
+++ b/pdns/version.hh
@@ -18,12 +18,11 @@
 #ifndef VERSION_HH
 #define VERSION_HH
 
-#include <string>
-#include <sstream>
+#include "namespaces.hh"
 
-std::string compilerVersion();
+string compilerVersion();
 void showProductVersion();
-std::string fullVersionString();
-void versionSetProduct(std::string product);
+string fullVersionString();
+void versionSetProduct(string product);
 
 #endif //!VERSION_HH