Change to test std::tuple now that Boost.TR1 is deprecated and due to be removed.

This commit is contained in:
jzmaddock
2014-09-27 13:22:56 +01:00
parent 5102d6874f
commit f869aa1591

View File

@ -1,5 +1,5 @@
#include <boost/tr1/memory.hpp> #include <memory>
#include <boost/tr1/tuple.hpp> #include <tuple>
#include <boost/any.hpp> #include <boost/any.hpp>
#include <iostream> #include <iostream>
@ -7,10 +7,10 @@ namespace Core
{ {
class AutoConverter class AutoConverter
{ {
std::tr1::shared_ptr<boost::any> t_; std::shared_ptr<boost::any> t_;
public: public:
AutoConverter(std::tr1::shared_ptr<boost::any> const & t) AutoConverter(std::shared_ptr<boost::any> const & t)
: t_(t) : t_(t)
{} {}
@ -40,8 +40,8 @@ namespace Core
inline AutoConverter Demo() inline AutoConverter Demo()
{ {
std::tr1::shared_ptr<boost::any> p_result std::shared_ptr<boost::any> p_result
(new boost::any(std::tr1::make_tuple(1, 2, 3, 4))); (new boost::any(std::make_tuple(1, 2, 3, 4)));
return p_result; return p_result;
} }
@ -50,7 +50,7 @@ namespace Core
int main() int main()
{ {
std::tr1::tuple<int, int, int, int> test = Core::Demo(); std::tuple<int, int, int, int> test = Core::Demo();
return 0; return 0;
} }