[compute] 41/46: Minor fixes related to Boost Inspection Report (1.60 develop)
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Mon Dec 21 18:28:47 UTC 2015
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository compute.
commit 1f4088200d4f93c3707dd966c48e01bb190c34db
Author: Jakub Szuppe <j.szuppe at gmail.com>
Date: Sun Dec 6 18:35:29 2015 +0100
Minor fixes related to Boost Inspection Report (1.60 develop)
---
include/boost/compute/algorithm/detail/binary_find.hpp | 8 ++++----
include/boost/compute/algorithm/max_element.hpp | 2 +-
include/boost/compute/algorithm/min_element.hpp | 2 +-
include/boost/compute/algorithm/minmax_element.hpp | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/boost/compute/algorithm/detail/binary_find.hpp b/include/boost/compute/algorithm/detail/binary_find.hpp
index 79bdb8b..2de12dd 100644
--- a/include/boost/compute/algorithm/detail/binary_find.hpp
+++ b/include/boost/compute/algorithm/detail/binary_find.hpp
@@ -114,11 +114,11 @@ inline InputIterator binary_find(InputIterator first,
}
// Make sure that first and last stay within the input range
- search_last = std::min(search_last, last);
- search_last = std::max(search_last, first);
+ search_last = (std::min)(search_last, last);
+ search_last = (std::max)(search_last, first);
- search_first = std::max(search_first, first);
- search_first = std::min(search_first, last);
+ search_first = (std::max)(search_first, first);
+ search_first = (std::min)(search_first, last);
count = iterator_range_size(search_first, search_last);
}
diff --git a/include/boost/compute/algorithm/max_element.hpp b/include/boost/compute/algorithm/max_element.hpp
index 4384404..55f2f7f 100644
--- a/include/boost/compute/algorithm/max_element.hpp
+++ b/include/boost/compute/algorithm/max_element.hpp
@@ -24,7 +24,7 @@ namespace compute {
///
/// \param first first element in the input range
/// \param last last element in the input range
-/// \param compare comparison function object which returns true if the first
+/// \param compare comparison function object which returns true if the first
/// argument is less than (i.e. is ordered before) the second.
/// \param queue command queue to perform the operation
///
diff --git a/include/boost/compute/algorithm/min_element.hpp b/include/boost/compute/algorithm/min_element.hpp
index 97603af..62744ef 100644
--- a/include/boost/compute/algorithm/min_element.hpp
+++ b/include/boost/compute/algorithm/min_element.hpp
@@ -24,7 +24,7 @@ namespace compute {
///
/// \param first first element in the input range
/// \param last last element in the input range
-/// \param compare comparison function object which returns true if the first
+/// \param compare comparison function object which returns true if the first
/// argument is less than (i.e. is ordered before) the second.
/// \param queue command queue to perform the operation
///
diff --git a/include/boost/compute/algorithm/minmax_element.hpp b/include/boost/compute/algorithm/minmax_element.hpp
index 600add7..bf32c3c 100644
--- a/include/boost/compute/algorithm/minmax_element.hpp
+++ b/include/boost/compute/algorithm/minmax_element.hpp
@@ -27,7 +27,7 @@ namespace compute {
///
/// \param first first element in the input range
/// \param last last element in the input range
-/// \param compare comparison function object which returns true if the first
+/// \param compare comparison function object which returns true if the first
/// argument is less than (i.e. is ordered before) the second.
/// \param queue command queue to perform the operation
///
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/compute.git
More information about the debian-science-commits
mailing list