Summary: Fixup remaining MSVC issues.

Keywords:

Addresses -

protos.h:
c:\work\nt-3.0\src\protos.h(443) : warning C4190: '<Unknown>' has C-linkage
specified, but returns UDT 'String' which is incompatible with C
         c:\work\nt-3.0\src\squidstring.h(77) : see declaration of 'String'
c:\work\nt-3.0\src\protos.h(444) : warning C4190: '<Unknown>' has C-linkage
specified, but returns UDT 'String' which is incompatible with C
         c:\work\nt-3.0\src\squidstring.h(77) : see declaration of 'String'
c:\work\nt-3.0\src\protos.h(445) : warning C4190: '<Unknown>' has C-linkage
specified, but returns UDT 'String' which is incompatible with C
         c:\work\nt-3.0\src\squidstring.h(77) : see declaration of 'String'
c:\work\nt-3.0\src\protos.h(446) : warning C4190: '<Unknown>' has C-linkage
specified, but returns UDT 'String' which is incompatible with C
         c:\work\nt-3.0\src\squidstring.h(77) : see declaration of 'String'
c:\work\nt-3.0\src\protos.h(447) : warning C4190: '<Unknown>' has C-linkage
specified, but returns UDT 'String' which is incompatible with C
         c:\work\nt-3.0\src\squidstring.h(77) : see declaration of 'String'

protos.h:
c:\work\nt-3.0\src\protos.h(740) : error C2526: 'storeCreate' : C linkage
function cannot return C++ class 'RefCount<class storeIOState>'
c:\work\nt-3.0\src\protos.h(741) : error C2526: 'storeOpen' : C linkage
function cannot return C++ class 'RefCount<class storeIOState>'

typedefs.h:
c:\work\nt-3.0\src\httprequest.h(56) : warning C4099: 'HttpRequest' : type
name first seen using 'struct' now seen using 'class'
         c:\work\nt-3.0\src\typedefs.h(202) : see declaration of 'HttpRequest'

ACLRequestHeaderStrategy.h
c:\work\nt-3.0\src\aclrequestheaderstrategy.h(88) : error C2059: syntax
error : 'constant'

ACLStrategised.h
c:\work\nt-3.0\src\aclreplyheaderstrategy.h(88) : error C2059: syntax error
: 'constant'

ACLReplyHeaderStrategy.h:
c:\work\nt-3.0\src\aclreplyheaderstrategy.h(87) : error C2059: syntax error
: 'constant'

diff --git a/src/ACLReplyHeaderStrategy.h b/src/ACLReplyHeaderStrategy.h
index 03bda903519eaf8f69b4e09cbfa5771c652b1bfc..927524438806220882b1ece58f8d1261cd8e1df4 100644 (file)
--- a/src/ACLReplyHeaderStrategy.h
+++ b/src/ACLReplyHeaderStrategy.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ACLReplyHeaderStrategy.h,v 1.3 2003/07/14 08:21:56 robertc Exp $
+ * $Id: ACLReplyHeaderStrategy.h,v 1.4 2003/08/10 09:53:49 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -84,6 +84,6 @@ ACLReplyHeaderStrategy<header>::Instance()
 }
 
 template <http_hdr_type header>
-ACLReplyHeaderStrategy<header> (* ACLReplyHeaderStrategy<header>::Instance_)(NULL);
+ACLReplyHeaderStrategy<header> * ACLReplyHeaderStrategy<header>::Instance_ = NULL;
 
 #endif /* SQUID_REPLYHEADERSTRATEGY_H */

diff --git a/src/ACLRequestHeaderStrategy.h b/src/ACLRequestHeaderStrategy.h
index 5d418c30c0bd4ae8d860779bc3c5c3456aae289f..1d5ab3666d9bb371209e17a18c9e0a6b69fa9764 100644 (file)
--- a/src/ACLRequestHeaderStrategy.h
+++ b/src/ACLRequestHeaderStrategy.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ACLRequestHeaderStrategy.h,v 1.6 2003/07/14 08:21:56 robertc Exp $
+ * $Id: ACLRequestHeaderStrategy.h,v 1.7 2003/08/10 09:53:49 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -85,6 +85,6 @@ ACLRequestHeaderStrategy<header>::Instance()
 }
 
 template <http_hdr_type header>
-ACLRequestHeaderStrategy<header> (* ACLRequestHeaderStrategy<header>::Instance_) (NULL);
+ACLRequestHeaderStrategy<header> * ACLRequestHeaderStrategy<header>::Instance_ = NULL;
 
 #endif /* SQUID_REQUESTHEADERSTRATEGY_H */

