From: hno <>
Date: Sun, 10 Nov 2002 10:40:34 +0000 (+0000)
Subject: C++ requires type casting
X-Git-Tag: SQUID_3_0_PRE1~540
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d74b7307ed25ae4e00a127537a979e2da604588e;p=thirdparty%2Fsquid.git

C++ requires type casting
---

diff --git a/src/fs/aufs/async_io.cc b/src/fs/aufs/async_io.cc
index 8704362e2f..bd725b90b0 100644
--- a/src/fs/aufs/async_io.cc
+++ b/src/fs/aufs/async_io.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: async_io.cc,v 1.17 2002/11/10 02:29:58 hno Exp $
+ * $Id: async_io.cc,v 1.18 2002/11/10 03:40:34 hno Exp $
  *
  * DEBUG: section 32    Asynchronous Disk I/O
  * AUTHOR: Pete Bentley <pete@demon.net>
@@ -228,7 +228,7 @@ aioRead(int fd, int offset, int len, AIOCB * callback, void *callback_data)
     ctrlp->done_handler_data = cbdataReference(callback_data);
     ctrlp->operation = _AIO_READ;
     ctrlp->len = len;
-    ctrlp->bufp = squidaio_xmalloc(len);
+    ctrlp->bufp = (char *)squidaio_xmalloc(len);
     if (offset >= 0)
 	seekmode = SEEK_SET;
     else {
diff --git a/src/fs/aufs/store_io_aufs.cc b/src/fs/aufs/store_io_aufs.cc
index 9177576db8..8a7beb66bb 100644
--- a/src/fs/aufs/store_io_aufs.cc
+++ b/src/fs/aufs/store_io_aufs.cc
@@ -453,12 +453,12 @@ storeAufsIOFreeEntry(void *siop)
     squidaiostate_t *aiostate = (squidaiostate_t *) sio->fsstate;
     struct _queued_write *qw;
     struct _queued_read *qr;
-    while ((qw = linklistShift(&aiostate->pending_writes))) {
+    while ((qw = (struct _queued_write *)linklistShift(&aiostate->pending_writes))) {
 	if (qw->free_func)
 	    qw->free_func(qw->buf);
 	memPoolFree(aufs_qwrite_pool, qw);
     }
-    while ((qr = linklistShift(&aiostate->pending_reads))) {
+    while ((qr = (struct _queued_read *)linklistShift(&aiostate->pending_reads))) {
 	cbdataReferenceDone(qr->callback_data);
 	memPoolFree(aufs_qread_pool, qr);
     }