Revert da8b5de97 because of MSVC 2017.

In GCC `min` is defined via including <vector>.
This commit is contained in:
Pavel Sanda 2020-10-24 12:06:17 +02:00
parent 2c1753a526
commit 8af747c9d9
8 changed files with 1 additions and 11 deletions

View File

@ -15,6 +15,7 @@
#include "CursorSlice.h" #include "CursorSlice.h"
#include <vector> #include <vector>
#include <algorithm> // std::min in MSVC 2017
namespace lyx { namespace lyx {

View File

@ -61,7 +61,6 @@
#include "support/lstrings.h" #include "support/lstrings.h"
#include "support/textutils.h" #include "support/textutils.h"
#include <algorithm>
#include <atomic> #include <atomic>
#include <sstream> #include <sstream>
#include <vector> #include <vector>

View File

@ -44,8 +44,6 @@
#include <QLineEdit> #include <QLineEdit>
#include <QMenu> #include <QMenu>
#include <algorithm>
using namespace std; using namespace std;
using namespace lyx::support; using namespace lyx::support;

View File

@ -32,8 +32,6 @@
#include <QLineEdit> #include <QLineEdit>
#include <QPushButton> #include <QPushButton>
#include <algorithm>
#ifdef IN #ifdef IN
#undef IN #undef IN
#endif #endif

View File

@ -40,8 +40,6 @@
#include <QSettings> #include <QSettings>
#include <QVariant> #include <QVariant>
#include <algorithm>
using namespace std; using namespace std;
namespace lyx { namespace lyx {

View File

@ -82,7 +82,6 @@
#include <QTextBoundaryFinder> #include <QTextBoundaryFinder>
#include <QTextCursor> #include <QTextCursor>
#include <algorithm>
#include <sstream> #include <sstream>
#include <vector> #include <vector>

View File

@ -40,8 +40,6 @@
#include <QCloseEvent> #include <QCloseEvent>
#include <QHeaderView> #include <QHeaderView>
#include <algorithm>
using namespace std; using namespace std;
using namespace lyx::support; using namespace lyx::support;

View File

@ -28,7 +28,6 @@
#include "support/lstrings.h" #include "support/lstrings.h"
#include "support/textutils.h" #include "support/textutils.h"
#include <algorithm>
#include <atomic> #include <atomic>
#include <map> #include <map>
#include <functional> #include <functional>