From 790810757aa694ee6f33d1e4a177908887029deb Mon Sep 17 00:00:00 2001 From: Kohei Takahashi Date: Wed, 8 Oct 2014 23:55:29 +0900 Subject: [PATCH 1/2] Rename the test tr1_tuple_auto_conv to std_tuple_auto_conv. Signed-off-by: Kohei Takahashi --- test/Jamfile | 2 +- .../{tr1_tuple_auto_conv.cpp => std_tuple_auto_conv.cpp} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename test/sequence/{tr1_tuple_auto_conv.cpp => std_tuple_auto_conv.cpp} (100%) diff --git a/test/Jamfile b/test/Jamfile index e89c3017..ecd391c0 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -117,7 +117,6 @@ project [ run sequence/tuple_mutate.cpp : : : : ] [ run sequence/tuple_hash.cpp : : : : ] [ run sequence/tuple_tie.cpp : : : : ] - [ run sequence/tr1_tuple_auto_conv.cpp : : : : ] [ run sequence/transform_view.cpp : : : : ] [ run sequence/vector_comparison.cpp : : : : ] [ run sequence/vector_construction.cpp : : : : ] @@ -156,6 +155,7 @@ project [ run sequence/define_tpl_struct_inline.cpp : : : : ] [ run sequence/define_assoc_tpl_struct.cpp : : : : ] [ run sequence/std_tuple.cpp : : : : ] + [ run sequence/std_tuple_auto_conv.cpp : : : : ] [ run sequence/std_tuple_iterator.cpp : : : : ] [ run sequence/ref_vector.cpp : : : : ] [ run sequence/flatten_view.cpp : : : : ] diff --git a/test/sequence/tr1_tuple_auto_conv.cpp b/test/sequence/std_tuple_auto_conv.cpp similarity index 100% rename from test/sequence/tr1_tuple_auto_conv.cpp rename to test/sequence/std_tuple_auto_conv.cpp From b8c65b976ca47791ebfafdc7d6c92710d05a57c1 Mon Sep 17 00:00:00 2001 From: Kohei Takahashi Date: Wed, 8 Oct 2014 23:57:55 +0900 Subject: [PATCH 2/2] Fix test error on non-c++11 env. Signed-off-by: Kohei Takahashi --- test/sequence/std_tuple_auto_conv.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/test/sequence/std_tuple_auto_conv.cpp b/test/sequence/std_tuple_auto_conv.cpp index d3aa62b9..ebd83910 100644 --- a/test/sequence/std_tuple_auto_conv.cpp +++ b/test/sequence/std_tuple_auto_conv.cpp @@ -1,3 +1,8 @@ +#include + +#if !defined(BOOST_NO_CXX11_HDR_TUPLE) && \ + !defined(BOOST_NO_CXX11_SMART_PTR) + #include #include #include @@ -54,3 +59,12 @@ int main() return 0; } +#else + +int main() +{ + return 0; +} + +#endif +