Changeset 2154 for trunk/yat/normalizer/qQuantileNormalizer.h

Timestamp:

Jan 17, 2010, 11:21:29 PM (13 years ago)

Author:

Peter

Message:

using BOOST_CONCEPT_ASSERT. closes #603

File:

• trunk/yat/normalizer/qQuantileNormalizer.h (modified) (3 diffs)

trunk/yat/normalizer/qQuantileNormalizer.h

@@ -254 +254 @@
                                  utility::unweighted_iterator_tag tag) const
   {
-    using boost::function_requires;
-    function_requires<boost::RandomAccessIterator<RandomAccessIterator1> >();
-    function_requires<boost::Mutable_RandomAccessIterator<RandomAccessIterator2> >();
+    BOOST_CONCEPT_ASSERT((boost::RandomAccessIterator<RandomAccessIterator1>));
+    BOOST_CONCEPT_ASSERT((boost::Mutable_RandomAccessIterator<RandomAccessIterator2>));
     utility::check_iterator_is_unweighted(first);
     utility::check_iterator_is_unweighted(result);
@@ -316 +315 @@
                                       utility::weighted_iterator_tag tag) const
   {
-    using boost::function_requires;
-    function_requires<boost::RandomAccessIterator<RandomAccessIterator1> >();
-    function_requires<boost::Mutable_RandomAccessIterator<RandomAccessIterator2> >();
+    BOOST_CONCEPT_ASSERT((boost::RandomAccessIterator<RandomAccessIterator1>));
+    BOOST_CONCEPT_ASSERT((boost::Mutable_RandomAccessIterator<RandomAccessIterator2>));
     // copy the weights
     std::copy(utility::weight_iterator(first), 
@@ -384 +382 @@
     : average_(utility::Vector(N)), quantiles_(utility::Vector(N))
   {
-    boost::function_requires<boost::ForwardIterator<ForwardIterator> >();
+    BOOST_CONCEPT_ASSERT((boost::ForwardIterator<ForwardIterator>));
     build(first, last, N, 
           typename utility::weighted_iterator_traits<ForwardIterator>::type());