The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 2b0a7a5e01c71bd0c809844e0c6779f43870077b Author: Vincent van Ravesteijn <[email protected]> Date: Mon Oct 8 21:28:55 2012 +0200 Disambiguate std::bind, boost::bind, std::ref, boost::ref This fixes compilation with MSVC2012. diff --git a/src/frontends/qt4/InGuiThread.h b/src/frontends/qt4/InGuiThread.h index ea5d64b..0609cb0 100644 --- a/src/frontends/qt4/InGuiThread.h +++ b/src/frontends/qt4/InGuiThread.h @@ -69,25 +69,25 @@ public: template<class F, class P1> R call(F f, P1& p1) { - return call(bind(f, ref(p1))); + return call(lyx::bind(f, lyx::ref(p1))); } template<class F, class P1, class P2> R call(F f, P1& p1, P2& p2) { - return call(bind(f, ref(p1), ref(p2))); + return call(lyx::bind(f, lyx::ref(p1), lyx::ref(p2))); } template<class F, class P1, class P2, class P3> R call(F f, P1& p1, P2& p2, P3& p3) { - return call(bind(f, ref(p1), ref(p2), ref(p3))); + return call(lyx::bind(f, lyx::ref(p1), lyx::ref(p2), lyx::ref(p3))); } template<class F, class P1, class P2, class P3, class P4> R call(F f, P1& p1, P2& p2, P3& p3, P4& p4) { - return call(bind(f, ref(p1), ref(p2), ref(p3), ref(p4))); + return call(lyx::bind(f, lyx::ref(p1), lyx::ref(p2), lyx::ref(p3), lyx::ref(p4))); } /* @@ -97,7 +97,8 @@ public: template<class F, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8> R call(F f, P1& p1, P2& p2, P3& p3, P4& p4, P5& p5, P6& p6, P7& p7, P8& p8) { - return call(bind(f, ref(p1), ref(p2), ref(p3), ref(p4), ref(p5), ref(p6), ref(p7), ref(p8))); + return call(lyx::bind(f, lyx::ref(p1), lyx::ref(p2), lyx::ref(p3), lyx::ref(p4), + lyx::ref(p5), lyx::ref(p6), lyx::ref(p7), lyx::ref(p8))); } private: @@ -131,25 +132,25 @@ public: template<class F, class P1> void call(F f, P1& p1) { - call(bind(f, ref(p1))); + call(lyx::bind(f, lyx::ref(p1))); } template<class F, class P1, class P2> void call(F f, P1& p1, P2& p2) { - call(bind(f, ref(p1), ref(p2))); + call(lyx::bind(f, lyx::ref(p1), lyx::ref(p2))); } template<class F, class P1, class P2, class P3> void call(F f, P1& p1, P2& p2, P3& p3) { - call(bind(f, ref(p1), ref(p2), ref(p3))); + call(lyx::bind(f, lyx::ref(p1), lyx::ref(p2), lyx::ref(p3))); } template<class F, class P1, class P2, class P3, class P4> void call(F f, P1& p1, P2& p2, P3& p3, P4& p4) { - call(bind(f, ref(p1), ref(p2), ref(p3), ref(p4))); + call(lyx::bind(f, lyx::ref(p1), lyx::ref(p2), lyx::ref(p3), lyx::ref(p4))); } /* @@ -159,7 +160,8 @@ public: template<class F, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8> void call(F f, P1& p1, P2& p2, P3& p3, P4& p4, P5& p5, P6& p6, P7& p7, P8& p8) { - call(bind(f, ref(p1), ref(p2), ref(p3), ref(p4), ref(p5), ref(p6), ref(p7), ref(p8))); + call(bind(f, lyx::ref(p1), lyx::ref(p2), lyx::ref(p3), lyx::ref(p4), lyx::ref(p5), + lyx::ref(p6), lyx::ref(p7), lyx::ref(p8))); } private: commit 3bc9cbcdc8107503e48a685dd59ac177b1f28886 Author: Vincent van Ravesteijn <[email protected]> Date: Mon Oct 8 21:26:17 2012 +0200 Do not rely on make_pair converting string to FileName This fixes compilation with MSVC2012. diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp index 1b7e43d..9962af6 100644 --- a/src/insets/InsetGraphics.cpp +++ b/src/insets/InsetGraphics.cpp @@ -487,7 +487,7 @@ copyToDirIfNeeded(DocFileName const & file, string const & dir) string const file_in = file.absFileName(); string const only_path = onlyPath(file_in); if (rtrim(onlyPath(file_in) , "/") == rtrim(dir, "/")) - return make_pair(IDENTICAL_PATHS, file_in); + return make_pair(IDENTICAL_PATHS, FileName(file_in)); string mangled = file.mangledFileName(); if (formats.isZippedFile(file)) { ----------------------------------------------------------------------- Summary of changes: src/frontends/qt4/InGuiThread.h | 22 ++++++++++++---------- src/insets/InsetGraphics.cpp | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) hooks/post-receive -- The LyX Source Repository
