Attachment 65048 Details for Bug 53061 – A patch to fix internal CLucene

[patch] A patch to fix internal CLucene

clucene-nullptr.patch (text/plain), 1.61 KB, created by Jung-uk Kim on 2012-08-01 22:38:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jung-uk Kim

Created: 2012-08-01 22:38:47 UTC

Size: 1.61 KB

patch

obsolete

>--- clucene/CustomTarget_source.mk	2012-07-27 08:37:04.000000000 -0400
>+++ clucene/CustomTarget_source.mk	2012-07-31 18:46:00.000000000 -0400
>@@ -69,6 +69,7 @@
> 	$(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-debug.patch && \
> 	$(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-narrowing-conversions.patch && \
> 	$(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-multimap-put.patch && \
>+	$(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-nullptr.patch && \
> 	for i in `find $(clucene_DIR)/ -name "*.cpp"`; do mv $$i $${i%%cpp}cxx; done)
> 	#FIXME ?, our rules expect .cxx
> ifneq ($(OS),WNT)
>--- clucene/patches/clucene-nullptr.patch	2012-07-31 18:52:05.000000000 -0400
>+++ clucene/patches/clucene-nullptr.patch	2012-07-31 18:53:36.000000000 -0400
>@@ -0,0 +1,22 @@
>+--- src/core/CLucene/index/DocumentsWriter.cpp	2011-03-16 20:21:07.000000000 -0400
>++++ src/core/CLucene/index/DocumentsWriter.cpp	2012-07-31 18:52:09.000000000 -0400
>+@@ -125,7 +125,7 @@
>+   if (this->postingsFreeListDW.values){
>+       if (this->postingsFreeCountDW < this->postingsFreeListDW.length) {
>+           memset(this->postingsFreeListDW.values + this->postingsFreeCountDW
>+-              , NULL
>++              , 0
>+               , sizeof(Posting*));
>+       }
>+       postingsFreeListDW.deleteUntilNULL();
>+--- src/core/CLucene/util/VoidMap.h	2012-07-31 18:13:08.000000000 -0400
>++++ src/core/CLucene/util/VoidMap.h	2012-07-31 18:42:54.000000000 -0400
>+@@ -83,7 +83,7 @@
>+ 	_vt get( _kt k) const {
>+ 		const_iterator itr = base::find(k);
>+ 		if ( itr==base::end() )
>+-			return (_vt)NULL;
>++			return static_cast<_vt>(0);
>+ 		else
>+ 			return itr->second;
>+ 	}

Actions: View

Attachments on bug 53061: 65048 | 65049 | 65571