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

Small windows adjustements for std::mutex changes

Browse Source
This commit is contained in:
Jean-Francois Dockes 2016-07-13 09:27:38 +02:00
parent ab8cf55b1f
commit 9f4e2e2646
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/rclutil.cpp
View File

@ -263,7 +263,7 @@ bool maketmpdir(string& tdir, string& reason)
// mkdir. try to make sure that we at least don't shoot ourselves // mkdir. try to make sure that we at least don't shoot ourselves
// in the foot // in the foot
static std::mutex mmutex; static std::mutex mmutex;
std::unique_lock lock(mmutex); std::unique_lock<std::mutex> lock(mmutex);
tdir = path_wingettempfilename(TEXT("rcltmp")); tdir = path_wingettempfilename(TEXT("rcltmp"));
#endif #endif

2
src/utils/smallut.cpp
View File

@ -1240,9 +1240,9 @@ public:
((flags&SRE_NOSUB) ? regex_constants::nosubs : 0) ((flags&SRE_NOSUB) ? regex_constants::nosubs : 0)
)), ok(true), nmatch(nm) { )), ok(true), nmatch(nm) {
} }
bool ok;
std::regex expr; std::regex expr;
std::smatch res; std::smatch res;
bool ok;
int nmatch; int nmatch;
}; };

5
src/windows/qmkrecoll/librecoll.pro
View File

@ -33,6 +33,7 @@ SOURCES += \
../../index/bglfetcher.cpp \ ../../index/bglfetcher.cpp \
../../index/checkretryfailed.cpp \ ../../index/checkretryfailed.cpp \
../../index/fetcher.cpp \ ../../index/fetcher.cpp \
../../index/exefetcher.cpp \
../../index/fsfetcher.cpp \ ../../index/fsfetcher.cpp \
../../index/fsindexer.cpp \ ../../index/fsindexer.cpp \
../../index/indexer.cpp \ ../../index/indexer.cpp \
@ -85,7 +86,6 @@ SOURCES += \
../../utils/conftree.cpp \ ../../utils/conftree.cpp \
../../utils/copyfile.cpp \ ../../utils/copyfile.cpp \
../../utils/cpuconf.cpp \ ../../utils/cpuconf.cpp \
../../utils/debuglog.cpp \
../../utils/ecrontab.cpp \ ../../utils/ecrontab.cpp \
../../windows/execmd_w.cpp \ ../../windows/execmd_w.cpp \
../../windows/fnmatch.c \ ../../windows/fnmatch.c \
@ -93,6 +93,7 @@ SOURCES += \
../../utils/fstreewalk.cpp \ ../../utils/fstreewalk.cpp \
../../utils/hldata.cpp \ ../../utils/hldata.cpp \
../../utils/idfile.cpp \ ../../utils/idfile.cpp \
../../utils/log.cpp \
../../utils/md5.cpp \ ../../utils/md5.cpp \
../../utils/md5ut.cpp \ ../../utils/md5ut.cpp \
../../utils/mimeparse.cpp \ ../../utils/mimeparse.cpp \
@ -115,7 +116,7 @@ INCLUDEPATH += ../../common ../../index ../../internfile ../../query \
windows { windows {
contains(QMAKE_CC, gcc){ contains(QMAKE_CC, gcc){
# MingW # MingW
QMAKE_CXXFLAGS += -std=c++11 -Wno-unused-parameter QMAKE_CXXFLAGS += -std=c++11 -pthread -Wno-unused-parameter
} }
contains(QMAKE_CC, cl){ contains(QMAKE_CC, cl){
# Visual Studio # Visual Studio

2
src/windows/qmkrecoll/recollindex.pro
View File

@ -25,7 +25,7 @@ INCLUDEPATH += ../../common ../../index ../../internfile ../../query \
windows { windows {
contains(QMAKE_CC, gcc){ contains(QMAKE_CC, gcc){
# MingW # MingW
QMAKE_CXXFLAGS += -std=c++11 -Wno-unused-parameter QMAKE_CXXFLAGS += -std=c++11 -pthread -Wno-unused-parameter
} }
contains(QMAKE_CC, cl){ contains(QMAKE_CC, cl){
# Visual Studio # Visual Studio