2002-11-04 Max Bowsher <maxb@ukf.net>

        * String++.h: Add 'std::' where needed.

diff --git a/ChangeLog b/ChangeLog
index 277e76caae3b2a40d8437be572a91eb4c242b72d..0e7e2fdc1497d895dc938bfa66cb15610d90e1b8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-04  Max Bowsher  <maxb@ukf.net>
+
+       * String++.h: Add 'std::' where needed.
+
 2002-11-04  Max Bowsher  <maxb@ukf.net>
 
        * IniDBBuilderPackage.cc: Add 'using namespace std;'.

diff --git a/String++.h b/String++.h
index 202e2171d8400a1de8d461db5bb951037b0ebc3b..bd8f6f9a7d851988aa6e97e7016b55fc2e9f6a99 100644 (file)
--- a/String++.h
+++ b/String++.h
@@ -33,7 +33,7 @@ public:
   // We're notperformance bottlenecked.
   String (const char *); 
   String (int const);
-  String (string const &);
+  String (std::string const &);
   inline String & operator = (String const &);
   ~String();
   // Up to the user to delete[] these.
@@ -80,8 +80,8 @@ private:
   static String absorb (unsigned char *, size_t);
 };
 
-ostream &
-operator << (ostream &os, String const &theString);
+std::ostream &
+operator << (std::ostream &os, String const &theString);
 
 String::String() : theData (new _data) {}
 String::String(String const &aString) : theData (aString.theData)