diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-08-13 11:14:24 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-08-14 10:39:10 +0200 |
| commit | e19cd3f8a39fdb9878cb573438e04ae325405ffe (patch) | |
| tree | 5c988c3fbc023aa41e7be39898e04c5c111ff031 | |
| parent | a6c7410c1391b67f4550dadf105c8f4979c21dcd (diff) | |
fdo#53061: Fix for C++11 #define NULL nullptr
Change-Id: Ic6cce351202eca8160f1536981ce5d0985010cb7
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | clucene/CustomTarget_source.mk | 1 | ||||
| -rw-r--r-- | clucene/patches/clucene-nullptr.patch | 22 |
2 files changed, 23 insertions, 0 deletions
diff --git a/clucene/CustomTarget_source.mk b/clucene/CustomTarget_source.mk index 7bae8d7fcd89..8ce11b2eed7b 100644 --- a/clucene/CustomTarget_source.mk +++ b/clucene/CustomTarget_source.mk @@ -69,6 +69,7 @@ $(clucene_DIR)/done : $(clucene_FIXED_TARFILE_LOCATION) \ $(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) diff --git a/clucene/patches/clucene-nullptr.patch b/clucene/patches/clucene-nullptr.patch new file mode 100644 index 000000000000..a32ddb870b8c --- /dev/null +++ b/clucene/patches/clucene-nullptr.patch @@ -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; + } |