| From 660fce9cfa00a57e5b7cec46116a31e21595c306 Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Mon, 19 Jun 2017 23:47:01 -0700 |
| Subject: [PATCH] squid: Upgrade to 3.5.26 |
| |
| ../../squid-3.5.26/src/DiskIO/DiskThreads/aiops.cc: In function 'void squidaio_init()': ../../squid-3.5.26/src/DiskIO/DiskThreads/DiskThreads.h:30:50: error: '*' in boolean context, suggest '&&' instead [-Werror=int-in-bool-context] #define NUMTHREADS (Config.cacheSwap.n_configured*16) |
| |
| Upstream-Status: Backport |
| |
| --- |
| src/DiskIO/DiskThreads/aiops.cc | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/src/DiskIO/DiskThreads/aiops.cc b/src/DiskIO/DiskThreads/aiops.cc |
| index b44adfa..e11f948 100644 |
| --- a/src/DiskIO/DiskThreads/aiops.cc |
| +++ b/src/DiskIO/DiskThreads/aiops.cc |
| @@ -290,7 +290,7 @@ squidaio_init(void) |
| /* Create threads and get them to sit in their wait loop */ |
| squidaio_thread_pool = memPoolCreate("aio_thread", sizeof(squidaio_thread_t)); |
| |
| - assert(NUMTHREADS); |
| + assert(NUMTHREADS != 0); |
| |
| for (i = 0; i < NUMTHREADS; ++i) { |
| threadp = (squidaio_thread_t *)squidaio_thread_pool->alloc(); |