Revert da8b5de97 because of MSVC 2017.

In GCC `min` is defined via including <vector>.

diff --git a/src/DocIterator.h b/src/DocIterator.h
index a3786c4401bbe23362c21014139fa4abe78c7df3..344445b149073fefafc64234cce37a2370dcba51 100644 (file)
--- a/src/DocIterator.h
+++ b/src/DocIterator.h
@@ -15,6 +15,7 @@
 #include "CursorSlice.h"
 
 #include <vector>
+#include <algorithm> // std::min in MSVC 2017
 
 namespace lyx {
 

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 98e051445e7cefd132b3209a060f883adb2eec5a..6578e2a19c730de9ab9a3df3c28285dd3435fcc4 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -61,7 +61,6 @@
 #include "support/lstrings.h"
 #include "support/textutils.h"
 
-#include <algorithm>
 #include <atomic>
 #include <sstream>
 #include <vector>

diff --git a/src/frontends/qt/FindAndReplace.cpp b/src/frontends/qt/FindAndReplace.cpp
index 4d14bcfccbf4784a821afa5d3fb2f1054fe2a0b0..af2bbbbea393d40bab97ffc370478180f1807787 100644 (file)
--- a/src/frontends/qt/FindAndReplace.cpp
+++ b/src/frontends/qt/FindAndReplace.cpp
@@ -44,8 +44,6 @@
 #include <QLineEdit>
 #include <QMenu>
 
-#include <algorithm>
-
 using namespace std;
 using namespace lyx::support;
 

diff --git a/src/frontends/qt/GuiBox.cpp b/src/frontends/qt/GuiBox.cpp
index a722ed3d61186e9264ace3b4eb351c929553d9e2..298009da1b0c3691f39c5ed6d2d032ebea1fab5d 100644 (file)
--- a/src/frontends/qt/GuiBox.cpp
+++ b/src/frontends/qt/GuiBox.cpp
@@ -32,8 +32,6 @@
 #include <QLineEdit>
 #include <QPushButton>
 
-#include <algorithm>
-
 #ifdef IN
 #undef IN
 #endif

diff --git a/src/frontends/qt/GuiCharacter.cpp b/src/frontends/qt/GuiCharacter.cpp
index 96e8d736ffb47cd11186d776efedb9acff442ee2..cfa481c83294cb880a1804c97e70bfbdc27b48d3 100644 (file)
--- a/src/frontends/qt/GuiCharacter.cpp
+++ b/src/frontends/qt/GuiCharacter.cpp
@@ -40,8 +40,6 @@
 #include <QSettings>
 #include <QVariant>
 
-#include <algorithm>
-
 using namespace std;
 
 namespace lyx {

diff --git a/src/frontends/qt/GuiDocument.cpp b/src/frontends/qt/GuiDocument.cpp
index d691cc7bd88331c9022f0932e99e8ab973245cd7..7e1ec248b142d3a2f3aebaa01f165962df740494 100644 (file)
--- a/src/frontends/qt/GuiDocument.cpp
+++ b/src/frontends/qt/GuiDocument.cpp
@@ -82,7 +82,6 @@
 #include <QTextBoundaryFinder>
 #include <QTextCursor>
 
-#include <algorithm>
 #include <sstream>
 #include <vector>
 

diff --git a/src/frontends/qt/GuiRef.cpp b/src/frontends/qt/GuiRef.cpp
index b0aaba6a87b3912fd76cac712926a53c1c734b7c..83be3477377991b332d6715907dcd4e9c218e1b6 100644 (file)
--- a/src/frontends/qt/GuiRef.cpp
+++ b/src/frontends/qt/GuiRef.cpp
@@ -40,8 +40,6 @@
 #include <QCloseEvent>
 #include <QHeaderView>
 
-#include <algorithm>
-
 using namespace std;
 using namespace lyx::support;
 

diff --git a/src/xml.cpp b/src/xml.cpp
index e50e55972b042b53ca6459b64ff371d62bf78efa..dda39a4f3f6088e12da2e5a948071aa782c706b1 100644 (file)
--- a/src/xml.cpp
+++ b/src/xml.cpp
@@ -28,7 +28,6 @@
 #include "support/lstrings.h"
 #include "support/textutils.h"
 
-#include <algorithm>
 #include <atomic>
 #include <map>
 #include <functional>