Index: libgetopt++/include/getopt++/BoolOption.h
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/libgetopt++/include/getopt++/BoolOption.h,v
retrieving revision 1.4
diff -u -p -r1.4 BoolOption.h
--- libgetopt++/include/getopt++/BoolOption.h	2002/04/26 23:46:38	1.4
+++ libgetopt++/include/getopt++/BoolOption.h	2002/10/27 15:36:08
@@ -24,12 +24,12 @@ class BoolOption : public Option
 {
 public:
   BoolOption(bool const defaultvalue, char shortopt, char const *longopt = 0,
-	     string const &shorthelp = string(), 
+	     std::string const &shorthelp = std::string(), 
 	     OptionSet &owner=GetOption::GetInstance());
   virtual ~ BoolOption ();
-  virtual string const shortOption () const;
+  virtual std::string const shortOption () const;
   virtual struct option longOption () const;
-  virtual string const shortHelp () const;
+  virtual std::string const shortHelp () const;
   virtual bool Process (char const *);
   operator bool () const;
  
@@ -39,7 +39,7 @@ private:
   bool _ovalue;
   char _shortopt;
   char const *_longopt;
-  string _shorthelp;
+  std::string _shorthelp;
 };
 
 #endif // _BOOLOPTION_H_
Index: libgetopt++/include/getopt++/Option.h
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/libgetopt++/include/getopt++/Option.h,v
retrieving revision 1.3
diff -u -p -r1.3 Option.h
--- libgetopt++/include/getopt++/Option.h	2002/04/26 23:46:38	1.3
+++ libgetopt++/include/getopt++/Option.h	2002/10/27 15:34:50
@@ -30,9 +30,9 @@ class Option
 {
 public:
   virtual ~ Option ();
-  virtual string const shortOption () const = 0;
+  virtual std::string const shortOption () const = 0;
   virtual struct option longOption () const = 0;
-  virtual string const shortHelp () const = 0;
+  virtual std::string const shortHelp () const = 0;
   virtual bool Process (char const *) = 0;
 
 protected:
Index: libgetopt++/include/getopt++/OptionSet.h
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/libgetopt++/include/getopt++/OptionSet.h,v
retrieving revision 1.3
diff -u -p -r1.3 OptionSet.h
--- libgetopt++/include/getopt++/OptionSet.h	2002/04/26 23:46:38	1.3
+++ libgetopt++/include/getopt++/OptionSet.h	2002/10/27 15:32:13
@@ -28,7 +28,7 @@ public:
   virtual ~OptionSet();
   virtual void Register (Option *);
   virtual bool Process (int argc, char **argv, OptionSet *defaultOptionSet=0);
-  virtual void ParameterUsage (ostream &);
+  virtual void ParameterUsage (std::ostream &);
 protected:
   OptionSet (OptionSet const &);
   OptionSet &operator= (OptionSet const &);
Index: libgetopt++/include/getopt++/StringOption.h
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/libgetopt++/include/getopt++/StringOption.h,v
retrieving revision 1.2
diff -u -p -r1.2 StringOption.h
--- libgetopt++/include/getopt++/StringOption.h	2002/04/26 23:46:38	1.2
+++ libgetopt++/include/getopt++/StringOption.h	2002/10/27 15:40:41
@@ -23,22 +23,22 @@
 class StringOption : public Option
 {
 public:
-  StringOption(string const defaultvalue, char shortopt, char const *longopt = 0,
-	     string const &shorthelp = string(), bool const optional = true,
+  StringOption(std::string const defaultvalue, char shortopt, char const *longopt = 0,
+	     std::string const &shorthelp = std::string(), bool const optional = true,
 	     OptionSet &owner=GetOption::GetInstance());
   virtual ~ StringOption ();
-  virtual string const shortOption () const;
+  virtual std::string const shortOption () const;
   virtual struct option longOption () const;
-  virtual string const shortHelp () const;
+  virtual std::string const shortHelp () const;
   virtual bool Process (char const *);
-  operator string () const;
+  operator std::string () const;
 
 private:
   int _optional;
-  string _value;
+  std::string _value;
   char _shortopt;
   char const *_longopt;
-  string _shorthelp;
+  std::string _shorthelp;
 };
 
 #endif // _STRINGOPTION_H_
Index: libgetopt++/src/BoolOption.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/libgetopt++/src/BoolOption.cc,v
retrieving revision 1.4
diff -u -p -r1.4 BoolOption.cc
--- libgetopt++/src/BoolOption.cc	2002/04/26 23:46:39	1.4
+++ libgetopt++/src/BoolOption.cc	2002/10/27 15:35:46
@@ -16,7 +16,7 @@
 #include <getopt++/BoolOption.h>
 
 BoolOption::BoolOption(bool const defaultvalue, char shortopt, 
-		       char const *longopt, string const &shorthelp, 
+		       char const *longopt, std::string const &shorthelp, 
 		       OptionSet &owner) : _value (defaultvalue) , 
 		       _ovalue (defaultvalue), _shortopt(shortopt), 
 		       _longopt (longopt), _shorthelp (shorthelp)
@@ -26,10 +26,10 @@ BoolOption::BoolOption(bool const defaul
 
 BoolOption::~ BoolOption () {};
 
-string const 
+std::string const 
 BoolOption::shortOption () const
 {
-  return string() + _shortopt;
+  return std::string() + _shortopt;
 }
 
 struct option 
@@ -39,7 +39,7 @@ BoolOption::longOption () const
   return foo;
 }
 
-string const 
+std::string const 
 BoolOption::shortHelp () const
 {
   return _shorthelp;
Index: libgetopt++/src/OptionSet.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/libgetopt++/src/OptionSet.cc,v
retrieving revision 1.4
diff -u -p -r1.4 OptionSet.cc
--- libgetopt++/src/OptionSet.cc	2002/04/26 23:46:39	1.4
+++ libgetopt++/src/OptionSet.cc	2002/10/27 15:39:09
@@ -50,7 +50,7 @@ bool OptionSet::Process (int argc, char 
     }
 //  log (LOG_TIMESTAMP, "Process command line options\n");
   struct option longopts[optCount + 1];
-  string
+  std::string
     shortopts;
   for (int i = 0; i < optCount; ++i)
     {
@@ -114,26 +114,26 @@ OptionSet::Register (Option * anOption)
  * descriptions must be < 40 characters in length
  */
 void
-OptionSet::ParameterUsage (ostream &aStream)
+OptionSet::ParameterUsage (std::ostream &aStream)
 {
   for (int i = 0; i < optCount; ++i)
     {
       Option *anOption = options[i];
-      string output = string() + " -" + anOption->shortOption ()[0];
+      std::string output = std::string() + " -" + anOption->shortOption ()[0];
       output += " --" ;
       output += anOption->longOption ().name;
-      output += string (40 - output.size(), ' ');
-      string helpmsg = anOption->shortHelp();
+      output += std::string (40 - output.size(), ' ');
+      std::string helpmsg = anOption->shortHelp();
       while (helpmsg.size() > 40)
 	{
 	  // TODO: consider using a line breaking class here.
 	  int pos = helpmsg.substr(0,40).find_last_of(" ");
 	  output += helpmsg.substr(0,pos);
 	  helpmsg.erase (0,pos+1);
-	  aStream << output << endl;
-	  output = string (40, ' ');
+	  aStream << output << std::endl;
+	  output = std::string (40, ' ');
 	}
       output += helpmsg;
-      aStream << output << endl;
+      aStream << output << std::endl;
     }
 }
Index: libgetopt++/src/StringOption.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/libgetopt++/src/StringOption.cc,v
retrieving revision 1.2
diff -u -p -r1.2 StringOption.cc
--- libgetopt++/src/StringOption.cc	2002/04/26 23:46:39	1.2
+++ libgetopt++/src/StringOption.cc	2002/10/27 15:41:15
@@ -15,8 +15,8 @@
 
 #include <getopt++/StringOption.h>
 
-StringOption::StringOption(string const defaultvalue, char shortopt, 
-		       char const *longopt, string const &shorthelp, 
+StringOption::StringOption(std::string const defaultvalue, char shortopt, 
+		       char const *longopt, std::string const &shorthelp, 
 		       bool const optional, OptionSet &owner) : 
 		       _value (defaultvalue) , _shortopt(shortopt),
 		       _longopt (longopt), _shorthelp (shorthelp)
@@ -30,10 +30,10 @@ StringOption::StringOption(string const 
 
 StringOption::~ StringOption () {};
 
-string const 
+std::string const 
 StringOption::shortOption () const
 {
-  return string() + _shortopt + ":";
+  return std::string() + _shortopt + ":";
 }
 
 struct option 
@@ -43,7 +43,7 @@ StringOption::longOption () const
   return foo;
 }
 
-string const 
+std::string const 
 StringOption::shortHelp () const
 {
   return _shorthelp;
@@ -56,7 +56,7 @@ StringOption::Process (char const *optar
     _value = optarg;
 }
 
-StringOption::operator string () const
+StringOption::operator std::string () const
 {
   return _value;
 }