Date: Tue, 11 Dec 2012 17:14:00 GMT From: Poul-Henning Kamp <phk@critter.freebsd.dk> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/174371: textproc/qt4-clucene CLANG fixes Message-ID: <201212111714.qBBHE0xO002865@critter.freebsd.dk> Resent-Message-ID: <201212111720.qBBHK0YA081688@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 174371
>Category: ports
>Synopsis: textproc/qt4-clucene CLANG fixes
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Tue Dec 11 17:20:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Poul-Henning Kamp
>Release: FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD critter.freebsd.dk 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r238860M: Sat Jul 28 13:18:52 UTC 2012 root@critter.freebsd.dk:/usr/obj/freebsd/head/sys/CRITTER amd64
>Description:
Trying to build packets on a CLANG -current I need this patch
>How-To-Repeat:
>Fix:
diff -ur src/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp~ src/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp
--- src/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp~ 2012-12-11 17:03:32.000000000 +0000
+++ src/3rdparty/clucene/src/CLucene/index/SegmentMerger.cpp 2012-04-26 19:46:23.000000000 +0000
@@ -264,7 +264,7 @@
CND_CONDITION(fieldsWriter != NULL, "Memory allocation for fieldsWriter failed");
try {
- IndexReader* reader = NULL;
+ reader = NULL;
int32_t maxDoc = 0;
//Iterate through all readers
for (uint32_t i = 0; i < readers.size(); i++) {
diff -ur src/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp~ src/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp
--- src/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp~ 2012-12-11 17:01:57.000000000 +0000
+++ src/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp 2012-12-11 16:58:08.000000000 +0000
@@ -416,7 +416,7 @@
_CLDECDELETE(term);
try {
- Term* term = enumerator->term(false);
+ term = enumerator->term(false);
if (term == NULL) {
_CLTHROWA(CL_ERR_Runtime,"no terms in field - cannot determine sort type"); //todo: make rich error: " + field + "
}
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212111714.qBBHE0xO002865>