No problem at all. I don’t speak either svn or git very well. I’ll modify a JIRA, and you should get the update notice. I do wonder, these patches are against the last official release, not the svn tip.
I deleted from the diff some files that seem to be either part of the XCode build or have to do with where the files are on my drives. On Nov 22, 2012, at 01:18, Christian Grobmeier <[email protected]> wrote: > Hi Andrew, > > just wanted to start with patching log4cxx with your code, but git > tells me the patches are somehow corrupt or do not apply. > I am not the big git guru, but maybe the mail servers have done > something nasty with the patch. Do you mind attaching the original > patch file to JIRA? > > If thats not possible I will fork the log4cxx git mirror to github and > accept your requests from there. > > Thanks! > > Cheers > Christian > > 2012/11/21 ANDREW LAZARUS <[email protected]>: >> Two more cases >> >> diff --git a/src/main/cpp/objectoutputstream.cpp >> b/src/main/cpp/objectoutputstream.cpp >> index 7cd696b..9567a85 100644 >> --- a/src/main/cpp/objectoutputstream.cpp >> +++ b/src/main/cpp/objectoutputstream.cpp >> @@ -36,7 +36,7 @@ ObjectOutputStream::ObjectOutputStream(OutputStreamPtr >> outputStream, Pool& p) >> objectHandle(0x7E0000), >> classDescriptions(new ClassDescriptionMap()) >> { >> - char start[] = { 0xAC, 0xED, 0x00, 0x05 }; >> + char start[] = { static_cast<char>(0xAC), static_cast<char>(0xED), 0x00, >> 0x05 }; >> ByteBuffer buf(start, sizeof(start)); >> os->write(buf, p); >> } >> @@ -85,7 +85,7 @@ void ObjectOutputStream::writeObject(const MDC::Map& val, >> Pool& p) { >> 0x72, 0x00, 0x13, 0x6A, 0x61, 0x76, 0x61, >> 0x2E, 0x75, 0x74, 0x69, 0x6C, 0x2E, 0x48, 0x61, >> 0x73, 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x13, >> - 0xBB, 0x0F, 0x25, 0x21, 0x4A, 0xE4, 0xB8, 0x03, >> + static_cast<char>(0xBB), 0x0F, 0x25, 0x21, 0x4A, >> static_cast<char>(0xE4), static_cast<char>(0xB8), 0x03, >> 0x00, 0x02, 0x46, 0x00, 0x0A, 0x6C, 0x6F, 0x61, >> 0x64, 0x46, 0x61, 0x63, 0x74, 0x6F, 0x72, 0x49, >> 0x00, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, >> >>
