Index: Exception.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/Exception.cc,v
retrieving revision 2.1
diff -u -p -r2.1 Exception.cc
--- Exception.cc	2002/05/01 11:13:15	2.1
+++ Exception.cc	2002/10/27 20:26:11
@@ -20,7 +20,7 @@ Exception::Exception (char const *where,
 }
 
 char const *
-Exception::what() const
+Exception::what() const throw()
 {
   return _message;
 }
Index: Exception.h
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/Exception.h,v
retrieving revision 2.1
diff -u -p -r2.1 Exception.h
--- Exception.h	2002/05/01 11:13:15	2.1
+++ Exception.h	2002/10/27 20:26:11
@@ -23,10 +23,10 @@
 #include <exception>
 
 /* Generic excpetion class for throwing exceptions */
-class Exception : public exception {
+class Exception : public std::exception {
 public:
   Exception (char const *where, char const *message, int appErrNo = 0);
-  char const *what() const;
+  char const *what() const throw();
   int errNo() const;
 private:
   char const *_message;
Index: IniDBBuilderPackage.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/IniDBBuilderPackage.cc,v
retrieving revision 2.13
diff -u -p -r2.13 IniDBBuilderPackage.cc
--- IniDBBuilderPackage.cc	2002/09/21 23:12:23	2.13
+++ IniDBBuilderPackage.cc	2002/10/27 20:26:11
@@ -26,6 +26,9 @@
 #include "LogSingleton.h"
 #include "PackageSpecification.h"
 #include <algorithm>
+
+using std::vector;
+using std::set;
 
 IniDBBuilderPackage::IniDBBuilderPackage (IniParseFeedback const &aFeedback) :
 cp (0), cbpv (), cspv (), currentSpec (0), currentOrList (0), currentAndList (0), trust (0), _feedback (aFeedback){}
Index: IniDBBuilderPackage.h
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/IniDBBuilderPackage.h,v
retrieving revision 2.7
diff -u -p -r2.7 IniDBBuilderPackage.h
--- IniDBBuilderPackage.h	2002/07/15 11:27:03	2.7
+++ IniDBBuilderPackage.h	2002/10/27 20:26:11
@@ -73,8 +73,8 @@ private:
   packagemeta *csp;
   packageversion cspv;
   PackageSpecification *currentSpec;
-  vector<PackageSpecification *> *currentOrList;
-  vector<vector<PackageSpecification *> *> *currentAndList;
+  std::vector<PackageSpecification *> *currentOrList;
+  std::vector<std::vector<PackageSpecification *> *> *currentAndList;
   int trust;
   IniParseFeedback const &_feedback;
 };
Index: IniParseFindVisitor.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/IniParseFindVisitor.cc,v
retrieving revision 2.5
diff -u -p -r2.5 IniParseFindVisitor.cc
--- IniParseFindVisitor.cc	2002/06/26 21:35:15	2.5
+++ IniParseFindVisitor.cc	2002/10/27 20:41:47
@@ -53,7 +53,7 @@ IniParseFindVisitor::visitFile(String co
     {
       // This should never happen
       // If we want to handle it happening, use the log strategy call
-      throw new runtime_error ("IniParseFindVisitor: failed to open ini file, which should never happen");
+      throw new std::runtime_error ("IniParseFindVisitor: failed to open ini file, which should never happen");
       return;
     }
   
Index: LogFile.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/LogFile.cc,v
retrieving revision 2.3
diff -u -p -r2.3 LogFile.cc
--- LogFile.cc	2002/07/05 05:58:56	2.3
+++ LogFile.cc	2002/10/27 20:26:11
@@ -31,6 +31,11 @@ static const char *cvsid =
 #include <time.h>
 #include <string>
 
+using std::set;
+using std::ostream;
+using std::string;
+using std::ostrstream;
+
 /* private helper class */
 class filedef
 {
Index: LogFile.h
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/LogFile.h,v
retrieving revision 2.1
diff -u -p -r2.1 LogFile.h
--- LogFile.h	2002/05/04 12:15:55	2.1
+++ LogFile.h	2002/10/27 20:26:11
@@ -28,7 +28,7 @@ public:
   virtual void exit (int const exit_code) __attribute__ ((noreturn));
   virtual ~LogFile();
   // get a specific verbosity stream.
-  virtual ostream &operator() (enum log_level level);
+  virtual std::ostream &operator() (enum log_level level);
   
 protected:
   LogFile (LogFile const &); // no copy constructor
Index: LogSingleton.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/LogSingleton.cc,v
retrieving revision 2.1
diff -u -p -r2.1 LogSingleton.cc
--- LogSingleton.cc	2002/05/04 12:15:55	2.1
+++ LogSingleton.cc	2002/10/27 20:45:18
@@ -16,6 +16,8 @@
 #include "LogSingleton.h"
 #include <stdexcept>
 
+using std::ostream;
+
 /* Helper functions */
 
 /* End of a Log comment */
@@ -37,7 +39,7 @@ LogSingleton &
 LogSingleton::GetInstance()
 {
   if (!theInstance)
-    throw new invalid_argument ("No instance has been set!");
+    throw new std::invalid_argument ("No instance has been set!");
   return *theInstance;
 }
 
Index: LogSingleton.h
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/LogSingleton.h,v
retrieving revision 2.1
diff -u -p -r2.1 LogSingleton.h
--- LogSingleton.h	2002/05/04 12:15:55	2.1
+++ LogSingleton.h	2002/10/27 20:26:11
@@ -26,7 +26,7 @@ enum log_level {
 };
 
 // Logging class. Default logging level is PLAIN.
-class LogSingleton : public ostream
+class LogSingleton : public std::ostream
 {
 public:
   // Singleton support
@@ -40,9 +40,9 @@ public:
   __attribute__ ((noreturn)) virtual void exit (int const exit_code) = 0;
   virtual ~LogSingleton();
   // get a specific verbosity stream.
-  virtual ostream &operator() (enum log_level level) = 0;
+  virtual std::ostream &operator() (enum log_level level) = 0;
 
-  friend ostream& endLog(ostream& outs);
+  friend std::ostream& endLog(std::ostream& outs);
   
 protected:
   LogSingleton(); // Only child classs can be created.
@@ -54,7 +54,7 @@ private:
 };
 
 /* End of a Log comment */
-extern ostream& endLog(ostream& outs);
+extern std::ostream& endLog(std::ostream& outs);
 //extern ostream& endLog(ostream& outs);
 
 #define log(X) LogSingleton::GetInstance()(X)
Index: PickCategoryLine.h
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/PickCategoryLine.h,v
retrieving revision 2.5
diff -u -p -r2.5 PickCategoryLine.h
--- PickCategoryLine.h	2002/07/07 15:14:49	2.5
+++ PickCategoryLine.h	2002/10/27 20:26:11
@@ -83,7 +83,7 @@ private:
   size_t depth;
   PickCategoryLine (PickCategoryLine const &);
   PickCategoryLine & operator= (PickCategoryLine const &);
-  vector < PickLine * > bucket;
+  std::vector < PickLine * > bucket;
   PickView& theView;
 };
 #endif // _PICKCATEGORYLINE_H_
Index: PickView.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/PickView.cc,v
retrieving revision 2.10
diff -u -p -r2.10 PickView.cc
--- PickView.cc	2002/07/09 06:57:40	2.10
+++ PickView.cc	2002/10/27 20:26:11
@@ -23,6 +23,8 @@
 #include "resource.h"
 #include <algorithm>
 
+using std::vector;
+using std::set;
 
 static PickView::Header pkg_headers[] = {
   {"Current", 7, 0, 0},
Index: String++.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/String++.cc,v
retrieving revision 2.5
diff -u -p -r2.5 String++.cc
--- String++.cc	2002/05/19 03:07:50	2.5
+++ String++.cc	2002/10/27 20:26:11
@@ -24,6 +24,10 @@
 #include <strstream>
 #include <string>
 
+using std::string;
+using std::ostream;
+using std::ostrstream;
+
 // _data
 
 String::_data::_data(_data const &aData) : count (1), theString (new unsigned char[aData.length]), cstr(0), length (aData.length) {
Index: String++.h
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/String++.h,v
retrieving revision 2.7
diff -u -p -r2.7 String++.h
--- String++.h	2002/07/06 13:29:34	2.7
+++ String++.h	2002/10/27 20:26:11
@@ -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) 
Index: category.h
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/category.h,v
retrieving revision 2.6
diff -u -p -r2.6 category.h
--- category.h	2002/07/07 15:14:49	2.6
+++ category.h	2002/10/27 20:26:11
@@ -23,6 +23,6 @@
 #include <utility>
 
 class packagemeta;
-typedef pair <String const, vector <packagemeta *> > Category;
+typedef std::pair <String const, std::vector <packagemeta *> > Category;
 
 #endif /* _CATEGORY_H_ */
Index: choose.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/choose.cc,v
retrieving revision 2.106
diff -u -p -r2.106 choose.cc
--- choose.cc	2002/07/09 06:57:40	2.106
+++ choose.cc	2002/10/27 20:26:11
@@ -58,7 +58,10 @@ static const char *cvsid =
 #include "threebar.h"
 
 #include "download.h"
-  
+
+using std::vector;
+using std::set;
+
 extern ThreeBarProgressPage Progress;
 
 static int initialized = 0;
Index: download.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/download.cc,v
retrieving revision 2.34
diff -u -p -r2.34 download.cc
--- download.cc	2002/09/21 09:36:46	2.34
+++ download.cc	2002/10/27 20:26:12
@@ -53,6 +53,8 @@ static const char *cvsid =
 
 #include "Exception.h"
 
+using std::vector;
+
 extern ThreeBarProgressPage Progress;
 
 
Index: find.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/find.cc,v
retrieving revision 2.5
diff -u -p -r2.5 find.cc
--- find.cc	2002/05/19 03:07:51	2.5
+++ find.cc	2002/10/27 20:41:20
@@ -47,7 +47,7 @@ Find::accept (FindVisitor &aVisitor)
 {
   WIN32_FIND_DATA wfd;
   if (_start_dir.size() > _MAX_PATH)
-    throw new length_error ("starting dir longer than _MAX_PATH");
+    throw new std::length_error ("starting dir longer than _MAX_PATH");
 
   h = FindFirstFile ((_start_dir + "/*").cstr_oneuse(), &wfd);
 
Index: install.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/install.cc,v
retrieving revision 2.52
diff -u -p -r2.52 install.cc
--- install.cc	2002/09/21 09:36:46	2.52
+++ install.cc	2002/10/27 20:26:12
@@ -67,6 +67,9 @@ static const char *cvsid = "\n%%% $Id: i
 #include "Exception.h"
 #include "getopt++/BoolOption.h"
 
+using std::vector;
+using std::exception;
+
 extern ThreeBarProgressPage Progress;
 
 static int total_bytes = 0;
Index: io_stream.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/io_stream.cc,v
retrieving revision 2.14
diff -u -p -r2.14 io_stream.cc
--- io_stream.cc	2002/07/05 08:05:51	2.14
+++ io_stream.cc	2002/10/27 20:42:50
@@ -32,6 +32,8 @@ static const char *cvsid =
 #include "IOStreamProvider.h"
 #include <map>
 
+using std::map;
+
 struct ltstr
 {
   bool operator()(String const &s1, String const &s2) const
@@ -56,7 +58,7 @@ io_stream::registerProvider (IOStreamPro
     }
   theProvider.key = urlPrefix;
   if (providers->find (urlPrefix) != providers->end())
-    throw new invalid_argument ("urlPrefix already registered!");
+    throw new std::invalid_argument ("urlPrefix already registered!");
   (*providers)[urlPrefix] = &theProvider;
   if (urlPrefix.size() > longestPrefix)
     longestPrefix = urlPrefix.size();
@@ -97,7 +99,7 @@ io_stream::open (String const &name, Str
 {
   IOStreamProvider const *p = findProvider (name);
   if (!p)
-    throw new invalid_argument ("URL Scheme not registered!");
+    throw new std::invalid_argument ("URL Scheme not registered!");
   io_stream *rv = p->open (&name.cstr_oneuse()[p->key.size()], mode);
   if (!rv->error ())
     return rv;
@@ -110,7 +112,7 @@ io_stream::mkpath_p (path_type_t isadir,
 {
   IOStreamProvider const *p = findProvider (name);
   if (!p)
-    throw new invalid_argument ("URL Scheme not registered!");
+    throw new std::invalid_argument ("URL Scheme not registered!");
   return p->mkdir_p (isadir, &name.cstr_oneuse()[p->key.size()]);
 }
 
@@ -120,7 +122,7 @@ io_stream::remove (String const &name)
 {
   IOStreamProvider const *p = findProvider (name);
   if (!p)
-    throw new invalid_argument ("URL Scheme not registered!");
+    throw new std::invalid_argument ("URL Scheme not registered!");
   return p->remove (&name.cstr_oneuse()[p->key.size()]);
 }
 
@@ -133,9 +135,9 @@ io_stream::mklink (String const &from, S
   IOStreamProvider const *fromp = findProvider (from);
   IOStreamProvider const *top = findProvider (to);
   if (!fromp || !top)
-    throw new invalid_argument ("URL Scheme not registered!");
+    throw new std::invalid_argument ("URL Scheme not registered!");
   if (fromp != top)
-    throw new invalid_argument ("Attempt to link across url providers.");
+    throw new std::invalid_argument ("Attempt to link across url providers.");
   return fromp->mklink (&from.cstr_oneuse()[fromp->key.size()], 
     			&to.cstr_oneuse()[top->key.size()], linktype);
 }
@@ -197,7 +199,7 @@ io_stream::move (String const &from, Str
   IOStreamProvider const *fromp = findProvider (from);
   IOStreamProvider const *top = findProvider (to);
   if (!fromp || !top)
-    throw new invalid_argument ("URL Scheme not registered!");
+    throw new std::invalid_argument ("URL Scheme not registered!");
   if (fromp != top)
     return io_stream::move_copy (from, to);
   return fromp->move (&from.cstr_oneuse()[fromp->key.size()],
@@ -233,7 +235,7 @@ io_stream::exists (String const &name)
 {
   IOStreamProvider const *p = findProvider (name);
   if (!p)
-    throw new invalid_argument ("URL Scheme not registered!");
+    throw new std::invalid_argument ("URL Scheme not registered!");
   return p->exists (&name.cstr_oneuse()[p->key.size()]);
 }
 
Index: io_stream_file.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/io_stream_file.cc,v
retrieving revision 2.15
diff -u -p -r2.15 io_stream_file.cc
--- io_stream_file.cc	2002/06/26 21:35:16	2.15
+++ io_stream_file.cc	2002/10/27 20:43:21
@@ -246,7 +246,7 @@ io_stream_file::set_mtime (int mtime)
       return 0;
     }
 #else
-  throw new runtime_error ("set_mtime not supported on posix yet.");
+  throw new std::runtime_error ("set_mtime not supported on posix yet.");
 #endif
   return 1;
 }
@@ -280,7 +280,7 @@ io_stream_file::get_size ()
 #else
   struct stat buf;
   if (stat(fname.cstr_oneuse(), &buf))
-    throw new runtime_error ("Failed to stat file - has it been deleted?");
+    throw new std::runtime_error ("Failed to stat file - has it been deleted?");
   return buf.st_size;
 #endif
 }
Index: package_db.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/package_db.cc,v
retrieving revision 2.23
diff -u -p -r2.23 package_db.cc
--- package_db.cc	2002/07/09 06:57:41	2.23
+++ package_db.cc	2002/10/27 20:26:12
@@ -40,6 +40,9 @@ static const char *cvsid =
 #include "package_db.h"
 #include "package_meta.h"
 
+using std::vector;
+using std::set;
+
 /* static members */
 
 packagedb::packagedb ()
Index: package_db.h
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/package_db.h,v
retrieving revision 2.14
diff -u -p -r2.14 package_db.h
--- package_db.h	2002/07/09 06:57:41	2.14
+++ package_db.h	2002/10/27 20:26:12
@@ -40,11 +40,11 @@ public:
   packagemeta * findBinary (PackageSpecification const &) const;
   packagemeta * findSource (PackageSpecification const &) const;
   /* all seen binary packages */
-  static vector < packagemeta *> packages;
+  static std::vector < packagemeta *> packages;
   /* all seen source packages */
-  static vector <packagemeta *> sourcePackages;
+  static std::vector <packagemeta *> sourcePackages;
   /* all seen categories */
-  typedef map <String, vector <packagemeta *>, String::caseless > categoriesType;
+  typedef std::map <String, std::vector <packagemeta *>, String::caseless > categoriesType;
   static categoriesType categories;
   static PackageDBActions task;
 private:
Index: package_meta.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/package_meta.cc,v
retrieving revision 2.31
diff -u -p -r2.31 package_meta.cc
--- package_meta.cc	2002/07/13 14:00:37	2.31
+++ package_meta.cc	2002/10/27 20:26:12
@@ -44,6 +44,9 @@ static const char *cvsid = "\n%%% $Id: p
 
 #include <algorithm>
 
+using std::vector;
+using std::set;
+
 static const char *standard_dirs[] = {
   "bin",
   "etc",
@@ -140,7 +143,7 @@ packagemeta::_actions & packagemeta::_ac
   return *this;
 }
 
-template<class T> struct removeCategory : public unary_function<T, void>
+template<class T> struct removeCategory : public std::unary_function<T, void>
 {
   removeCategory(packagemeta *pkg) : _pkg (pkg) {}
   void operator() (T x) 
@@ -416,7 +419,7 @@ packagemeta::set_action (packageversion 
 }
 
 int
-packagemeta::set_requirements (trusts deftrust = TRUST_CURR, size_t depth = 0)
+packagemeta::set_requirements (trusts deftrust, size_t depth)
 {
   int changed = 0;
   /* handle build-depends */
Index: package_meta.h
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/package_meta.h,v
retrieving revision 2.19
diff -u -p -r2.19 package_meta.h
--- package_meta.h	2002/07/07 15:14:50	2.19
+++ package_meta.h	2002/10/27 20:26:12
@@ -95,8 +95,8 @@ public:
    * of a package disagree.... the first one read in will take precedence.
    */
   void add_category (String const &);
-  set <String, String::caseless> categories;
+  std::set <String, String::caseless> categories;
-  set <packageversion> versions;
+  std::set <packageversion> versions;
 
   /* which one is installed. */
   packageversion installed;
Index: package_source.h
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/package_source.h,v
retrieving revision 2.12
diff -u -p -r2.12 package_source.h
--- package_source.h	2002/07/05 06:30:47	2.12
+++ package_source.h	2002/10/27 20:26:12
@@ -102,7 +102,7 @@ public:
   virtual void set_canonical (char const *);
   virtual void set_cached (String const &);
   class md5 md5;
-  typedef vector <site> sitestype;
+  typedef std::vector <site> sitestype;
   sitestype sites;
 
   virtual ~ packagesource ()
Index: package_version.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/package_version.cc,v
retrieving revision 2.11
diff -u -p -r2.11 package_version.cc
--- package_version.cc	2002/07/15 14:05:01	2.11
+++ package_version.cc	2002/10/27 20:26:12
@@ -28,6 +28,9 @@ static const char *cvsid =
 #include "resource.h"
 #include <algorithm>
 
+using std::vector;
+using std::set;
+
 /* a default class to avoid special casing empty packageversions */
   
 /* TODO place into the class header */
@@ -368,7 +371,7 @@ processOneDependency(trusts deftrust, si
 }
 
 int
-packageversion::set_requirements (trusts deftrust = TRUST_CURR, size_t depth = 0)
+packageversion::set_requirements (trusts deftrust, size_t depth)
 {
   int changed = 0;
   vector <vector <PackageSpecification *> *>::iterator dp = depends ()->begin();
Index: package_version.h
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/package_version.h,v
retrieving revision 2.11
diff -u -p -r2.11 package_version.h
--- package_version.h	2002/07/15 13:29:38	2.11
+++ package_version.h	2002/10/27 20:26:12
@@ -117,7 +117,7 @@ public:
   void setSourcePackageSpecification (PackageSpecification const &);
 
   /* invariant: these never return NULL */
-  vector <vector <PackageSpecification *> *> *depends(), *predepends(), 
+  std::vector <std::vector <PackageSpecification *> *> *depends(), *predepends(), 
   *recommends(), *suggests(), *replaces(), *conflicts(), *provides(), *binaries();
 
   bool picked() const;   /* true if this version is to be installed */
@@ -130,7 +130,7 @@ public:
   /* invariant: never null */
   packagesource *source(); /* where can we source the file from */
   /* invariant: never null */
-  vector <packagesource> *sources(); /* expose the list of files.
+  std::vector <packagesource> *sources(); /* expose the list of files.
 					source() returns the 'default' file
 					sources() allows managing multiple files
 					in a single package
@@ -180,7 +180,7 @@ public:
   virtual PackageSpecification & sourcePackageSpecification ();
   virtual void setSourcePackageSpecification (PackageSpecification const &);
   
-  vector <vector <PackageSpecification *> *> depends, predepends, recommends,
+  std::vector <std::vector <PackageSpecification *> *> depends, predepends, recommends,
   suggests, replaces, conflicts, provides, binaries;
   
   bool picked;	/* non zero if this version is to be installed */
@@ -191,7 +191,7 @@ public:
 
 
   virtual void uninstall () = 0;
-  vector<packagesource> sources; /* where can we source the files from */
+  std::vector<packagesource> sources; /* where can we source the files from */
 
   bool accessible () const;
 
Index: root.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/root.cc,v
retrieving revision 2.11
diff -u -p -r2.11 root.cc
--- root.cc	2002/09/21 09:36:46	2.11
+++ root.cc	2002/10/27 20:26:12
@@ -38,6 +38,8 @@ static const char *cvsid =
 
 #include "getopt++/StringOption.h"
 
+using std::string;
+
 StringOption RootOption ("", 'R', "root", "Root installation directory");
 
 static int rb[] = { IDC_ROOT_TEXT, IDC_ROOT_BINARY, 0 };
Index: site.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/site.cc,v
retrieving revision 2.23
diff -u -p -r2.23 site.cc
--- site.cc	2002/09/21 09:36:46	2.23
+++ site.cc	2002/10/27 20:26:12
@@ -46,6 +46,8 @@ static const char *cvsid =
 extern ThreeBarProgressPage Progress;
 
 #include "getopt++/StringOption.h"
+
+using std::string;
 
 SiteList site_list;
 SiteList all_site_list;
Index: site.h
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/site.h,v
retrieving revision 2.8
diff -u -p -r2.8 site.h
--- site.h	2002/09/21 09:36:46	2.8
+++ site.h	2002/10/27 20:26:12
@@ -73,7 +73,7 @@ public:
   bool operator >= (site_list_type const &) const;
 };
 
-typedef vector <site_list_type> SiteList;
+typedef std::vector <site_list_type> SiteList;
 
 /* user chosen sites */
 extern SiteList site_list;
Index: win32.h
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/win32.h,v
retrieving revision 2.7
diff -u -p -r2.7 win32.h
--- win32.h	2002/04/29 11:07:40	2.7
+++ win32.h	2002/10/30 00:09:45
@@ -31,6 +31,8 @@
 #define WIN32_LEAN_AND_MEAN
 /* We want a minimum IE version of 3 */
 #define _WIN32_IE 0x0300
+/* libstdc++-v3 _really_ dislikes min & max defined as macros. */
+#define NOMINMAX
 #include <windows.h>
 #if HAVE_ALLOCA_H
 #include <alloca.h>
Index: compress_bz.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/compress_bz.cc,v
retrieving revision 2.5
diff -u -p -r2.5 compress_bz.cc
--- compress_bz.cc	2002/06/27 11:48:42	2.5
+++ compress_bz.cc	2002/10/30 00:12:48
@@ -73,7 +73,7 @@ compress_bz::read (void *buffer, size_t 
 
   if (peeklen)
   {
-    ssize_t tmplen = min (peeklen, len);
+    ssize_t tmplen = std::min (peeklen, len);
     peeklen -= tmplen;
     memcpy (buffer, peekbuf, tmplen);
     memmove (peekbuf, peekbuf + tmplen, tmplen);
Index: compress_gz.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/compress_gz.cc,v
retrieving revision 2.6
diff -u -p -r2.6 compress_gz.cc
--- compress_gz.cc	2002/07/05 01:59:34	2.6
+++ compress_gz.cc	2002/10/30 00:13:01
@@ -230,7 +230,7 @@ compress_gz::read (void *buffer, size_t 
 
   if (peeklen)
     {
-      ssize_t tmplen = min (peeklen, len);
+      ssize_t tmplen = std::min (peeklen, len);
       peeklen -= tmplen;
       memcpy (buffer, peekbuf, tmplen);
       memmove (peekbuf, peekbuf + tmplen, tmplen);
Index: archive_tar_file.cc
===================================================================
RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/archive_tar_file.cc,v
retrieving revision 2.5
diff -u -p -r2.5 archive_tar_file.cc
--- archive_tar_file.cc	2002/05/05 04:02:00	2.5
+++ archive_tar_file.cc	2002/10/30 00:33:24
@@ -45,7 +45,7 @@ ssize_t archive_tar_file::read (void *bu
 {
   /* how many bytes do we want to give the user */
   int
-    want = min (len, state.file_length - state.file_offset);
+    want = std::min (len, state.file_length - state.file_offset);
   /* how many do we need to read after that to line up the file pointer */
   int
     roundup = (512 - (want % 512)) % 512;
@@ -84,7 +84,7 @@ ssize_t archive_tar_file::write (const v
 ssize_t archive_tar_file::peek (void *buffer, size_t len)
 {
   int
-    want = min (len, state.file_length - state.file_offset);
+    want = std::min (len, state.file_length - state.file_offset);
   if (want)
     {
       ssize_t