Skip to content

Commit 8237d94

Browse files
pdimovpdimov
committed
Move msvc-14.0 conditions from test/Jamfile into test sources
1 parent 155ed41 commit 8237d94

9 files changed

Lines changed: 108 additions & 56 deletions

‎test/Jamfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,31 +33,31 @@ run variant_size.cpp ;
3333
run variant_alternative.cpp ;
3434

3535
run variant_holds_alternative.cpp ;
36-
compile variant_holds_alternative_cx.cpp : <toolset>msvc-14.0:<build>no ;
36+
compile variant_holds_alternative_cx.cpp ;
3737

3838
run variant_get_by_index.cpp ;
39-
compile variant_get_by_index_cx.cpp : <toolset>msvc-14.0:<build>no ;
39+
compile variant_get_by_index_cx.cpp ;
4040

4141
run variant_get_by_type.cpp ;
42-
compile variant_get_by_type_cx.cpp : <toolset>msvc-14.0:<build>no ;
42+
compile variant_get_by_type_cx.cpp ;
4343

4444
run variant_default_construct.cpp ;
45-
compile variant_default_construct_cx.cpp : <toolset>msvc-14.0:<build>no ;
45+
compile variant_default_construct_cx.cpp ;
4646

4747
run variant_copy_construct.cpp ;
48-
compile variant_copy_construct_cx.cpp : <toolset>msvc-14.0:<build>no ;
48+
compile variant_copy_construct_cx.cpp ;
4949

5050
run variant_move_construct.cpp ;
5151
compile variant_move_construct_cx.cpp : [ requires cxx14_constexpr ] ;
5252

5353
run variant_value_construct.cpp ;
54-
compile variant_value_construct_cx.cpp : <toolset>msvc-14.0:<build>no ;
54+
compile variant_value_construct_cx.cpp ;
5555

5656
run variant_in_place_index_construct.cpp ;
57-
compile variant_in_place_index_construct_cx.cpp : <toolset>msvc-14.0:<build>no ;
57+
compile variant_in_place_index_construct_cx.cpp ;
5858

5959
run variant_in_place_type_construct.cpp ;
60-
compile variant_in_place_type_construct_cx.cpp : <toolset>msvc-14.0:<build>no ;
60+
compile variant_in_place_type_construct_cx.cpp ;
6161

6262
run variant_copy_assign.cpp ;
6363
compile variant_copy_assign_cx.cpp : [ requires cxx14_constexpr ] <toolset>gcc-5:<build>no <toolset>gcc-6:<build>no ;

‎test/variant_copy_construct_cx.cpp‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1-
2-
// Copyright 2017 Peter Dimov.
3-
//
1+
// Copyright 2017, 2026 Peter Dimov.
42
// Distributed under the Boost Software License, Version 1.0.
5-
//
6-
// See accompanying file LICENSE_1_0.txt or copy at
7-
// http://www.boost.org/LICENSE_1_0.txt
3+
// https://www.boost.org/LICENSE_1_0.txt
84

95
#include <boost/variant2/variant.hpp>
6+
#include <boost/config.hpp>
7+
#include <boost/config/pragma_message.hpp>
8+
9+
#if defined(BOOST_MSVC) && BOOST_MSVC < 1910
10+
11+
BOOST_PRAGMA_MESSAGE( "Test skipped because BOOST_MSVC < 1910" )
12+
int main() {}
13+
14+
#else
1015

1116
using namespace boost::variant2;
1217

@@ -110,3 +115,5 @@ int main()
110115

111116
#endif
112117
}
118+
119+
#endif

‎test/variant_default_construct_cx.cpp‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1-
2-
// Copyright 2017 Peter Dimov.
3-
//
1+
// Copyright 2017, 2026 Peter Dimov.
42
// Distributed under the Boost Software License, Version 1.0.
5-
//
6-
// See accompanying file LICENSE_1_0.txt or copy at
7-
// http://www.boost.org/LICENSE_1_0.txt
3+
// https://www.boost.org/LICENSE_1_0.txt
84

95
#include <boost/variant2/variant.hpp>
6+
#include <boost/config.hpp>
7+
#include <boost/config/pragma_message.hpp>
8+
9+
#if defined(BOOST_MSVC) && BOOST_MSVC < 1910
10+
11+
BOOST_PRAGMA_MESSAGE( "Test skipped because BOOST_MSVC < 1910" )
12+
int main() {}
13+
14+
#else
1015

1116
using namespace boost::variant2;
1217

@@ -49,3 +54,5 @@ int main()
4954
STATIC_ASSERT( get<0>(v) == 0 );
5055
}
5156
}
57+
58+
#endif

‎test/variant_get_by_index_cx.cpp‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1-
2-
// Copyright 2017 Peter Dimov.
3-
//
1+
// Copyright 2017, 2026 Peter Dimov.
42
// Distributed under the Boost Software License, Version 1.0.
5-
//
6-
// See accompanying file LICENSE_1_0.txt or copy at
7-
// http://www.boost.org/LICENSE_1_0.txt
3+
// https://www.boost.org/LICENSE_1_0.txt
84

95
#include <boost/variant2/variant.hpp>
106
#include <boost/config.hpp>
7+
#include <boost/config/pragma_message.hpp>
8+
9+
#if defined(BOOST_MSVC) && BOOST_MSVC < 1910
10+
11+
BOOST_PRAGMA_MESSAGE( "Test skipped because BOOST_MSVC < 1910" )
12+
int main() {}
13+
14+
#else
1115

1216
using namespace boost::variant2;
1317

