The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 9547725c38c6333a2778e5efb25230b35fc0df9f Author: Vincent van Ravesteijn <[email protected]> Date: Mon Oct 8 21:28:55 2012 +0200 Disambiguate std::bind, boost::bind, std::ref, boost::ref (2) This fixes compilation with MSVC2012. See also [2b0a7a5e/lyxgit]. diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index 953125c..b29a4f8 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 commit 926bb4b41a19265442b4bc512c1bd0a3d78f6f4a Author: Vincent van Ravesteijn <[email protected]> Date: Fri Oct 12 21:24:03 2012 +0200 support/tests: Fix compilation on Windows diff --git a/src/support/tests/CMakeLists.txt b/src/support/tests/CMakeLists.txt index 2189245..213b578 100644 --- a/src/support/tests/CMakeLists.txt +++ b/src/support/tests/CMakeLists.txt @@ -13,7 +13,7 @@ macro(sources _program) endforeach() set(${_program}_SOURCES ${_tmplist}) add_executable(${_program} ${_tmplist}) - target_link_libraries(${_program} support ${Lyx_Boost_Libraries} ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARY}) + target_link_libraries(${_program} support ${Lyx_Boost_Libraries} ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARY} ${LIBINTL_LIBRARIES} ${ICONV_LIBRARY}) endmacro() file(GLOB test_sources ${TOP_SRC_DIR}/src/support/tests/${LYX_CPP_FILES}) diff --git a/src/support/tests/check_convert.cpp b/src/support/tests/check_convert.cpp index 1e12a46..fdc008f 100644 --- a/src/support/tests/check_convert.cpp +++ b/src/support/tests/check_convert.cpp @@ -3,6 +3,7 @@ #include "../convert.h" #include <iostream> +#include <string> using lyx::convert; diff --git a/src/support/tests/dummy_functions.cpp b/src/support/tests/dummy_functions.cpp index 229198e..bfec86f 100644 --- a/src/support/tests/dummy_functions.cpp +++ b/src/support/tests/dummy_functions.cpp @@ -6,7 +6,7 @@ using namespace std; namespace lyx { // Dummy LyXRC support - struct LyXRC { string icon_set; } lyxrc; + class LyXRC { string icon_set; } lyxrc; // Keep the linker happy on Windows void lyx_exit(int) {} ----------------------------------------------------------------------- Summary of changes: src/frontends/qt4/GuiView.cpp | 6 +++--- src/support/tests/CMakeLists.txt | 2 +- src/support/tests/check_convert.cpp | 1 + src/support/tests/dummy_functions.cpp | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) hooks/post-receive -- The LyX Source Repository
