From aac3ee24f36d9317f640d03acee91424881f73ea Mon Sep 17 00:00:00 2001 From: Andrii Sydorchuk Date: Wed, 9 May 2012 21:20:03 +0000 Subject: [PATCH] Polygon: fixing Sandia-pgi-11.9 trunk test target. [SVN r78396] --- include/boost/polygon/polygon_45_set_data.hpp | 2 +- test/voronoi_ctypes_test.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/boost/polygon/polygon_45_set_data.hpp b/include/boost/polygon/polygon_45_set_data.hpp index 1ab4c25..cf03518 100644 --- a/include/boost/polygon/polygon_45_set_data.hpp +++ b/include/boost/polygon/polygon_45_set_data.hpp @@ -1456,7 +1456,7 @@ namespace boost { namespace polygon{ template void get_error_rects_shell(cT& posE, cT& negE, iT beginr, iT endr) { - typedef typename iT::value_type Point; + typedef typename std::iterator_traits::value_type Point; typedef typename point_traits::coordinate_type Unit; typedef typename coordinate_traits::area_type area_type; Point pt1, pt2, pt3; diff --git a/test/voronoi_ctypes_test.cpp b/test/voronoi_ctypes_test.cpp index 0485854..fc87290 100644 --- a/test/voronoi_ctypes_test.cpp +++ b/test/voronoi_ctypes_test.cpp @@ -24,8 +24,8 @@ BOOST_AUTO_TEST_CASE(ulp_comparison_test1) { uint64 a = 22; uint64 b = 27; fpt64 da, db; - memcpy(&da, &a, sizeof(uint64)); - memcpy(&db, &b, sizeof(uint64)); + std::memcpy(&da, &a, sizeof(uint64)); + std::memcpy(&db, &b, sizeof(uint64)); BOOST_CHECK_EQUAL(ulp_cmp(da, db, 1), ulp_cmp.LESS); BOOST_CHECK_EQUAL(ulp_cmp(db, da, 1), ulp_cmp.MORE); BOOST_CHECK_EQUAL(ulp_cmp(da, db, 4), ulp_cmp.LESS); @@ -38,8 +38,8 @@ BOOST_AUTO_TEST_CASE(ulp_comparison_test2) { uint64 a = 0ULL; uint64 b = 0x8000000000000002ULL; fpt64 da, db; - memcpy(&da, &a, sizeof(uint64)); - memcpy(&db, &b, sizeof(uint64)); + std::memcpy(&da, &a, sizeof(uint64)); + std::memcpy(&db, &b, sizeof(uint64)); BOOST_CHECK_EQUAL(ulp_cmp(da, db, 1), ulp_cmp.MORE); BOOST_CHECK_EQUAL(ulp_cmp(db, da, 1), ulp_cmp.LESS); BOOST_CHECK_EQUAL(ulp_cmp(da, db, 2), ulp_cmp.EQUAL);