mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-07 02:28:35 +00:00
Revert da8b5de97
because of MSVC 2017.
In GCC `min` is defined via including <vector>.
This commit is contained in:
parent
2c1753a526
commit
8af747c9d9
@ -15,6 +15,7 @@
|
||||
#include "CursorSlice.h"
|
||||
|
||||
#include <vector>
|
||||
#include <algorithm> // std::min in MSVC 2017
|
||||
|
||||
namespace lyx {
|
||||
|
||||
|
@ -61,7 +61,6 @@
|
||||
#include "support/lstrings.h"
|
||||
#include "support/textutils.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <atomic>
|
||||
#include <sstream>
|
||||
#include <vector>
|
||||
|
@ -44,8 +44,6 @@
|
||||
#include <QLineEdit>
|
||||
#include <QMenu>
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
using namespace std;
|
||||
using namespace lyx::support;
|
||||
|
||||
|
@ -32,8 +32,6 @@
|
||||
#include <QLineEdit>
|
||||
#include <QPushButton>
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
#ifdef IN
|
||||
#undef IN
|
||||
#endif
|
||||
|
@ -40,8 +40,6 @@
|
||||
#include <QSettings>
|
||||
#include <QVariant>
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
using namespace std;
|
||||
|
||||
namespace lyx {
|
||||
|
@ -82,7 +82,6 @@
|
||||
#include <QTextBoundaryFinder>
|
||||
#include <QTextCursor>
|
||||
|
||||
#include <algorithm>
|
||||
#include <sstream>
|
||||
#include <vector>
|
||||
|
||||
|
@ -40,8 +40,6 @@
|
||||
#include <QCloseEvent>
|
||||
#include <QHeaderView>
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
using namespace std;
|
||||
using namespace lyx::support;
|
||||
|
||||
|
@ -28,7 +28,6 @@
|
||||
#include "support/lstrings.h"
|
||||
#include "support/textutils.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <atomic>
|
||||
#include <map>
|
||||
#include <functional>
|
||||
|
Loading…
Reference in New Issue
Block a user