Summary: MSVC compatability fixes.

Keywords:

Inline a couple of template methods.
Convert an anonymous struct to named.
AuthUser should be a class everywhere.

diff --git a/include/Array.h b/include/Array.h
index cca0ddec2ec2e4ae127b31f48073ce9e6a8a54fa..55163bd7e40441ae9bddcfb38433de1720a392b6 100644 (file)
--- a/include/Array.h
+++ b/include/Array.h
@@ -1,5 +1,5 @@
 /*
- * $Id: Array.h,v 1.12 2003/02/05 10:36:31 robertc Exp $
+ * $Id: Array.h,v 1.13 2003/07/12 12:39:56 robertc Exp $
  *
  * AUTHOR: Alex Rousskov
  *
@@ -56,8 +56,14 @@ template <class C> class VectorIteratorBase {
     bool operator == (VectorIteratorBase const &rhs);
     VectorIteratorBase & operator ++();
     VectorIteratorBase operator ++(int);
-    typename C::value_type & operator *() const;
-    typename C::value_type * operator -> () const;
+    typename C::value_type & operator *() const
+      {
+          return theVector->items[pos];
+      }
+      typename C::value_type * operator -> () const
+      {
+          return &theVector->items[pos];
+      }
     ssize_t operator - (VectorIteratorBase const &rhs) const;
     bool incrementable() const;
   private:

diff --git a/src/authenticate.h b/src/authenticate.h
index 7565a960c2eedd9f12183ff40e5bab7f014dbca1..9a2f87ce86c6bdce3c4a97bb982e1548553bf31e 100644 (file)
--- a/src/authenticate.h
+++ b/src/authenticate.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: authenticate.h,v 1.9 2003/07/11 01:40:36 robertc Exp $
+ * $Id: authenticate.h,v 1.10 2003/07/12 12:39:56 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -66,8 +66,10 @@ struct AuthUserIP
     time_t ip_expiretime;
 };
 
-struct AuthUser
+class AuthUser
 {
+
+public:
     /* extra fields for proxy_auth */
     /* this determines what scheme owns the user data. */
     auth_type_t auth_type;

diff --git a/src/client_side.h b/src/client_side.h
index 72185f5f1de4857041e1fba25e342fc42f9564ae..b15751a1087e7dd3cdf797e398f9639216280d49 100644 (file)
--- a/src/client_side.h
+++ b/src/client_side.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.h,v 1.4 2003/07/11 02:11:47 robertc Exp $
+ * $Id: client_side.h,v 1.5 2003/07/12 12:39:56 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -80,14 +80,16 @@ int parsed_ok:
                      this, aBool);
     }
 
-    struct
+    class DeferredParams
     {
+
+    public:
         clientStreamNode *node;
         HttpReply *rep;
         StoreIOBuffer queuedBuffer;
-    }
+    };
 
-    deferredparams;
+    DeferredParams deferredparams;
     off_t writtenToSocket;
     void pullData();
     off_t getNextRangeOffset() const;

diff --git a/src/typedefs.h b/src/typedefs.h
index 972bd3e0940745ad9b298e6e623b122762acd825..83442b44f1a8f379636699024f33fb056ae9f3ca 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: typedefs.h,v 1.163 2003/07/06 21:50:56 hno Exp $
+ * $Id: typedefs.h,v 1.164 2003/07/12 12:39:56 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -56,7 +56,7 @@ typedef struct _acl_name_list acl_name_list;
 
 typedef struct _acl_deny_info_list acl_deny_info_list;
 
-typedef struct AuthUser auth_user_t;
+typedef class AuthUser auth_user_t;
 
 class AuthUserRequest;
 typedef AuthUserRequest auth_user_request_t;