anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 23:07:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Disambiguate std::bind, boost::bind, std::ref, boost::ref (2)

Browse Source 
This fixes compilation with MSVC2012.

See also [2b0a7a5e/lyxgit].
This commit is contained in:
Vincent van Ravesteijn 2012-10-08 21:28:55 +02:00
parent 926bb4b41a
commit 9547725c38
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/frontends/qt4/GuiView.cpp
View File

@ -3100,21 +3100,21 @@ Buffer::ExportStatus GuiView::GuiViewPrivate::runAndDestroy(const T& func, Buffe
Buffer::ExportStatus GuiView::GuiViewPrivate::compileAndDestroy(Buffer const * orig, Buffer * clone, string const & format)
{
Buffer::ExportStatus (Buffer::* mem_func)(std::string const &, bool) const = &Buffer::doExport;
return runAndDestroy(bind(mem_func, clone, _1, true), orig, clone, format);
return runAndDestroy(lyx::bind(mem_func, clone, _1, true), orig, clone, format);
}
Buffer::ExportStatus GuiView::GuiViewPrivate::exportAndDestroy(Buffer const * orig, Buffer * clone, string const & format)
{
Buffer::ExportStatus (Buffer::* mem_func)(std::string const &, bool) const = &Buffer::doExport;
return runAndDestroy(bind(mem_func, clone, _1, false), orig, clone, format);
return runAndDestroy(lyx::bind(mem_func, clone, _1, false), orig, clone, format);
}
Buffer::ExportStatus GuiView::GuiViewPrivate::previewAndDestroy(Buffer const * orig, Buffer * clone, string const & format)
{
Buffer::ExportStatus (Buffer::* mem_func)(std::string const &) const = &Buffer::preview;
return runAndDestroy(bind(mem_func, clone, _1), orig, clone, format);
return runAndDestroy(lyx::bind(mem_func, clone, _1), orig, clone, format);
}
#else