commit 26d27eda585b1e5e8a2aed0e109d04b05ab86e77
Author: Pavel Sanda <[email protected]>
Date: Wed Oct 23 20:07:16 2024 +0200
Requiring C+11 & purging boost includes makes bind.h useless.
---
src/frontends/qt/GuiView.cpp | 4 ++--
src/frontends/qt/InGuiThread.h | 4 ++--
src/insets/RenderGraphic.cpp | 2 --
src/support/ForkedCalls.cpp | 6 ++++--
src/support/Makefile.am | 1 -
src/support/bind.h | 24 ------------------------
6 files changed, 8 insertions(+), 33 deletions(-)
diff --git a/src/frontends/qt/GuiView.cpp b/src/frontends/qt/GuiView.cpp
index de796ad01c..e1c21edf86 100644
--- a/src/frontends/qt/GuiView.cpp
+++ b/src/frontends/qt/GuiView.cpp
@@ -122,8 +122,6 @@
#define EXPORT_in_THREAD 1
-#include "support/bind.h"
-
#include <sstream>
#ifdef HAVE_SYS_TIME_H
@@ -142,6 +140,8 @@ namespace lyx {
using support::addExtension;
using support::changeExtension;
using support::removeExtension;
+using std::bind;
+using std::placeholders::_1;
namespace frontend {
diff --git a/src/frontends/qt/InGuiThread.h b/src/frontends/qt/InGuiThread.h
index 490ed51752..ffc62c8704 100644
--- a/src/frontends/qt/InGuiThread.h
+++ b/src/frontends/qt/InGuiThread.h
@@ -16,11 +16,11 @@
#include <QObject>
#include <QWaitCondition>
-#include "support/bind.h"
-
namespace lyx {
using std::function;
+using std::ref;
+using std::bind;
namespace frontend {
diff --git a/src/insets/RenderGraphic.cpp b/src/insets/RenderGraphic.cpp
index 318f8aab0d..e7eb23df66 100644
--- a/src/insets/RenderGraphic.cpp
+++ b/src/insets/RenderGraphic.cpp
@@ -28,8 +28,6 @@
#include "support/filetools.h"
#include "support/gettext.h"
-#include "support/bind.h"
-
using namespace std;
namespace lyx {
diff --git a/src/support/ForkedCalls.cpp b/src/support/ForkedCalls.cpp
index 3b505c64ee..6062a07a12 100644
--- a/src/support/ForkedCalls.cpp
+++ b/src/support/ForkedCalls.cpp
@@ -21,8 +21,6 @@
#include "support/os.h"
#include "support/Timeout.h"
-#include "support/bind.h"
-
#include <cerrno>
#include <cstring>
#include <list>
@@ -50,6 +48,10 @@ using namespace std;
namespace lyx {
+
+using std::placeholders::_1;
+using std::bind;
+
namespace support {
namespace {
diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 15e5cfc373..a59fa2ccbf 100644
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -35,7 +35,6 @@ liblyxsupport_a_SOURCES = \
FileMonitor.h \
FileMonitor.cpp \
RandomAccessList.h \
- bind.h \
Cache.h \
Changer.h \
checksum.cpp \
diff --git a/src/support/bind.h b/src/support/bind.h
deleted file mode 100644
index ede960eed4..0000000000
--- a/src/support/bind.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// -*- C++ -*-
-/**
- * \file bind.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Peter KĂźmmel
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#ifndef LYX_BIND_H
-#define LYX_BIND_H
-
-namespace lyx
-{
- using std::placeholders::_1;
- using std::placeholders::_2;
- using std::bind;
- using std::ref;
-} // namespace
-
-
-#endif
--
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs
