[test] Rename occurances of CS because this name is used as a macro on Solaris.

This commit is contained in:
Adam Wulkiewicz 2015-03-14 05:10:58 +01:00
parent e5c7ac09c9
commit 059142283d
2 changed files with 23 additions and 23 deletions

View File

@ -58,13 +58,13 @@ void test_all()
//std::cout << sizeof(typename coordinate_type<S>::type) << std::endl;
typedef bg::model::referring_segment<P const> CS;
//BOOST_CONCEPT_ASSERT( (concept::ConstSegment<CS>) );
typedef bg::model::referring_segment<P const> refseg_t;
//BOOST_CONCEPT_ASSERT( (concept::ConstSegment<refseg_t>) );
CS cs(p1, p2);
refseg_t seg(p1, p2);
typedef typename bg::coordinate_type<CS>::type CT;
typedef typename bg::point_type<CS>::type CSP;
typedef typename bg::coordinate_type<refseg_t>::type CT;
typedef typename bg::point_type<refseg_t>::type CSP;
boost::ignore_unused<CT, CSP>();
}

View File

@ -180,7 +180,7 @@ struct test_distance_result_box
//=========================================================================
template <std::size_t D, typename CS>
template <std::size_t D, typename CoordinateSystem>
inline void test_segment_all()
{
#if defined(HAVE_TTMATH)
@ -189,32 +189,32 @@ inline void test_segment_all()
#endif
typedef typename boost::mpl::if_
<
typename boost::is_same<CS, bg::cs::cartesian>::type,
typename boost::is_same<CoordinateSystem, bg::cs::cartesian>::type,
double,
float
>::type float_return_type;
test_distance_result_segment<short, short, D, CS, double>();
test_distance_result_segment<int, int, D, CS, double>();
test_distance_result_segment<int, long, D, CS, double>();
test_distance_result_segment<long, long, D, CS, double>();
test_distance_result_segment<short, short, D, CoordinateSystem, double>();
test_distance_result_segment<int, int, D, CoordinateSystem, double>();
test_distance_result_segment<int, long, D, CoordinateSystem, double>();
test_distance_result_segment<long, long, D, CoordinateSystem, double>();
test_distance_result_segment<int, float, D, CS, float_return_type>();
test_distance_result_segment<float, float, D, CS, float_return_type>();
test_distance_result_segment<int, float, D, CoordinateSystem, float_return_type>();
test_distance_result_segment<float, float, D, CoordinateSystem, float_return_type>();
test_distance_result_segment<int, double, D, CS, double>();
test_distance_result_segment<double, int, D, CS, double>();
test_distance_result_segment<float, double, D, CS, double>();
test_distance_result_segment<double, float, D, CS, double>();
test_distance_result_segment<double, double, D, CS, double>();
test_distance_result_segment<int, double, D, CoordinateSystem, double>();
test_distance_result_segment<double, int, D, CoordinateSystem, double>();
test_distance_result_segment<float, double, D, CoordinateSystem, double>();
test_distance_result_segment<double, float, D, CoordinateSystem, double>();
test_distance_result_segment<double, double, D, CoordinateSystem, double>();
#if defined(HAVE_TTMATH)
test_distance_result_segment<tt, int, D, CS, tt>();
test_distance_result_segment<tt, default_integral, D, CS, tt>();
test_distance_result_segment<tt, int, D, CoordinateSystem, tt>();
test_distance_result_segment<tt, default_integral, D, CoordinateSystem, tt>();
test_distance_result_segment<tt, float, D, CS, tt>();
test_distance_result_segment<tt, double, D, CS, tt>();
test_distance_result_segment<tt, tt, D, CS, tt>();
test_distance_result_segment<tt, float, D, CoordinateSystem, tt>();
test_distance_result_segment<tt, double, D, CoordinateSystem, tt>();
test_distance_result_segment<tt, tt, D, CoordinateSystem, tt>();
#endif
}