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/11/01 22:03:45
@@ -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.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/11/01 22:03:45
@@ -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: 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/11/01 22:03:45
@@ -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.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/11/01 22:03:45
@@ -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/11/01 22:03:45
@@ -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: 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/11/01 22:03:46
@@ -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/11/01 22:03:46
@@ -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: 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/11/01 22:03:46
@@ -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.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/11/01 22:03:46
@@ -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;
-  set <packageversion> versions;
+  std::set <String, String::caseless> categories;
+  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/11/01 22:03:46
@@ -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.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/11/01 22:03:47
@@ -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: 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/11/01 22:03:47
@@ -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/11/01 22:03:47
@@ -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: 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/11/01 22:03:45
@@ -20,7 +20,7 @@ Exception::Exception (char const *where,
 }
 
 char const *
-Exception::what() const
+Exception::what() const throw()
 {
   return _message;
 }
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/11/01 22:03:46
@@ -44,6 +44,8 @@ static const char *cvsid = "\n%%% $Id: p
 
 #include <algorithm>
 
+using namespace std;
+
 static const char *standard_dirs[] = {
   "bin",
   "etc",
@@ -416,7 +418,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_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/11/01 22:03:47
@@ -28,6 +28,8 @@ static const char *cvsid =
 #include "resource.h"
 #include <algorithm>
 
+using namespace std;
+
 /* a default class to avoid special casing empty packageversions */
   
 /* TODO place into the class header */
@@ -368,7 +370,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();