From b7c27e5e9658381b62e1b870dcfef353321a6c2d Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Sat, 6 May 2017 13:29:47 +0200 Subject: [PATCH] remove boost/tuple --- apps/openmw/mwgui/spellview.hpp | 2 +- components/misc/utf8stream.hpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/openmw/mwgui/spellview.hpp b/apps/openmw/mwgui/spellview.hpp index 7fea95cac..0eb69f6ba 100644 --- a/apps/openmw/mwgui/spellview.hpp +++ b/apps/openmw/mwgui/spellview.hpp @@ -1,7 +1,7 @@ #ifndef OPENMW_GUI_SPELLVIEW_H #define OPENMW_GUI_SPELLVIEW_H -#include +#include #include diff --git a/components/misc/utf8stream.hpp b/components/misc/utf8stream.hpp index 4856d6503..760015902 100644 --- a/components/misc/utf8stream.hpp +++ b/components/misc/utf8stream.hpp @@ -1,7 +1,7 @@ #ifndef MISC_UTF8ITER_HPP #define MISC_UTF8ITER_HPP -#include +#include class Utf8Stream { @@ -60,7 +60,7 @@ public: int octets; UnicodeChar chr; - boost::tie (octets, chr) = octet_count (*cur++); + std::tie (octets, chr) = octet_count (*cur++); if (octets > 5) return std::make_pair (sBadChar(), cur); @@ -104,7 +104,7 @@ private: void next () { - boost::tie (val, nxt) = decode (nxt, end); + std::tie (val, nxt) = decode (nxt, end); } Point cur;