std::min/max are defined in <algorithm>

handle error in msvc12 when linking against msvc10 libs

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 48bf5400370403f0ed79039ba750f2eda7243fdf..5e403abc27e8bc8efdbe4fec86d2cdcbcccf3923 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -205,6 +205,10 @@ if(LYX_DEPENDENCIES_DOWNLOAD)
                endif()
        endforeach()
        set(GNUWIN32_DIR ${LYX_DEPENDENCIES_DIR}/deps20)
                endif()
        endforeach()
        set(GNUWIN32_DIR ${LYX_DEPENDENCIES_DIR}/deps20)

+    if(MSVC12)
+        # handle error in msvc12 when linking against msvc10 libs
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /vd2")
+    endif()

 endif()
 
 
 endif()
 
 

diff --git a/src/DocIterator.h b/src/DocIterator.h
index 3d5647c8931b55008a81f1470429bc94266a2ceb..77968191dd23af9042e0ba7110e6622034549d91 100644 (file)
--- a/src/DocIterator.h
+++ b/src/DocIterator.h
@@ -15,7 +15,7 @@
 #include "CursorSlice.h"
 
 #include <vector>
 #include "CursorSlice.h"
 
 #include <vector>

-
+#include <algorithm>

 
 namespace lyx {
 
 
 namespace lyx {
 

diff --git a/src/Encoding.cpp b/src/Encoding.cpp
index bc27675f13f7dad16f822a687aef8227f77e74f8..a6f6a60ea3162144c5711fed6c7853658502c9d6 100644 (file)
--- a/src/Encoding.cpp
+++ b/src/Encoding.cpp
@@ -25,6 +25,7 @@
 #include <boost/cstdint.hpp>
 
 #include <sstream>
 #include <boost/cstdint.hpp>
 
 #include <sstream>

+#include <algorithm>

 
 using namespace std;
 using namespace lyx::support;
 
 using namespace std;
 using namespace lyx::support;

diff --git a/src/mathed/InsetMathBrace.cpp b/src/mathed/InsetMathBrace.cpp
index 105165903d56b5dbe02feeb6345fe9cb2578ce0e..8b06f6d546d06c9095814b75dd12c8209b764d61 100644 (file)
--- a/src/mathed/InsetMathBrace.cpp
+++ b/src/mathed/InsetMathBrace.cpp
@@ -21,6 +21,7 @@
 #include "frontends/Painter.h"
 
 #include <ostream>
 #include "frontends/Painter.h"
 
 #include <ostream>

+#include <algorithm>

 
 using namespace std;
 
 
 using namespace std;
 

diff --git a/src/mathed/MathSupport.cpp b/src/mathed/MathSupport.cpp
index 21d41dd64e9ab6a4e4f4c090a95fd8a6501fdd49..ff4702ff71a586994787230692dbffdb3735150f 100644 (file)
--- a/src/mathed/MathSupport.cpp
+++ b/src/mathed/MathSupport.cpp
@@ -27,6 +27,7 @@
 #include "support/docstream.h"
 
 #include <map>
 #include "support/docstream.h"
 
 #include <map>

+#include <algorithm>

 
 using namespace std;
 
 
 using namespace std;