On Tue, Oct 22, 2024 at 10:11:21AM +0200, Jean-Marc Lasgouttes wrote: > Le 21/10/2024 ?? 21:46, Pavel Sanda a écrit : > > Hi, > > > > after requiring C+11 & purging boost includes from functional.h, the > > leftover > > stub is IMHO ready to go, see attached. > > Go for it.
And the same holds for bind.h. Ok? Pavel
diff --git a/src/frontends/qt/GuiView.cpp b/src/frontends/qt/GuiView.cpp index 3778b7e2d3..2d507b9e63 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/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-devel mailing list lyx-devel@lists.lyx.org https://lists.lyx.org/mailman/listinfo/lyx-devel