anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-26 22:17:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: fix merged build

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34954 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2010-07-17 22:24:30 +00:00
parent f151f3a30f
commit 30bae1710a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/BufferList.cpp
View File

@ -255,12 +255,12 @@ Buffer * BufferList::getBuffer(support::FileName const & fname) const
{ {
// 1) cheap test, using string comparison of file names // 1) cheap test, using string comparison of file names
BufferStorage::const_iterator it = find_if(bstore.begin(), bstore.end(), BufferStorage::const_iterator it = find_if(bstore.begin(), bstore.end(),
bind(equal_to<FileName>(), bind(&Buffer::fileName, _1), fname)); lyx::bind(equal_to<FileName>(), lyx::bind(&Buffer::fileName, _1), fname));
if (it != bstore.end()) if (it != bstore.end())
return *it; return *it;
// 2) possibly expensive test, using equivalence test of file names // 2) possibly expensive test, using equivalence test of file names
it = find_if(bstore.begin(), bstore.end(), it = find_if(bstore.begin(), bstore.end(),
bind(equivalent_to(), bind(&Buffer::fileName, _1), fname)); lyx::bind(equivalent_to(), lyx::bind(&Buffer::fileName, _1), fname));
return it != bstore.end() ? (*it) : 0; return it != bstore.end() ? (*it) : 0;
} }

8
src/support/ForkedCalls.cpp
View File

@ -84,7 +84,7 @@ private:
Murder(int secs, pid_t pid) Murder(int secs, pid_t pid)
: timeout_(1000*secs, Timeout::ONETIME), pid_(pid) : timeout_(1000*secs, Timeout::ONETIME), pid_(pid)
{ {
timeout_.timeout.connect(bind(&Murder::kill, this)); timeout_.timeout.connect(lyx::bind(&Murder::kill, this));
timeout_.start(); timeout_.start();
} }
@ -448,7 +448,7 @@ void callNext()
Process pro = callQueue_.front(); Process pro = callQueue_.front();
callQueue_.pop(); callQueue_.pop();
// Bind our chain caller // Bind our chain caller
pro.second->connect(bind(&ForkedCallQueue::callback, _1, _2)); pro.second->connect(lyx::bind(&ForkedCallQueue::callback, _1, _2));
ForkedCall call; ForkedCall call;
//If we fail to fork the process, then emit the signal //If we fail to fork the process, then emit the signal
//to tell the outside world that it failed. //to tell the outside world that it failed.
@ -537,8 +537,8 @@ static ListType forkedCalls;
iterator find_pid(pid_t pid) iterator find_pid(pid_t pid)
{ {
return find_if(forkedCalls.begin(), forkedCalls.end(), return find_if(forkedCalls.begin(), forkedCalls.end(),
bind(equal_to<pid_t>(), lyx::bind(equal_to<pid_t>(),
bind(&ForkedCall::pid, _1), lyx::bind(&ForkedCall::pid, _1),
pid)); pid));
} }