3 files changed, 7 insertions, 15 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("");
diff --git a/includes/Handle.h b/includes/Handle.h
index 3b9c9dc..6e26e9c 100644
--- a/includes/Handle.h
+++ b/includes/Handle.h
@@ -4,7 +4,7 @@
 
 #include <zlib.h>
 #include <unistd.h>
-#include <iostream.h>
+#include <iostream>
 #include <String.h>
 #include <Exceptions.h>
 
diff --git a/includes/String.h b/includes/String.h
index b53936f..f8db2c7 100644
--- a/includes/String.h
+++ b/includes/String.h
@@ -2,7 +2,7 @@
 #define __STRING_H__
 #ifdef __cplusplus
 
-#include <iostream.h>
+#include <iostream>
 #include <string.h>
 #include <Exceptions.h>
 
@@ -13,10 +13,8 @@ class String : public Base {
       String(char);
       String(int);
       String(unsigned int);
-#ifdef USE_LONGLONG
       String(long long);
       String(unsigned long long);
-#endif
       String(double);
       ~String();
     const char * set(const char *, ...);
@@ -58,8 +56,8 @@ class String : public Base {
     size_t siz;
 };
 
-ostream & operator<<(ostream &, const String &);
-istream & operator>>(istream &, String &);
+std::ostream & operator<<(std::ostream &, const String &);
+std::istream & operator>>(std::istream &, String &);
 
 #else
 #error This only works with a C++ compiler