From f869aa1591c6d48decef1d8817060e2bf5f2cbaf Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Sat, 27 Sep 2014 13:22:56 +0100 Subject: [PATCH] Change to test std::tuple now that Boost.TR1 is deprecated and due to be removed. --- test/sequence/tr1_tuple_auto_conv.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/sequence/tr1_tuple_auto_conv.cpp b/test/sequence/tr1_tuple_auto_conv.cpp index 010d4c71..d3aa62b9 100644 --- a/test/sequence/tr1_tuple_auto_conv.cpp +++ b/test/sequence/tr1_tuple_auto_conv.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include #include @@ -7,10 +7,10 @@ namespace Core { class AutoConverter { - std::tr1::shared_ptr t_; + std::shared_ptr t_; public: - AutoConverter(std::tr1::shared_ptr const & t) + AutoConverter(std::shared_ptr const & t) : t_(t) {} @@ -40,8 +40,8 @@ namespace Core inline AutoConverter Demo() { - std::tr1::shared_ptr p_result - (new boost::any(std::tr1::make_tuple(1, 2, 3, 4))); + std::shared_ptr p_result + (new boost::any(std::make_tuple(1, 2, 3, 4))); return p_result; } @@ -50,7 +50,7 @@ namespace Core int main() { - std::tr1::tuple test = Core::Demo(); + std::tuple test = Core::Demo(); return 0; }