[Boost-commit] svn:boost r78396 - in trunk: boost/polygon libs/polygon/test

Subject: [Boost-commit] svn:boost r78396 - in trunk: boost/polygon libs/polygon/test
From: sydorchuk.andriy_at_[hidden]
Date: 2012-05-09 17:20:04

Author: asydorchuk
Date: 2012-05-09 17:20:03 EDT (Wed, 09 May 2012)
New Revision: 78396
URL: http://svn.boost.org/trac/boost/changeset/78396

Log:
Polygon: fixing Sandia-pgi-11.9 trunk test target.
Text files modified: 
   trunk/boost/polygon/polygon_45_set_data.hpp     |     2 +-                                      
   trunk/libs/polygon/test/voronoi_ctypes_test.cpp |     8 ++++----                                
   2 files changed, 5 insertions(+), 5 deletions(-)

Modified: trunk/boost/polygon/polygon_45_set_data.hpp
==============================================================================
--- trunk/boost/polygon/polygon_45_set_data.hpp	(original)
+++ trunk/boost/polygon/polygon_45_set_data.hpp	2012-05-09 17:20:03 EDT (Wed, 09 May 2012)
@@ -1456,7 +1456,7 @@
 
   template <typename cT, typename iT>
   void get_error_rects_shell(cT& posE, cT& negE, iT beginr, iT endr) {
-    typedef typename iT::value_type Point;
+    typedef typename std::iterator_traits<iT>::value_type Point;
     typedef typename point_traits<Point>::coordinate_type Unit;
     typedef typename coordinate_traits<Unit>::area_type area_type;
     Point pt1, pt2, pt3;

Modified: trunk/libs/polygon/test/voronoi_ctypes_test.cpp
==============================================================================
--- trunk/libs/polygon/test/voronoi_ctypes_test.cpp	(original)
+++ trunk/libs/polygon/test/voronoi_ctypes_test.cpp	2012-05-09 17:20:03 EDT (Wed, 09 May 2012)
@@ -24,8 +24,8 @@
   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 @@
   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);