Hi,
after requiring C+11 & purging boost includes from functional.h, the leftover
stub is IMHO ready to go, see attached.
Opinion?
Pavel
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 <QWaitCondition>
#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 4ff0ebd2cb..6ceb04ce5d 100644
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -66,7 +66,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 <functional>
-
-namespace lyx
-{
- using std::function;
-}
-
-
-#endif
--
lyx-devel mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-devel
