tags 320942 +patch
thanks
The attached patch fixes the reported build error as well as some
other gcc4 related build errors.
However, the following error still remains:
../include/stack.h:49: instantiated from here
/usr/lib/gcc/x86_64-linux-gnu/4.0.2/../../../../include/c++/4.0.2/bits/stl_construct.h:174:
error: no matching function for call to 'std::allocator<CPtr<CStackElem>
>::destroy(CStackElem**)'
/usr/lib/gcc/x86_64-linux-gnu/4.0.2/../../../../include/c++/4.0.2/ext/mt_allocator.h:614:
note: candidates are: void __gnu_cxx::__mt_alloc_base<_Tp>::destroy(_Tp*)
[with _Tp = CPtr<CStackElem>]
/usr/lib/gcc/x86_64-linux-gnu/4.0.2/../../../../include/c++/4.0.2/bits/stl_construct.h:
In function 'void std::_Destroy(_ForwardIterator, _ForwardIterator,
_Allocator) [with _ForwardIterator = CPtr<CStackElem>*, _Allocator =
std::allocator<CPtr<CStackElem> >]':
/usr/lib/gcc/x86_64-linux-gnu/4.0.2/../../../../include/c++/4.0.2/bits/stl_vector.h:273:
instantiated from 'std::vector<_Tp, _Alloc>::~vector() [with _Tp =
CPtr<CStackElem>, _Alloc = std::allocator<CPtr<CStackElem> >]'
../include/stack.h:49: instantiated from here
/usr/lib/gcc/x86_64-linux-gnu/4.0.2/../../../../include/c++/4.0.2/bits/stl_construct.h:174:
error: no matching function for call to 'std::allocator<CPtr<CStackElem>
>::destroy(CStackElem**)'
/usr/lib/gcc/x86_64-linux-gnu/4.0.2/../../../../include/c++/4.0.2/ext/mt_allocator.h:614:
note: candidates are: void __gnu_cxx::__mt_alloc_base<_Tp>::destroy(_Tp*)
[with _Tp = CPtr<CStackElem>]
/usr/lib/gcc/x86_64-linux-gnu/4.0.2/../../../../include/c++/4.0.2/bits/stl_construct.h:
In function 'void std::_Destroy(_ForwardIterator, _ForwardIterator,
_Allocator) [with _ForwardIterator =
__gnu_cxx::__normal_iterator<CPtr<CStackElem>*, std::vector<CPtr<CStackElem>,
std::allocator<CPtr<CStackElem> > > >, _Allocator =
std::allocator<CPtr<CStackElem> >]':
/usr/lib/gcc/x86_64-linux-gnu/4.0.2/../../../../include/c++/4.0.2/bits/vector.tcc:294:
instantiated from 'void std::vector<_Tp,
_Alloc>::_M_insert_aux(__gnu_cxx::__normal_iterator<typename _Alloc::pointer,
std::vector<_Tp, _Alloc> >, const _Tp&) [with _Tp = CPtr<CStackElem>, _Alloc =
std::allocator<CPtr<CStackElem> >]'
/usr/lib/gcc/x86_64-linux-gnu/4.0.2/../../../../include/c++/4.0.2/bits/vector.tcc:103:
instantiated from 'typename std::vector<_Tp, _Alloc>::iterator
std::vector<_Tp, _Alloc>::insert(__gnu_cxx::__normal_iterator<typename
_Alloc::pointer, std::vector<_Tp, _Alloc> >, const _Tp&) [with _Tp =
CPtr<CStackElem>, _Alloc = std::allocator<CPtr<CStackElem> >]'
../include/stack.h:75: instantiated from here
/usr/lib/gcc/x86_64-linux-gnu/4.0.2/../../../../include/c++/4.0.2/bits/stl_construct.h:174:
error: no matching function for call to 'std::allocator<CPtr<CStackElem>
>::destroy(CStackElem**)'
/usr/lib/gcc/x86_64-linux-gnu/4.0.2/../../../../include/c++/4.0.2/ext/mt_allocator.h:614:
note: candidates are: void __gnu_cxx::__mt_alloc_base<_Tp>::destroy(_Tp*)
[with _Tp = CPtr<CStackElem>]
/usr/lib/gcc/x86_64-linux-gnu/4.0.2/../../../../include/c++/4.0.2/bits/stl_construct.h:
In function 'void std::_Destroy(_ForwardIterator, _ForwardIterator,
_Allocator) [with _ForwardIterator =
__gnu_cxx::__normal_iterator<CPtr<CStackElem>*, std::vector<CPtr<CStackElem>,
std::allocator<CPtr<CStackElem> > > >, _Allocator =
std::allocator<CPtr<CStackElem> >]':
/usr/lib/gcc/x86_64-linux-gnu/4.0.2/../../../../include/c++/4.0.2/bits/vector.tcc:294:
instantiated from 'void std::vector<_Tp,
_Alloc>::_M_insert_aux(__gnu_cxx::__normal_iterator<typename _Alloc::pointer,
std::vector<_Tp, _Alloc> >, const _Tp&) [with _Tp = CPtr<CStackElem>, _Alloc =
std::allocator<CPtr<CStackElem> >]'
/usr/lib/gcc/x86_64-linux-gnu/4.0.2/../../../../include/c++/4.0.2/bits/vector.tcc:103:
instantiated from 'typename std::vector<_Tp, _Alloc>::iterator
std::vector<_Tp, _Alloc>::insert(__gnu_cxx::__normal_iterator<typename
_Alloc::pointer, std::vector<_Tp, _Alloc> >, const _Tp&) [with _Tp =
CPtr<CStackElem>, _Alloc = std::allocator<CPtr<CStackElem> >]'
../include/stack.h:75: instantiated from here
/usr/lib/gcc/x86_64-linux-gnu/4.0.2/../../../../include/c++/4.0.2/bits/stl_construct.h:174:
error: no matching function for call to 'std::allocator<CPtr<CStackElem>
>::destroy(CStackElem**)'
/usr/lib/gcc/x86_64-linux-gnu/4.0.2/../../../../include/c++/4.0.2/ext/mt_allocator.h:614:
note: candidates are: void __gnu_cxx::__mt_alloc_base<_Tp>::destroy(_Tp*)
[with _Tp = CPtr<CStackElem>]
make[3]: *** [excerpts.o] Error 1
make[3]: *** Waiting for unfinished jobs....
make[3]: *** [daemon.o] Error 1
make[3]: Leaving directory `/aspseek-1.2.10/src'
I do not know a fix for that problem.
Regards
Andreas Jochens
diff -urN
../tmp-orig/aspseek-1.2.10/debian/patches/c++_transition.patch-20031212.1
./debian/patches/c++_transition.patch-20031212.1
--- ../tmp-orig/aspseek-1.2.10/debian/patches/c++_transition.patch-20031212.1
2005-09-02 13:51:40.000000000 +0000
+++ ./debian/patches/c++_transition.patch-20031212.1 2005-09-02
13:51:35.000000000 +0000
@@ -73,7 +73,8 @@
-namespace std {
+namespace STL_EXT_NAMESPACE {
- struct hash<CSWord> {
+- struct hash<CSWord> {
++ template <> struct hash<CSWord> {
size_t operator()(const CSWord& __s) const
{
@@ -175,12 +167,14 @@
@@ -87,7 +88,7 @@
- }
-};
+namespace STL_EXT_NAMESPACE {
-+ struct hash<CSWord> {
++ template <> struct hash<CSWord> {
+ size_t operator()(const CSWord& __s) const
+ {
+ return __stl_hash_string(__s.c_str());
@@ -128,7 +129,8 @@
-namespace std {
+namespace STL_EXT_NAMESPACE
+{
- struct hash<CWord> {
+- struct hash<CWord> {
++ template <> struct hash<CWord> {
size_t operator()(const CWord& __s) const
{
@@ -242,7 +236,7 @@
@@ -137,7 +139,8 @@
-namespace std {
+namespace STL_EXT_NAMESPACE {
- struct hash<CLmString>
+- struct hash<CLmString>
++ template <> struct hash<CLmString>
{
size_t operator()(const CLmString& __s) const
diff -urN -x Makefile.in -x aclocal.m4 -x config.log -x configure -x
aspseek-cfg.h.in -x config.guess -x config.sub -x ltmain.sh -x install-sh -x
missing -x '*.[157]' aspseek-1.2.10/include/config.h
../aspseek-1.2.10/include/config.h
@@ -198,7 +201,8 @@
-namespace std {
+namespace STL_EXT_NAMESPACE {
- struct hash<CLangString>
+- struct hash<CLangString>
++ template <> struct hash<CLangString>
{
size_t operator()(const CLangString& __s) const
diff -urN -x Makefile.in -x aclocal.m4 -x config.log -x configure -x
aspseek-cfg.h.in -x config.guess -x config.sub -x ltmain.sh -x install-sh -x
missing -x '*.[157]' aspseek-1.2.10/include/datasource.h
../aspseek-1.2.10/include/datasource.h
@@ -282,7 +286,8 @@
-namespace std {
+namespace STL_EXT_NAMESPACE {
- struct hash<CURLName> {
+- struct hash<CURLName> {
++ template <> struct hash<CURLName> {
size_t operator()(const CURLName& __s) const
{
diff -urN -x Makefile.in -x aclocal.m4 -x config.log -x configure -x
aspseek-cfg.h.in -x config.guess -x config.sub -x ltmain.sh -x install-sh -x
missing -x '*.[157]' aspseek-1.2.10/include/index.h
../aspseek-1.2.10/include/index.h
@@ -353,7 +358,7 @@
- size_t operator()(const string& __s) const
+namespace STL_EXT_NAMESPACE
+{
-+ struct hash<std::string>
++ template <> struct hash<std::string>
+ {
+ size_t operator()(const std::string& s) const
{
@@ -524,7 +529,8 @@
-namespace std {
+namespace STL_EXT_NAMESPACE {
- struct hash<CUrlRank>
+- struct hash<CUrlRank>
++ template <> struct hash<CUrlRank>
{
size_t operator()(const CUrlRank& __s) const
diff -urN -x Makefile.in -x aclocal.m4 -x config.log -x configure -x
aspseek-cfg.h.in -x config.guess -x config.sub -x ltmain.sh -x install-sh -x
missing -x '*.[157]' aspseek-1.2.10/include/resolve.h
../aspseek-1.2.10/include/resolve.h
@@ -601,7 +607,8 @@
-namespace std {
+namespace STL_EXT_NAMESPACE {
- struct hash<CDaemonAddress> {
+- struct hash<CDaemonAddress> {
++ template <> struct hash<CDaemonAddress> {
size_t operator()(const CDaemonAddress& __s) const
{
diff -urN -x Makefile.in -x aclocal.m4 -x config.log -x configure -x
aspseek-cfg.h.in -x config.guess -x config.sub -x ltmain.sh -x install-sh -x
missing -x '*.[157]' aspseek-1.2.10/include/sqldb.h
../aspseek-1.2.10/include/sqldb.h
@@ -686,7 +693,8 @@
-namespace std {
+namespace STL_EXT_NAMESPACE {
- struct hash<CWordLang>
+- struct hash<CWordLang>
++ template <> struct hash<CWordLang>
{
size_t operator()(const CWordLang& __s) const
diff -urN -x Makefile.in -x aclocal.m4 -x config.log -x configure -x
aspseek-cfg.h.in -x config.guess -x config.sub -x ltmain.sh -x install-sh -x
missing -x '*.[157]' aspseek-1.2.10/include/templates.h
../aspseek-1.2.10/include/templates.h
@@ -742,7 +750,8 @@
-namespace std {
+namespace STL_EXT_NAMESPACE {
- struct hash<CUWord> {
+- struct hash<CUWord> {
++ template <> struct hash<CUWord> {
size_t operator()(const CUWord& __s) const
{
@@ -571,7 +566,7 @@
@@ -751,7 +760,8 @@
-namespace std {
+namespace STL_EXT_NAMESPACE {
- struct hash<CWordLetter> {
+- struct hash<CWordLetter> {
++ template <> struct hash<CWordLetter> {
size_t operator()(const CWordLetter& __s) const
{
diff -urN -x Makefile.in -x aclocal.m4 -x config.log -x configure -x
aspseek-cfg.h.in -x config.guess -x config.sub -x ltmain.sh -x install-sh -x
missing -x '*.[157]' aspseek-1.2.10/include/wcache.h
../aspseek-1.2.10/include/wcache.h
@@ -872,3 +882,101 @@
#include "sqldb.h"
#include "datasource.h"
#include "stopwords.h"
+diff -urN ../tmp-orig/aspseek-1.2.10/src/index.cpp ./src/index.cpp
+--- ../tmp-orig/aspseek-1.2.10/src/index.cpp 2002-07-19 15:02:10.000000000
+0000
++++ ./src/index.cpp 2005-09-02 13:22:22.000000000 +0000
+@@ -1195,7 +1195,7 @@
+ hdeltaFiles->Flush();
+ }
+ DelMapReuse.Close();
+- logger.log(CAT_ALL, L_ERROR, "Address of param: %08x\n", (unsigned
int)&x);
++ logger.log(CAT_ALL, L_ERROR, "Address of param: %16lx\n", (unsigned
long)&x);
+ }
+
+
+diff -urN ../tmp-orig/aspseek-1.2.10/include/ucharset.h ./include/ucharset.h
+--- ../tmp-orig/aspseek-1.2.10/include/ucharset.h 2002-06-08
15:52:41.000000000 +0000
++++ ./include/ucharset.h 2005-09-02 13:40:13.000000000 +0000
+@@ -440,7 +440,7 @@
+ {
+ return m_content;
+ }
+- void operator=(const char* src)
++ void operator=(const char* str)
+ {
+ Assign(str);
+ }
+@@ -575,7 +575,7 @@
+ struct hash<CWordLetter> {
+ size_t operator()(const CWordLetter& __s) const
+ {
+- return __s.m_ucode + (int)__s.m_parent;
++ return __s.m_ucode + (long)__s.m_parent;
+ }
+ };
+ }
+diff -urN ../tmp-orig/aspseek-1.2.10/src/deltas.cpp ./src/deltas.cpp
+--- ../tmp-orig/aspseek-1.2.10/src/deltas.cpp 2002-07-18 14:10:12.000000000
+0000
++++ ./src/deltas.cpp 2005-09-02 13:50:38.000000000 +0000
+@@ -2592,7 +2592,7 @@
+ {
+ rd = m_bytesInBuffer - m_offsetInBuffer;
+ memcpy(buf, m_buffer + m_offsetInBuffer, rd);
+- (char*)buf += rd;
++ buf = (char*)buf + rd;
+ m_offsetInBuffer += rd;
+ count -= rd;
+ }
+@@ -2611,7 +2611,7 @@
+ return rd;
+ }
+ count -= m_bufSize;
+- (char*)buf += m_bufSize;
++ buf = (char*)buf + m_bufSize;
+ m_bufOffset += m_bufSize;
+ }
+ m_bytesInBuffer = read(m_file, m_buffer, m_bufSize);
+@@ -2647,7 +2647,7 @@
+ memcpy(m_buffer + m_offsetInBuffer, buf, wr);
+ m_bytesInBuffer = m_bufSize;
+ m_offsetInBuffer = m_bufSize;
+- (char*)buf += wr;
++ buf = (char*)buf + wr;
+ count -= wr;
+ m_dirty = 1;
+ }
+@@ -2666,7 +2666,7 @@
+ return wr;
+ }
+ count -= m_bufSize;
+- (char*)buf += m_bufSize;
++ buf = (char*)buf + m_bufSize;
+ m_bufOffset += m_bufSize;
+ }
+ m_bytesInBuffer = 0;
+diff -urN ../tmp-orig/aspseek-1.2.10/include/ccom.h ./include/ccom.h
+--- ../tmp-orig/aspseek-1.2.10/include/ccom.h 2002-01-09 11:50:14.000000000
+0000
++++ ./include/ccom.h 2005-09-02 13:26:45.000000000 +0000
+@@ -75,7 +75,7 @@
+ }
+ void Release()
+ {
+- IUnknown* pTemp = p;
++ T* pTemp = p;
+ if (pTemp)
+ {
+ p = NULL;
+@@ -139,11 +139,11 @@
+ {
+ ATLASSERT(ppT != NULL);
+ if (ppT == NULL)
+- return E_POINTER;
++ return 1 /*E_POINTER*/;
+ *ppT = p;
+ if (p)
+ p->AddRef();
+- return S_OK;
++ return 0 /*S_OK*/;
+ }
+ T* p;
+ };
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
