From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 23 May 2009 02:42:06 +0000 (+1200)
Subject: Author: vollkommen <vollkommen@gmx.net>
X-Git-Tag: SQUID_3_1_0_8~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1254b974db3e3ec1fdde95968eea2f8beced8473;p=thirdparty%2Fsquid.git

Author: vollkommen <vollkommen@gmx.net>
Remove ssl_error_t CBDataList template instance

clashes with template <int> instantiation for other ACLs.
---

diff --git a/src/acl/SslErrorData.cc b/src/acl/SslErrorData.cc
index eaf001276a..3de564c1c8 100644
--- a/src/acl/SslErrorData.cc
+++ b/src/acl/SslErrorData.cc
@@ -29,7 +29,8 @@ ACLSslErrorData::match(ssl_error_t toFind)
 
 /* explicit instantiation required for some systems */
 /** \cond AUTODOCS-IGNORE */
-template cbdata_type CbDataList<ssl_error_t>::CBDATA_CbDataList;
+// AYJ: 2009-05-20 : Removing. clashes with template <int> instantiation for other ACLs.
+// template cbdata_type CbDataList<ssl_error_t>::CBDATA_CbDataList;
 /** \endcond */
 
 wordlist *