From: Alex Rousskov Date: Tue, 24 Aug 2010 22:05:52 +0000 (-0600) Subject: Possible fix for an OpenSolaris "pureparm" compilation error. X-Git-Tag: take1~330 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a3855a074aa33881ee4453310b8619e38bbd06d7;p=thirdparty%2Fsquid.git Possible fix for an OpenSolaris "pureparm" compilation error. Our CallJobHere1() macro tried to help the compiler to determine the right JobMemFun() profile by explicitly specifying the first JobMemFun() template argument type. There is a second template argument in the CallJobHere1 case, but we cannot specify it explicitly. Apparently, OpenSolaris compiler got confused, perhaps justifiably so, by only one template argument specified. This change removes the explicit first template parameter from the JobMemFun() call inside the CallJobHere1(). It does not seem to be required for GCC on RHEL5. Tests will show what other compilers think. --- diff --git a/src/base/AsyncJobCalls.h b/src/base/AsyncJobCalls.h index ef9a285f4b..23434a1a1a 100644 --- a/src/base/AsyncJobCalls.h +++ b/src/base/AsyncJobCalls.h @@ -59,7 +59,7 @@ CallJob(int debugSection, int debugLevel, const char *fileName, int fileLine, #define CallJobHere1(debugSection, debugLevel, job, Class, method, arg1) \ CallJob((debugSection), (debugLevel), __FILE__, __LINE__, \ (#Class "::" #method), \ - JobMemFun((job), &Class::method, (arg1))) + JobMemFun((job), &Class::method, (arg1))) /// Convenience macro to create a Dialer-based job callback