This a first set of C++ compatibility patches for MSVC.
- Changed the NULL initialization from (NULL) to = NULL in ACL and auth sources.
Regards
Guido
- ======================================================== Guido Serassio Acme Consulting S.r.l. Via Gorizia, 69 10136 - Torino - ITALY Tel. : +39.011.3249426 Fax. : +39.011.3293665 Email: [EMAIL PROTECTED] WWW: http://www.acmeconsulting.it/
Index: digest/auth_digest.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/auth/digest/auth_digest.cc,v
retrieving revision 1.9
diff -u -p -r1.9 auth_digest.cc
--- digest/auth_digest.cc 11 Jul 2003 02:13:05 -0000 1.9
+++ digest/auth_digest.cc 13 Jul 2003 17:44:46 -0000
@@ -1509,7 +1509,7 @@ authenticateDigestStart(auth_user_reques
}
-MemPool *digest_user_h::Pool(NULL);
+MemPool *digest_user_h::Pool = NULL;
void *
digest_user_h::operator new (size_t byteCount)
{
@@ -1537,7 +1537,7 @@ digest_user_h::deleteSelf() const
digest_user_h::digest_user_h () : username (NULL), HA1created (0)
{}
-MemPool *digest_request_h::Pool(NULL);
+MemPool *digest_request_h::Pool = NULL;
void *
digest_request_h::operator new (size_t byteCount)
{
Index: ntlm/auth_ntlm.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/auth/ntlm/auth_ntlm.cc,v
retrieving revision 1.9
diff -u -p -r1.9 auth_ntlm.cc
--- ntlm/auth_ntlm.cc 11 Jul 2003 02:13:06 -0000 1.9
+++ ntlm/auth_ntlm.cc 13 Jul 2003 17:44:46 -0000
@@ -1235,7 +1235,7 @@ authenticateNTLMAuthenticateUser(auth_us
return;
}
-MemPool *ntlm_request_t::Pool(NULL);
+MemPool *ntlm_request_t::Pool = NULL;
void *
ntlm_request_t::operator new (size_t byteCount)
{Index: ACLCertificateData.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/ACLCertificateData.cc,v
retrieving revision 1.4
diff -u -p -r1.4 ACLCertificateData.cc
--- ACLCertificateData.cc 26 Feb 2003 03:15:19 -0000 1.4
+++ ACLCertificateData.cc 13 Jul 2003 17:20:20 -0000
@@ -39,7 +39,7 @@
#include "authenticate.h"
#include "ACLChecklist.h"
-MemPool *ACLCertificateData::Pool(NULL);
+MemPool *ACLCertificateData::Pool = NULL;
void *
ACLCertificateData::operator new (size_t byteCount)
{
Index: ACLDestinationDomain.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/ACLDestinationDomain.cc,v
retrieving revision 1.4
diff -u -p -r1.4 ACLDestinationDomain.cc
--- ACLDestinationDomain.cc 11 Jul 2003 02:13:04 -0000 1.4
+++ ACLDestinationDomain.cc 13 Jul 2003 17:20:20 -0000
@@ -42,7 +42,7 @@
#include "ACLDomainData.h"
#include "HttpRequest.h"
-MemPool *ACLDestinationDomain::Pool(NULL);
+MemPool *ACLDestinationDomain::Pool = NULL;
void *
ACLDestinationDomain::operator new (size_t byteCount)
{
Index: ACLDestinationIP.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/ACLDestinationIP.cc,v
retrieving revision 1.3
diff -u -p -r1.3 ACLDestinationIP.cc
--- ACLDestinationIP.cc 11 Jul 2003 02:13:04 -0000 1.3
+++ ACLDestinationIP.cc 13 Jul 2003 17:20:20 -0000
@@ -38,7 +38,7 @@
#include "ACLChecklist.h"
#include "HttpRequest.h"
-MemPool *ACLDestinationIP::Pool(NULL);
+MemPool *ACLDestinationIP::Pool = NULL;
void *
ACLDestinationIP::operator new (size_t byteCount)
{
Index: ACLDomainData.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/ACLDomainData.cc,v
retrieving revision 1.3
diff -u -p -r1.3 ACLDomainData.cc
--- ACLDomainData.cc 22 Feb 2003 03:14:29 -0000 1.3
+++ ACLDomainData.cc 13 Jul 2003 17:20:20 -0000
@@ -39,7 +39,7 @@
#include "authenticate.h"
#include "ACLChecklist.h"
-MemPool *ACLDomainData::Pool(NULL);
+MemPool *ACLDomainData::Pool = NULL;
void *
ACLDomainData::operator new (size_t byteCount)
{
Index: ACLExtUser.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/ACLExtUser.cc,v
retrieving revision 1.2
diff -u -p -r1.2 ACLExtUser.cc
--- ACLExtUser.cc 11 Jul 2003 02:13:04 -0000 1.2
+++ ACLExtUser.cc 13 Jul 2003 17:20:20 -0000
@@ -43,7 +43,7 @@
#include "client_side.h"
#include "HttpRequest.h"
-MemPool *ACLExtUser::Pool(NULL);
+MemPool *ACLExtUser::Pool = NULL;
void *
ACLExtUser::operator new (size_t byteCount)
{
Index: ACLIP.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/ACLIP.cc,v
retrieving revision 1.3
diff -u -p -r1.3 ACLIP.cc
--- ACLIP.cc 22 Feb 2003 03:14:29 -0000 1.3
+++ ACLIP.cc 13 Jul 2003 17:20:20 -0000
@@ -368,7 +368,7 @@ ACLIP::~ACLIP()
wordlist *
ACLIP::dump() const
{
- wordlist *w (NULL);
+ wordlist *w = NULL;
data->walk (DumpIpListWalkee, &w);
return w;
}
@@ -399,7 +399,7 @@ ACLIP::match(struct in_addr &clientip)
return !splayLastResult;
}
-MemPool *acl_ip_data::Pool(NULL);
+MemPool *acl_ip_data::Pool = NULL;
void *
acl_ip_data::operator new (size_t byteCount)
{
Index: ACLIdent.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/ACLIdent.cc,v
retrieving revision 1.6
diff -u -p -r1.6 ACLIdent.cc
--- ACLIdent.cc 11 Jul 2003 02:13:04 -0000 1.6
+++ ACLIdent.cc 13 Jul 2003 17:20:20 -0000
@@ -42,7 +42,7 @@
#include "ACLUserData.h"
#include "client_side.h"
-MemPool *ACLIdent::Pool(NULL);
+MemPool *ACLIdent::Pool = NULL;
void *
ACLIdent::operator new (size_t byteCount)
{
Index: ACLMaxConnection.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/ACLMaxConnection.cc,v
retrieving revision 1.1
diff -u -p -r1.1 ACLMaxConnection.cc
--- ACLMaxConnection.cc 26 Feb 2003 03:15:25 -0000 1.1
+++ ACLMaxConnection.cc 13 Jul 2003 17:20:20 -0000
@@ -53,7 +53,7 @@ ACLMaxConnection::ACLMaxConnection (char
ACLMaxConnection::ACLMaxConnection (ACLMaxConnection const & old) :class_
(old.class_), limit (old.limit)
{}
-MemPool *ACLMaxConnection::Pool(NULL);
+MemPool *ACLMaxConnection::Pool = NULL;
void *
ACLMaxConnection::operator new (size_t byteCount)
{
Index: ACLMaxUserIP.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/ACLMaxUserIP.cc,v
retrieving revision 1.2
diff -u -p -r1.2 ACLMaxUserIP.cc
--- ACLMaxUserIP.cc 11 Mar 2003 03:15:57 -0000 1.2
+++ ACLMaxUserIP.cc 13 Jul 2003 17:20:23 -0000
@@ -54,7 +54,7 @@ ACLMaxUserIP::ACLMaxUserIP (char const *
ACLMaxUserIP::ACLMaxUserIP (ACLMaxUserIP const & old) :class_ (old.class_), maximum
(old.maximum), flags (old.flags)
{}
-MemPool *ACLMaxUserIP::Pool(NULL);
+MemPool *ACLMaxUserIP::Pool = NULL;
void *
ACLMaxUserIP::operator new (size_t byteCount)
{
Index: ACLMethodData.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/ACLMethodData.cc,v
retrieving revision 1.1
diff -u -p -r1.1 ACLMethodData.cc
--- ACLMethodData.cc 26 Feb 2003 03:15:30 -0000 1.1
+++ ACLMethodData.cc 13 Jul 2003 17:20:23 -0000
@@ -38,7 +38,7 @@
#include "ACLMethodData.h"
#include "ACLChecklist.h"
-MemPool *ACLMethodData::Pool(NULL);
+MemPool *ACLMethodData::Pool = NULL;
void *
ACLMethodData::operator new (size_t byteCount)
{
Index: ACLMyIP.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/ACLMyIP.cc,v
retrieving revision 1.2
diff -u -p -r1.2 ACLMyIP.cc
--- ACLMyIP.cc 22 Feb 2003 03:14:29 -0000 1.2
+++ ACLMyIP.cc 13 Jul 2003 17:20:23 -0000
@@ -37,7 +37,7 @@
#include "ACLMyIP.h"
#include "ACLChecklist.h"
-MemPool *ACLMyIP::Pool(NULL);
+MemPool *ACLMyIP::Pool = NULL;
void *
ACLMyIP::operator new (size_t byteCount)
{
Index: ACLProtocolData.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/ACLProtocolData.cc,v
retrieving revision 1.1
diff -u -p -r1.1 ACLProtocolData.cc
--- ACLProtocolData.cc 26 Feb 2003 03:15:33 -0000 1.1
+++ ACLProtocolData.cc 13 Jul 2003 17:20:23 -0000
@@ -38,7 +38,7 @@
#include "ACLProtocolData.h"
#include "ACLChecklist.h"
-MemPool *ACLProtocolData::Pool(NULL);
+MemPool *ACLProtocolData::Pool = NULL;
void *
ACLProtocolData::operator new (size_t byteCount)
{
Index: ACLProxyAuth.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/ACLProxyAuth.cc,v
retrieving revision 1.7
diff -u -p -r1.7 ACLProxyAuth.cc
--- ACLProxyAuth.cc 11 Jul 2003 02:13:04 -0000 1.7
+++ ACLProxyAuth.cc 13 Jul 2003 17:20:23 -0000
@@ -43,7 +43,7 @@
#include "client_side.h"
#include "HttpRequest.h"
-MemPool *ACLProxyAuth::Pool(NULL);
+MemPool *ACLProxyAuth::Pool = NULL;
void *
ACLProxyAuth::operator new (size_t byteCount)
{
Index: ACLRegexData.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/ACLRegexData.cc,v
retrieving revision 1.4
diff -u -p -r1.4 ACLRegexData.cc
--- ACLRegexData.cc 26 Feb 2003 03:15:33 -0000 1.4
+++ ACLRegexData.cc 13 Jul 2003 17:20:23 -0000
@@ -40,7 +40,7 @@
#include "ACLChecklist.h"
#include "ACL.h"
-MemPool *ACLRegexData::Pool(NULL);
+MemPool *ACLRegexData::Pool = NULL;
void *
ACLRegexData::operator new (size_t byteCount)
{
Index: ACLReplyHeaderStrategy.h
===================================================================
RCS file: /cvsroot/squid/squid3/src/ACLReplyHeaderStrategy.h,v
retrieving revision 1.2
diff -u -p -r1.2 ACLReplyHeaderStrategy.h
--- ACLReplyHeaderStrategy.h 20 Jun 2003 02:12:58 -0000 1.2
+++ ACLReplyHeaderStrategy.h 13 Jul 2003 17:20:23 -0000
@@ -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 */
Index: ACLRequestHeaderStrategy.h
===================================================================
RCS file: /cvsroot/squid/squid3/src/ACLRequestHeaderStrategy.h,v
retrieving revision 1.5
diff -u -p -r1.5 ACLRequestHeaderStrategy.h
--- ACLRequestHeaderStrategy.h 11 Jul 2003 02:13:04 -0000 1.5
+++ ACLRequestHeaderStrategy.h 13 Jul 2003 17:20:23 -0000
@@ -85,6 +85,6 @@ ACLRequestHeaderStrategy<header>::Instan
}
template <http_hdr_type header>
-ACLRequestHeaderStrategy<header> * ACLRequestHeaderStrategy<header>::Instance_ (NULL);
+ACLRequestHeaderStrategy<header> * ACLRequestHeaderStrategy<header>::Instance_ = NULL;
#endif /* SQUID_REQUESTHEADERSTRATEGY_H */
Index: ACLSourceIP.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/ACLSourceIP.cc,v
retrieving revision 1.2
diff -u -p -r1.2 ACLSourceIP.cc
--- ACLSourceIP.cc 22 Feb 2003 03:14:29 -0000 1.2
+++ ACLSourceIP.cc 13 Jul 2003 17:20:23 -0000
@@ -37,7 +37,7 @@
#include "ACLSourceIP.h"
#include "ACLChecklist.h"
-MemPool *ACLSourceIP::Pool(NULL);
+MemPool *ACLSourceIP::Pool = NULL;
void *
ACLSourceIP::operator new (size_t byteCount)
{
Index: ACLStrategised.h
===================================================================
RCS file: /cvsroot/squid/squid3/src/ACLStrategised.h,v
retrieving revision 1.3
diff -u -p -r1.3 ACLStrategised.h
--- ACLStrategised.h 26 Feb 2003 03:15:34 -0000 1.3
+++ ACLStrategised.h 13 Jul 2003 17:20:23 -0000
@@ -77,7 +77,7 @@ private:
/* implementation follows */
template <class MatchType>
-MemPool *ACLStrategised<MatchType>::Pool(NULL);
+MemPool *ACLStrategised<MatchType>::Pool = NULL;
template <class MatchType>
void *
Index: ACLStringData.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/ACLStringData.cc,v
retrieving revision 1.1
diff -u -p -r1.1 ACLStringData.cc
--- ACLStringData.cc 26 Feb 2003 03:15:37 -0000 1.1
+++ ACLStringData.cc 13 Jul 2003 17:20:23 -0000
@@ -38,7 +38,7 @@
#include "ACLStringData.h"
#include "ACLChecklist.h"
-MemPool *ACLStringData::Pool(NULL);
+MemPool *ACLStringData::Pool = NULL;
void *
ACLStringData::operator new (size_t byteCount)
{
Index: ACLTimeData.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/ACLTimeData.cc,v
retrieving revision 1.2
diff -u -p -r1.2 ACLTimeData.cc
--- ACLTimeData.cc 22 Feb 2003 03:14:29 -0000 1.2
+++ ACLTimeData.cc 13 Jul 2003 17:20:23 -0000
@@ -39,7 +39,7 @@
#include "authenticate.h"
#include "ACLChecklist.h"
-MemPool *ACLTimeData::Pool(NULL);
+MemPool *ACLTimeData::Pool = NULL;
void *
ACLTimeData::operator new (size_t byteCount)
{
Index: ACLUserData.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/ACLUserData.cc,v
retrieving revision 1.6
diff -u -p -r1.6 ACLUserData.cc
--- ACLUserData.cc 7 May 2003 03:14:50 -0000 1.6
+++ ACLUserData.cc 13 Jul 2003 17:20:23 -0000
@@ -39,7 +39,7 @@
#include "authenticate.h"
#include "ACLChecklist.h"
-MemPool *ACLUserData::Pool(NULL);
+MemPool *ACLUserData::Pool = NULL;
void *
ACLUserData::operator new (size_t byteCount)
{
Index: acl.cc
===================================================================
RCS file: /cvsroot/squid/squid3/src/acl.cc,v
retrieving revision 1.17
diff -u -p -r1.17 acl.cc
--- acl.cc 17 May 2003 18:22:42 -0000 1.17
+++ acl.cc 13 Jul 2003 17:20:23 -0000
@@ -668,7 +668,7 @@ acl_access::containsPURGE() const
/* to be split into separate files in the future */
-MemPool *ACLList::Pool(NULL);
+MemPool *ACLList::Pool = NULL;
void *
ACLList::operator new (size_t byteCount)
{
