ports/169872: [patch] textproc/qt4-clucene: unbreak with libc++

[Jan Beich]

>Number:         169872
>Category:       ports
>Synopsis:       [patch] textproc/qt4-clucene: unbreak with libc++
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 15 03:50:11 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Jan Beich
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
WITH_LIBCPLUSPLUS= # see src.conf(5)
CXX = clang++
CXXFLAGS += -stdlib=libc++
LDFLAGS += -stdlib=libc++
>Description:
../../../../src/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp:427:11: error: call to 'wcschr' is ambiguous
                          if ( _tcschr(_T("0123456789 +-"),termtext[i]) == NULL ){
                               ^~~~~~~
../../../../src/3rdparty/clucene/src/CLucene/config/repl_tchar.h:36:21: note: expanded from macro '_tcschr'
    #define _tcschr wcschr //find location of one character
                    ^~~~~~
/usr/include/wchar.h:135:10: note: candidate function
wchar_t *wcschr(const wchar_t *, wchar_t) __pure;
         ^
/usr/include/c++/v1/cwchar:165:49: note: candidate function
inline _LIBCPP_INLINE_VISIBILITY const wchar_t* wcschr(const wchar_t* __s, wchar_t __c) {return ::wcschr(__s, __c);}
                                                ^
/usr/include/c++/v1/cwchar:166:49: note: candidate function
inline _LIBCPP_INLINE_VISIBILITY       wchar_t* wcschr(      wchar_t* __s, wchar_t __c) {return ::wcschr(__s, __c);}
                                                ^
../../../../src/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp:441:12: error: call to 'wcschr' is ambiguous
                                  if ( _tcschr(_T("0123456789 Ee.+-"),termtext[i]) == NULL ){
                                       ^~~~~~~
../../../../src/3rdparty/clucene/src/CLucene/config/repl_tchar.h:36:21: note: expanded from macro '_tcschr'
    #define _tcschr wcschr //find location of one character
                    ^~~~~~
/usr/include/wchar.h:135:10: note: candidate function
wchar_t *wcschr(const wchar_t *, wchar_t) __pure;
         ^
/usr/include/c++/v1/cwchar:165:49: note: candidate function
inline _LIBCPP_INLINE_VISIBILITY const wchar_t* wcschr(const wchar_t* __s, wchar_t __c) {return ::wcschr(__s, __c);}
                                                ^
/usr/include/c++/v1/cwchar:166:49: note: candidate function
inline _LIBCPP_INLINE_VISIBILITY       wchar_t* wcschr(      wchar_t* __s, wchar_t __c) {return ::wcschr(__s, __c);}
                                                ^
2 errors generated.>How-To-Repeat:
>How-To-Repeat:
>Fix:
--- libcplusplus.diff begins here ---
--- src/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp~
+++ src/3rdparty/clucene/src/CLucene/search/FieldCacheImpl.cpp
@@ -11,6 +11,8 @@ CL_NS_USE(util)
 CL_NS_USE(index)
 CL_NS_DEF(search)
 
+using ::wcschr;
+
 FieldCacheImpl::FieldCacheImpl():
     cache(false,true){
 }
--- libcplusplus.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: