Mercurial > mxe-octave
diff src/log4cxx-3-warnings.patch @ 2465:c5d8bb3beb28
new packages: apr, apr-util, log4cxx
| author | Daniel Stonier <d.stonier@gmail.com> |
|---|---|
| date | Wed, 02 May 2012 17:06:54 +1000 |
| parents | |
| children | a7a203db74c5 |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/log4cxx-3-warnings.patch Wed May 02 17:06:54 2012 +1000 @@ -0,0 +1,20 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +Already applied to log4cxx trunk. + +diff -NBaur vanilla/src/main/include/log4cxx/helpers/objectptr.h mingw_cross/src/main/include/log4cxx/helpers/objectptr.h +--- vanilla/src/main/include/log4cxx/helpers/objectptr.h 2008-04-01 07:34:26.000000000 +0900 ++++ mingw_cross/src/main/include/log4cxx/helpers/objectptr.h 2011-05-09 10:30:03.767560165 +0900 +@@ -28,9 +28,9 @@ + // switching between the initialization styles. + // + #if LOG4CXX_HELGRIND +-#define _LOG4CXX_OBJECTPTR_INIT(x) { exchange(x); ++#define _LOG4CXX_OBJECTPTR_INIT(x) : ObjectPtrBase() { exchange(x); + #else +-#define _LOG4CXX_OBJECTPTR_INIT(x) : p(x) { ++#define _LOG4CXX_OBJECTPTR_INIT(x) : ObjectPtrBase(), p(x) { + #endif + + namespace log4cxx