From aa7ca6a6bd5aad8062ba0343fd8a655e723dd4b9 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Tue, 22 Oct 2024 20:45:20 +0200 Subject: [PATCH] Requiring C+11 & purging boost includes makes functional.h useless. --- src/frontends/qt/InGuiThread.h | 4 +++- src/support/Makefile.am | 1 - src/support/bind.h | 2 -- src/support/functional.h | 23 ----------------------- 4 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 src/support/functional.h diff --git a/src/frontends/qt/InGuiThread.h b/src/frontends/qt/InGuiThread.h index 6152570cb2..490ed51752 100644 --- a/src/frontends/qt/InGuiThread.h +++ b/src/frontends/qt/InGuiThread.h @@ -17,9 +17,11 @@ #include #include "support/bind.h" -#include "support/functional.h" namespace lyx { + +using std::function; + namespace frontend { diff --git a/src/support/Makefile.am b/src/support/Makefile.am index 8f50e673bd..15e5cfc373 100644 --- a/src/support/Makefile.am +++ b/src/support/Makefile.am @@ -65,7 +65,6 @@ liblyxsupport_a_SOURCES = \ filetools.h \ ForkedCalls.cpp \ ForkedCalls.h \ - functional.h \ gettext.cpp \ gettext.h \ gzstream.cpp \ diff --git a/src/support/bind.h b/src/support/bind.h index e9b6a63277..ede960eed4 100644 --- a/src/support/bind.h +++ b/src/support/bind.h @@ -12,8 +12,6 @@ #ifndef LYX_BIND_H #define LYX_BIND_H -#include "support/functional.h" - namespace lyx { using std::placeholders::_1; diff --git a/src/support/functional.h b/src/support/functional.h deleted file mode 100644 index 6673dedb81..0000000000 --- a/src/support/functional.h +++ /dev/null @@ -1,23 +0,0 @@ -// -*- C++ -*- -/** - * \file functional.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_FUNCTIONAL_H -#define LYX_FUNCTIONAL_H - -#include - -namespace lyx -{ - using std::function; -} - - -#endif