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

Subject: [Boost-commit] svn:boost r78416 - in trunk: boost/polygon/detail libs/polygon/test
From: sydorchuk.andriy_at_[hidden]
Date: 2012-05-10 18:50:04

Author: asydorchuk
Date: 2012-05-10 18:50:02 EDT (Thu, 10 May 2012)
New Revision: 78416
URL: http://svn.boost.org/trac/boost/changeset/78416

Log:
Polygon: fixing Boost.Inspect errors detected in sources.
Text files modified: 
   trunk/boost/polygon/detail/minkowski.hpp                   |     6 ++++++                                  
   trunk/boost/polygon/detail/polygon_arbitrary_formation.hpp |     2 +-                                      
   trunk/libs/polygon/test/voronoi_test_helper.hpp            |     8 ++++----                                
   3 files changed, 11 insertions(+), 5 deletions(-)

Modified: trunk/boost/polygon/detail/minkowski.hpp
==============================================================================
--- trunk/boost/polygon/detail/minkowski.hpp	(original)
+++ trunk/boost/polygon/detail/minkowski.hpp	2012-05-10 18:50:02 EDT (Thu, 10 May 2012)
@@ -1,4 +1,10 @@
+/*
+  Copyright 2008 Intel Corporation
 
+  Use, modification and distribution are subject to the Boost Software License,
+  Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+  http://www.boost.org/LICENSE_1_0.txt).
+*/
 namespace boost { namespace polygon { namespace detail {
 
 template <typename coordinate_type>

Modified: trunk/boost/polygon/detail/polygon_arbitrary_formation.hpp
==============================================================================
--- trunk/boost/polygon/detail/polygon_arbitrary_formation.hpp	(original)
+++ trunk/boost/polygon/detail/polygon_arbitrary_formation.hpp	2012-05-10 18:50:02 EDT (Thu, 10 May 2012)
@@ -554,7 +554,7 @@
         y_den = (dx1 * dy2 - dx2 * dy1);
         x = x_num / x_den;
         y = y_num / y_den;
-	//std::cout << x << " " << y << std::endl;
+        //std::cout << x << " " << y << std::endl;
         //std::cout << "cross1 " << dy1 << " " << dx2 << " " << dy1 * dx2 << std::endl;
         //std::cout << "cross2 " << dy2 << " " << dx1 << " " << dy2 * dx1 << std::endl;
         //Unit exp_x = compute_x_intercept<at>(x11, x21, y11, y21, dy1, dy2, dx1, dx2);

Modified: trunk/libs/polygon/test/voronoi_test_helper.hpp
==============================================================================
--- trunk/libs/polygon/test/voronoi_test_helper.hpp	(original)
+++ trunk/libs/polygon/test/voronoi_test_helper.hpp	2012-05-10 18:50:02 EDT (Thu, 10 May 2012)
@@ -158,8 +158,8 @@
     const point_type &point1 = edge_map_it1->first;
     for (size_type i = 0; i < edge_map_it1->second.size(); i++) {
       const point_type &point2 = edge_map_it1->second[i];
-      coordinate_type min_y1 = std::min(point1.y(), point2.y());
-      coordinate_type max_y1 = std::max(point1.y(), point2.y());
+      coordinate_type min_y1 = (std::min)(point1.y(), point2.y());
+      coordinate_type max_y1 = (std::max)(point1.y(), point2.y());
 
       // Find the first edge with greater or equal first point.
       edge_map_it_bound = edge_map.lower_bound(point2);
@@ -170,8 +170,8 @@
         const point_type &point3 = edge_map_it2->first;
         for (size_type j = 0; j < edge_map_it2->second.size(); j++) {
           const point_type &point4 = edge_map_it2->second[j];
-          coordinate_type min_y2 = std::min(point3.y(), point4.y());
-          coordinate_type max_y2 = std::max(point3.y(), point4.y());
+          coordinate_type min_y2 = (std::min)(point3.y(), point4.y());
+          coordinate_type max_y2 = (std::max)(point3.y(), point4.y());
           
           // In most cases it is enought to make 
           // simple intersection check in the y dimension.