From: robertc <>
Date: Sun, 10 Aug 2003 13:43:42 +0000 (+0000)
Subject: Summary: Remove use of FreeObject template function for MSVC compatability.
X-Git-Tag: SQUID_3_0_PRE3~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=061c7171eef009400754b45e3214b31eae4c6292;p=thirdparty%2Fsquid.git

Summary: Remove use of FreeObject template function for MSVC compatability.
Keywords:

Remove use of FreeObject template function for MSVC compatability.
---

diff --git a/src/fs/coss/store_dir_coss.cc b/src/fs/coss/store_dir_coss.cc
index 3a5bbc8f9c..c5109a5b85 100644
--- a/src/fs/coss/store_dir_coss.cc
+++ b/src/fs/coss/store_dir_coss.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_dir_coss.cc,v 1.46 2003/07/22 15:23:10 robertc Exp $
+ * $Id: store_dir_coss.cc,v 1.47 2003/08/10 07:43:42 robertc Exp $
  *
  * DEBUG: section 47    Store COSS Directory Routines
  * AUTHOR: Eric Stern
@@ -698,6 +698,13 @@ CossSwapDir::writeCleanDone()
     cleanLog = NULL;
 }
 
+static void
+FreeObject(void *address)
+{
+    StoreSwapLogData *anObject = static_cast <StoreSwapLogData *>(address);
+    delete anObject;
+}
+
 void
 CossSwapDir::logEntry(const StoreEntry & e, int op) const
 {
@@ -718,7 +725,7 @@ CossSwapDir::logEntry(const StoreEntry & e, int op) const
                sizeof(StoreSwapLogData),
                NULL,
                NULL,
-               &FreeObject<StoreSwapLogData>);
+               &FreeObject);
 }
 
 void
diff --git a/src/fs/ufs/store_dir_ufs.cc b/src/fs/ufs/store_dir_ufs.cc
index 4e109ed281..3a215b4d64 100644
--- a/src/fs/ufs/store_dir_ufs.cc
+++ b/src/fs/ufs/store_dir_ufs.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_dir_ufs.cc,v 1.62 2003/08/04 22:14:53 robertc Exp $
+ * $Id: store_dir_ufs.cc,v 1.63 2003/08/10 07:43:42 robertc Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Duane Wessels
@@ -996,6 +996,13 @@ UFSSwapDir::writeCleanDone()
     cleanLog = NULL;
 }
 
+static void
+FreeObject(void *address)
+{
+    StoreSwapLogData *anObject = static_cast <StoreSwapLogData *>(address);
+    delete anObject;
+}
+
 void
 UFSSwapDir::logEntry(const StoreEntry & e, int op) const
 {
@@ -1016,7 +1023,7 @@ UFSSwapDir::logEntry(const StoreEntry & e, int op) const
                sizeof(StoreSwapLogData),
                NULL,
                NULL,
-               FreeObject<StoreSwapLogData>);
+               FreeObject);
 }
 
 static QS rev_int_sort;