diff --git a/src/ACLStrategised.h b/src/ACLStrategised.h
index e208fa5fdeb453d03f86d70a0483945a4132e2a5..c98ddfd4e1d7742111b7580978a56851b23448e4 100644 (file)
--- a/src/ACLStrategised.h
+++ b/src/ACLStrategised.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ACLStrategised.h,v 1.5 2003/08/04 22:14:40 robertc Exp $
+ * $Id: ACLStrategised.h,v 1.6 2003/08/10 09:53:49 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -76,7 +76,7 @@ private:
 /* implementation follows */
 
 template <class MatchType>
-MemPool (*ACLStrategised<MatchType>::Pool)(NULL);
+MemPool *ACLStrategised<MatchType>::Pool = NULL;
 
 template <class MatchType>
 void *

diff --git a/src/protos.h b/src/protos.h
index c530cd9bd83bb0a7bd45e900217d0f70050cac09..46f90655fa6a4d54468050d8bddc71fd0cefdb04 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: protos.h,v 1.488 2003/08/10 05:11:22 robertc Exp $
+ * $Id: protos.h,v 1.489 2003/08/10 09:53:49 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -439,11 +439,11 @@ SQUIDCEXTERN HttpHdrContRange *httpHeaderGetContRange(const HttpHeader * hdr);
 SQUIDCEXTERN const char *httpHeaderGetStr(const HttpHeader * hdr, http_hdr_type id);
 SQUIDCEXTERN const char *httpHeaderGetLastStr(const HttpHeader * hdr, http_hdr_type id);
 SQUIDCEXTERN const char *httpHeaderGetAuth(const HttpHeader * hdr, http_hdr_type id, const char *auth_scheme);
-SQUIDCEXTERN String httpHeaderGetList(const HttpHeader * hdr, http_hdr_type id);
-SQUIDCEXTERN String httpHeaderGetStrOrList(const HttpHeader * hdr, http_hdr_type id);
-SQUIDCEXTERN String httpHeaderGetByName(const HttpHeader * hdr, const char *name);
-SQUIDCEXTERN String httpHeaderGetListMember(const HttpHeader * hdr, http_hdr_type id, const char *member, const char separator);
-SQUIDCEXTERN String httpHeaderGetByNameListMember(const HttpHeader * hdr, const char *name, const char *member, const char separator);
+extern String httpHeaderGetList(const HttpHeader * hdr, http_hdr_type id);
+extern String httpHeaderGetStrOrList(const HttpHeader * hdr, http_hdr_type id);
+extern String httpHeaderGetByName(const HttpHeader * hdr, const char *name);
+extern String httpHeaderGetListMember(const HttpHeader * hdr, http_hdr_type id, const char *member, const char separator);
+extern String httpHeaderGetByNameListMember(const HttpHeader * hdr, const char *name, const char *member, const char separator);
 SQUIDCEXTERN int httpHeaderDelByName(HttpHeader * hdr, const char *name);
 SQUIDCEXTERN int httpHeaderDelById(HttpHeader * hdr, http_hdr_type id);
 SQUIDCEXTERN void httpHeaderDelAt(HttpHeader * hdr, HttpHeaderPos pos);
@@ -736,8 +736,8 @@ SQUIDCEXTERN void storeReplSetup(void);
 
 /* store_io.c */
 #include "StoreIOState.h"
-SQUIDCEXTERN StoreIOState::Pointer storeCreate(StoreEntry *, STFNCB *, STIOCB *, void *);
-SQUIDCEXTERN StoreIOState::Pointer storeOpen(StoreEntry *, STFNCB *, STIOCB *, void *);
+extern StoreIOState::Pointer storeCreate(StoreEntry *, STFNCB *, STIOCB *, void *);
+extern StoreIOState::Pointer storeOpen(StoreEntry *, STFNCB *, STIOCB *, void *);
 SQUIDCEXTERN void storeClose(StoreIOState::Pointer);
 SQUIDCEXTERN void storeRead(StoreIOState::Pointer, char *, size_t, off_t, STRCB *, void *);
 SQUIDCEXTERN void storeIOWrite(StoreIOState::Pointer, char const *, size_t, off_t, FREE *);

diff --git a/src/typedefs.h b/src/typedefs.h
index 422d91367ad710b9b7255e574014f06566b7aa46..c201769d9c4c10bd1a2ac4b786296bf2995aa01b 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: typedefs.h,v 1.168 2003/07/22 15:23:02 robertc Exp $
+ * $Id: typedefs.h,v 1.169 2003/08/10 09:53:49 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -199,7 +199,7 @@ typedef struct _header_mangler header_mangler;
 
 typedef struct _body_size body_size;
 
-typedef struct HttpRequest request_t;
+class HttpRequest;
 
 typedef struct _AccessLogEntry AccessLogEntry;