small glitches detected on suse / gcc 4.1
This commit is contained in:
parent
cb5a5955e2
commit
dc6288f7d2
@ -1 +1 @@
|
|||||||
1.5.2
|
1.5.3
|
||||||
|
|||||||
5
src/configure
vendored
5
src/configure
vendored
@ -2192,7 +2192,7 @@ LIBXAPIAN=`$XAPIAN_CONFIG --libs`
|
|||||||
# libstdc++.la in the lib list
|
# libstdc++.la in the lib list
|
||||||
for i in $LIBXAPIAN ; do
|
for i in $LIBXAPIAN ; do
|
||||||
case $i in
|
case $i in
|
||||||
*libstdc++.la);;
|
*stdc++*|-lm|-lgcc_s);;
|
||||||
*) tmpxaplib="$tmpxaplib $i";;
|
*) tmpxaplib="$tmpxaplib $i";;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
@ -2296,7 +2296,8 @@ it and/or set the QTDIR environment variable?" >&2;}
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
cd $QTGUI
|
cd $QTGUI
|
||||||
# We just want a .pro file: no problem with unsubstituted variables for now
|
# We just want a .pro file: no problem with unsubstituted variables at
|
||||||
|
# this point.
|
||||||
test -f recoll.pro && chmod +w recoll.pro
|
test -f recoll.pro && chmod +w recoll.pro
|
||||||
cp recoll.pro.in recoll.pro
|
cp recoll.pro.in recoll.pro
|
||||||
${QMAKE} recoll.pro
|
${QMAKE} recoll.pro
|
||||||
|
|||||||
@ -58,7 +58,7 @@ LIBXAPIAN=`$XAPIAN_CONFIG --libs`
|
|||||||
# libstdc++.la in the lib list
|
# libstdc++.la in the lib list
|
||||||
for i in $LIBXAPIAN ; do
|
for i in $LIBXAPIAN ; do
|
||||||
case $i in
|
case $i in
|
||||||
*libstdc++.la);;
|
*stdc++*|-lm|-lgcc_s);;
|
||||||
*) tmpxaplib="$tmpxaplib $i";;
|
*) tmpxaplib="$tmpxaplib $i";;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|||||||
@ -16,7 +16,7 @@
|
|||||||
*/
|
*/
|
||||||
#ifndef _HISTORY_H_INCLUDED_
|
#ifndef _HISTORY_H_INCLUDED_
|
||||||
#define _HISTORY_H_INCLUDED_
|
#define _HISTORY_H_INCLUDED_
|
||||||
/* @(#$Id: history.h,v 1.5 2006-09-11 12:05:39 dockes Exp $ (C) 2004 J.F.Dockes */
|
/* @(#$Id: history.h,v 1.6 2006-10-02 12:33:13 dockes Exp $ (C) 2004 J.F.Dockes */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Dynamic configuration storage
|
* Dynamic configuration storage
|
||||||
@ -46,6 +46,7 @@ using namespace std;
|
|||||||
|
|
||||||
class HistoryEntry {
|
class HistoryEntry {
|
||||||
public:
|
public:
|
||||||
|
virtual ~HistoryEntry() {}
|
||||||
virtual bool decode(const string &value) = 0;
|
virtual bool decode(const string &value) = 0;
|
||||||
virtual bool encode(string& value) = 0;
|
virtual bool encode(string& value) = 0;
|
||||||
virtual bool equal(const HistoryEntry &other) = 0;
|
virtual bool equal(const HistoryEntry &other) = 0;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user