From b95b77c6318d9539f41b05fe5d9c603b73994f29 Mon Sep 17 00:00:00 2001
From: Guillaume Munch <gm@lyx.org>
Date: Thu, 2 Jun 2016 20:06:59 +0100
Subject: [PATCH] Replace boost::tuple with std::tuple

---
 3rdparty/boost/extract.sh    |  1 -
 src/CutAndPaste.cpp          | 11 ++++-------
 src/insets/InsetGraphics.cpp |  9 +++------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/3rdparty/boost/extract.sh b/3rdparty/boost/extract.sh
index 4525cf09b3..cf42a53e3a 100755
--- 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 4d90c6c120..ccde5878f9 100644
--- 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 323eaacd6b..dc617fb177 100644
--- 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();