1 files changed, 3 insertions, 9 deletions
diff --git a/generic/String.cpp b/generic/String.cpp
index d6a1e01..786c623 100644
--- a/generic/String.cpp
+++ b/generic/String.cpp
@@ -1,13 +1,9 @@
-#include <iostream.h>
+#include <iostream>
 #include <string.h>
 #include <stdarg.h>
 #include "String.h"
 #include "Exceptions.h"
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#else
-#define _(x) x
-#endif
 
 extern "C" {
     double dateCalc(char *, char *);
@@ -47,7 +43,6 @@ String::String(unsigned int i) {
     siz = ::strlen(str);
 }
 
-#ifdef USE_LONGLONG
 String::String(long long l) {
     char t[40];
 
@@ -63,7 +58,6 @@ String::String(unsigned long long l) {
     str = Base::strdup(t);
     siz = ::strlen(str);
 }
-#endif
 
 String::String(double d) {
     char t[30];
@@ -184,11 +178,11 @@ String & String::operator+=(const String & s) {
     return (*this);
 }
 
-ostream & operator<<(ostream & os, const String & s) {
+std::ostream & operator<<(std::ostream & os, const String & s) {
     return (os << s.to_charp());
 }
 
-istream & operator>>(istream & is, String & s) {
+std::istream & operator>>(std::istream & is, String & s) {
     char c = 0;
 
     s.set("");