From 9547725c38c6333a2778e5efb25230b35fc0df9f Mon Sep 17 00:00:00 2001 From: Vincent van Ravesteijn Date: Mon, 8 Oct 2012 21:28:55 +0200 Subject: [PATCH] Disambiguate std::bind, boost::bind, std::ref, boost::ref (2) This fixes compilation with MSVC2012. See also [2b0a7a5e/lyxgit]. --- src/frontends/qt4/GuiView.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index 953125c375..b29a4f8fbb 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -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