tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merged freebsd changes

Browse Source
This commit is contained in:
Jean-Francois Dockes 2013-10-29 14:30:37 +01:00
commit ce59e595e0
7 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/unordered_defs.h
View File

@ -4,18 +4,16 @@
#ifdef HAVE_CXX0X_UNORDERED #ifdef HAVE_CXX0X_UNORDERED
# include <unordered_map> # include <unordered_map>
# include <unordered_set> # include <unordered_set>
using std::tr1::unordered_map; # define STD_UNORDERED_MAP std::unordered_map
using std::tr1::unordered_set; # define STD_UNORDERED_SET std::unordered_set
#define STD_UNORDERED_MAP std::unordered_map
#define STD_UNORDERED_SET std::unordered_set
#elif defined(HAVE_TR1_UNORDERED) #elif defined(HAVE_TR1_UNORDERED)
# include <tr1/unordered_map> # include <tr1/unordered_map>
# include <tr1/unordered_set> # include <tr1/unordered_set>
#define STD_UNORDERED_MAP std::tr1::unordered_map # define STD_UNORDERED_MAP std::tr1::unordered_map
#define STD_UNORDERED_SET std::tr1::unordered_set # define STD_UNORDERED_SET std::tr1::unordered_set
#else #else
# include <map> # include <map>
# include <set> # include <set>
#define STD_UNORDERED_MAP std::map # define STD_UNORDERED_MAP std::map
#define STD_UNORDERED_SET std::set # define STD_UNORDERED_SET std::set
#endif #endif

2
src/internfile/mimehandler.cpp
View File

@ -127,7 +127,7 @@ void clearMimeHandlerCache()
{ {
LOGDEB(("clearMimeHandlerCache()\n")); LOGDEB(("clearMimeHandlerCache()\n"));
typedef multimap<string, RecollFilter*>::value_type value_type; typedef multimap<string, RecollFilter*>::value_type value_type;
map<string, RecollFilter *>::iterator it; multimap<string, RecollFilter *>::iterator it;
PTMutexLocker locker(o_handlers_mutex); PTMutexLocker locker(o_handlers_mutex);
for (it = o_handlers.begin(); it != o_handlers.end(); it++) { for (it = o_handlers.begin(); it != o_handlers.end(); it++) {
delete it->second; delete it->second;

2
src/lib/Makefile
View File

@ -19,7 +19,7 @@ librecoll.a : $(DEPS) $(OBJS)
# no effort whatsoever to maintain any kind of ABI compat in this lib. Only # no effort whatsoever to maintain any kind of ABI compat in this lib. Only
# programs or modules from the same Recoll release can be compatible. # programs or modules from the same Recoll release can be compatible.
$(LIBRECOLL): $(DEPS) $(OBJS) $(LIBRECOLL): $(DEPS) $(OBJS)
g++ -shared -Wl,--no-undefined -Wl,--warn-unresolved-symbols -Wl,-soname=$(LIBRECOLL) -o $(LIBRECOLL) $(OBJS) $(LIBXAPIAN) $(LIBICONV) $(X_LIBX11) $(LIBSYS) $(CXX) -shared -Wl,--no-undefined -Wl,--warn-unresolved-symbols -Wl,-soname=$(LIBRECOLL) -o $(LIBRECOLL) $(OBJS) $(LIBXAPIAN) $(LIBICONV) $(X_LIBX11) $(LIBSYS)
rm -f librecoll.so rm -f librecoll.so
ln -s $(LIBRECOLL) librecoll.so ln -s $(LIBRECOLL) librecoll.so

2
src/lib/mkMake
View File

@ -143,7 +143,7 @@ librecoll.a : \$(DEPS) \$(OBJS)
# no effort whatsoever to maintain any kind of ABI compat in this lib. Only # no effort whatsoever to maintain any kind of ABI compat in this lib. Only
# programs or modules from the same Recoll release can be compatible. # programs or modules from the same Recoll release can be compatible.
\$(LIBRECOLL): \$(DEPS) \$(OBJS) \$(LIBRECOLL): \$(DEPS) \$(OBJS)
g++ -shared -Wl,--no-undefined -Wl,--warn-unresolved-symbols \ \$(CXX) -shared -Wl,--no-undefined -Wl,--warn-unresolved-symbols \
-Wl,-soname=\$(LIBRECOLL) -o \$(LIBRECOLL) \$(OBJS) \ -Wl,-soname=\$(LIBRECOLL) -o \$(LIBRECOLL) \$(OBJS) \
\$(LIBXAPIAN) \$(LIBICONV) \$(X_LIBX11) \$(LIBSYS) \$(LIBXAPIAN) \$(LIBICONV) \$(X_LIBX11) \$(LIBSYS)
rm -f librecoll.so rm -f librecoll.so

2
src/mk/FreeBSD
View File

@ -2,4 +2,4 @@ include $(depth)/mk/commondefs
include $(depth)/mk/localdefs include $(depth)/mk/localdefs
ALL_CXXFLAGS = $(CXXFLAGS) $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) -pthread ALL_CXXFLAGS = $(CXXFLAGS) $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) -pthread
LIBSYS = -lz LIBSYS = -pthread -lz

4
src/rcldb/rclabstract.cpp
View File

@ -283,7 +283,7 @@ int Query::Native::getFirstMatchPage(Xapian::docid docid, string& term)
multimap<double, vector<string> > byQ; multimap<double, vector<string> > byQ;
double totalweight = qualityTerms(docid, terms, byQ); double totalweight = qualityTerms(docid, terms, byQ);
for (map<double, vector<string> >::reverse_iterator mit = byQ.rbegin(); for (multimap<double, vector<string> >::reverse_iterator mit = byQ.rbegin();
mit != byQ.rend(); mit++) { mit != byQ.rend(); mit++) {
for (vector<string>::const_iterator qit = mit->second.begin(); for (vector<string>::const_iterator qit = mit->second.begin();
qit != mit->second.end(); qit++) { qit != mit->second.end(); qit++) {
@ -384,7 +384,7 @@ int Query::Native::makeAbstract(Xapian::docid docid,
int ret = ABSRES_OK; int ret = ABSRES_OK;
// Let's go populate // Let's go populate
for (map<double, vector<string> >::reverse_iterator mit = byQ.rbegin(); for (multimap<double, vector<string> >::reverse_iterator mit = byQ.rbegin();
mit != byQ.rend(); mit++) { mit != byQ.rend(); mit++) {
unsigned int maxgrpoccs; unsigned int maxgrpoccs;
float q; float q;

1
src/utils/pxattr.cpp
View File

@ -326,6 +326,7 @@ list(int fd, const string& path, vector<string>* names, flags flags, nspace dom)
return false; return false;
if (!buf.alloc(ret+1)) // NEEDED on FreeBSD (no ending null) if (!buf.alloc(ret+1)) // NEEDED on FreeBSD (no ending null)
return false; return false;
buf.buf[ret] = 0;
if (fd < 0) { if (fd < 0) {
if (flags & PXATTR_NOFOLLOW) { if (flags & PXATTR_NOFOLLOW) {
ret = extattr_list_link(path.c_str(), EXTATTR_NAMESPACE_USER, ret = extattr_list_link(path.c_str(), EXTATTR_NAMESPACE_USER,