Replace boost::tuple with std::tuple

diff --git a/3rdparty/boost/extract.sh b/3rdparty/boost/extract.sh
index 4525cf09b3b6f8696a180fbf027712ede10b87da..cf42a53e3ac9f9f9dbbb870c100d30418c69d5cb 100755 (executable)
--- a/3rdparty/boost/extract.sh
+++ b/3rdparty/boost/extract.sh
@@ -29,7 +29,6 @@ bcp --boost=$1 \
        boost/signal.hpp \
        boost/signals/connection.hpp \
        boost/signals/trackable.hpp \
-       boost/tuple/tuple.hpp \
        \
        needed
 

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index 4d90c6c120daacaf2dcbe3ea9fc3561cc4120605..ccde5878f9255c7eeb0bda2d6d81280b0103e228 100644 (file)
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -68,9 +68,8 @@
 #include "frontends/Clipboard.h"
 #include "frontends/Selection.h"
 
-#include <boost/tuple/tuple.hpp>
-
 #include <string>
+#include <tuple>
 
 using namespace std;
 using namespace lyx::support;
@@ -876,11 +875,9 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut)
                if (begpit != endpit)
                        cur.screenUpdateFlags(Update::Force | Update::FitCursor);
 
-               boost::tie(endpit, endpos) =
-                       eraseSelectionHelper(bp,
-                               text->paragraphs(),
-                               begpit, endpit,
-                               cur.selBegin().pos(), endpos);
+               tie(endpit, endpos) =
+                       eraseSelectionHelper(bp, text->paragraphs(), begpit, endpit,
+                                            cur.selBegin().pos(), endpos);
 
                // cutSelection can invalidate the cursor so we need to set
                // it anew. (Lgb)

diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp
index 323eaacd6b2966236ac7b4fe040de057d25c1bbd..dc617fb1773cfc34ae1454c19ee9806244faa0d8 100644 (file)
--- a/src/insets/InsetGraphics.cpp
+++ b/src/insets/InsetGraphics.cpp
@@ -84,10 +84,9 @@ TODO
 #include "support/os.h"
 #include "support/Systemcall.h"
 
-#include <boost/tuple/tuple.hpp>
-
 #include <algorithm>
 #include <sstream>
+#include <tuple>
 
 using namespace std;
 using namespace lyx::support;
@@ -595,8 +594,7 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const
        // we move it to a temp dir or uncompress it.
        FileName temp_file;
        GraphicsCopyStatus status;
-       boost::tie(status, temp_file) =
-                       copyToDirIfNeeded(params().filename, temp_path);
+       tie(status, temp_file) = copyToDirIfNeeded(params().filename, temp_path);
 
        if (status == FAILURE)
                return orig_file;
@@ -891,8 +889,7 @@ string InsetGraphics::prepareHTMLFile(OutputParams const & runparams) const
        // Copy to temporary directory.
        FileName temp_file;
        GraphicsCopyStatus status;
-       boost::tie(status, temp_file) =
-                       copyToDirIfNeeded(params().filename, temp_path);
+       tie(status, temp_file) = copyToDirIfNeeded(params().filename, temp_path);
 
        if (status == FAILURE)
                return string();