@@ -94,3 +98,5 @@ int main()
9498
STATIC_ASSERT_IF( get_if<2>(&v) == &get<2>(v) );
9599
}
96100
}
101+
102+
#endif

‎test/variant_get_by_type_cx.cpp‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1-
2-
// Copyright 2017 Peter Dimov.
3-
//
1+
// Copyright 2017, 2026 Peter Dimov.
42
// Distributed under the Boost Software License, Version 1.0.
5-
//
6-
// See accompanying file LICENSE_1_0.txt or copy at
7-
// http://www.boost.org/LICENSE_1_0.txt
3+
// https://www.boost.org/LICENSE_1_0.txt
84

95
#include <boost/variant2/variant.hpp>
106
#include <boost/config.hpp>
7+
#include <boost/config/pragma_message.hpp>
8+
9+
#if defined(BOOST_MSVC) && BOOST_MSVC < 1910
10+
11+
BOOST_PRAGMA_MESSAGE( "Test skipped because BOOST_MSVC < 1910" )
12+
int main() {}
13+
14+
#else
1115

1216
using namespace boost::variant2;
1317

@@ -88,3 +92,5 @@ int main()
8892
STATIC_ASSERT_IF( get_if<float>(&v) == &get<float>(v) );
8993
}
9094
}
95+
96+
#endif

‎test/variant_holds_alternative_cx.cpp‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1-
2-
// Copyright 2017 Peter Dimov.
3-
//
1+
// Copyright 2017, 2026 Peter Dimov.
42
// Distributed under the Boost Software License, Version 1.0.
5-
//
6-
// See accompanying file LICENSE_1_0.txt or copy at
7-
// http://www.boost.org/LICENSE_1_0.txt
3+
// https://www.boost.org/LICENSE_1_0.txt
84

95
#include <boost/variant2/variant.hpp>
6+
#include <boost/config.hpp>
7+
#include <boost/config/pragma_message.hpp>
8+
9+
#if defined(BOOST_MSVC) && BOOST_MSVC < 1910
10+
11+
BOOST_PRAGMA_MESSAGE( "Test skipped because BOOST_MSVC < 1910" )
12+
int main() {}
13+
14+
#else
1015

1116
using namespace boost::variant2;
1217

@@ -41,3 +46,5 @@ int main()
4146
STATIC_ASSERT( holds_alternative<float>( v ) );
4247
}
4348
}
49+
50+
#endif

‎test/variant_in_place_index_construct_cx.cpp‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1-
2-
// Copyright 2017 Peter Dimov.
3-
//
1+
// Copyright 2017, 2026 Peter Dimov.
42
// Distributed under the Boost Software License, Version 1.0.
5-
//
6-
// See accompanying file LICENSE_1_0.txt or copy at
7-
// http://www.boost.org/LICENSE_1_0.txt
3+
// https://www.boost.org/LICENSE_1_0.txt
84

95
#include <boost/variant2/variant.hpp>
106
#include <boost/config.hpp>
117
#include <boost/config/workaround.hpp>
8+
#include <boost/config/pragma_message.hpp>
9+
10+
#if defined(BOOST_MSVC) && BOOST_MSVC < 1910
11+
12+
BOOST_PRAGMA_MESSAGE( "Test skipped because BOOST_MSVC < 1910" )
13+
int main() {}
14+
15+
#else
1216

1317
using namespace boost::variant2;
1418

@@ -119,3 +123,5 @@ int main()
119123

120124
#endif
121125
}
126+
127+
#endif

‎test/variant_in_place_type_construct_cx.cpp‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1-
2-
// Copyright 2017 Peter Dimov.
3-
//
1+
// Copyright 2017, 2026 Peter Dimov.
42
// Distributed under the Boost Software License, Version 1.0.
5-
//
6-
// See accompanying file LICENSE_1_0.txt or copy at
7-
// http://www.boost.org/LICENSE_1_0.txt
3+
// https://www.boost.org/LICENSE_1_0.txt
84

95
#include <boost/variant2/variant.hpp>
106
#include <boost/config.hpp>
117
#include <boost/config/workaround.hpp>
8+
#include <boost/config/pragma_message.hpp>
9+
10+
#if defined(BOOST_MSVC) && BOOST_MSVC < 1910
11+
12+
BOOST_PRAGMA_MESSAGE( "Test skipped because BOOST_MSVC < 1910" )
13+
int main() {}
14+
15+
#else
1216

1317
using namespace boost::variant2;
1418

@@ -118,3 +122,5 @@ int main()
118122

119123
#endif
120124
}
125+
126+
#endif

‎test/variant_value_construct_cx.cpp‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1-
2-
// Copyright 2017 Peter Dimov.
3-
//
1+
// Copyright 2017, 2026 Peter Dimov.
42
// Distributed under the Boost Software License, Version 1.0.
5-
//
6-
// See accompanying file LICENSE_1_0.txt or copy at
7-
// http://www.boost.org/LICENSE_1_0.txt
3+
// https://www.boost.org/LICENSE_1_0.txt
84

95
#include <boost/variant2/variant.hpp>
6+
#include <boost/config.hpp>
7+
#include <boost/config/pragma_message.hpp>
8+
9+
#if defined(BOOST_MSVC) && BOOST_MSVC < 1910
10+
11+
BOOST_PRAGMA_MESSAGE( "Test skipped because BOOST_MSVC < 1910" )
12+
int main() {}
13+
14+
#else
1015

1116
using namespace boost::variant2;
1217

@@ -107,3 +112,5 @@ int main()
107112
STATIC_ASSERT( holds_alternative<X>(v) );
108113
}
109114
}
115+
116+
#endif

0 commit comments

Comments
 (0)