svn commit: r360602 - /incubator/stdcxx/trunk/tests/algorithms/25.lower.bound.cpp

[sebor]

Author: sebor
Date: Sun Jan  1 16:22:29 2006
New Revision: 360602

URL: http://svn.apache.org/viewcvs?rev=360602&view=rev
Log:
2006-01-01  Martin Sebor  <[EMAIL PROTECTED]>

        * 25.lower.bound.cpp (conv_to_bool): Used instead of ConvertibleToBool.
        (test_lower_bound): Silenced bogus EDG eccp 3.6 remark #550-D: variable
        was set but never used.

Modified:
    incubator/stdcxx/trunk/tests/algorithms/25.lower.bound.cpp

Modified: incubator/stdcxx/trunk/tests/algorithms/25.lower.bound.cpp
URL: 
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/tests/algorithms/25.lower.bound.cpp?rev=360602&r1=360601&r2=360602&view=diff
==============================================================================
--- incubator/stdcxx/trunk/tests/algorithms/25.lower.bound.cpp (original)
+++ incubator/stdcxx/trunk/tests/algorithms/25.lower.bound.cpp Sun Jan  1 
16:22:29 2006
@@ -53,9 +53,10 @@
     void operator=(Y&);   // not Assignable
 };
 
-inline bool operator< (const X &lhs, const Y &rhs)
+inline conv_to_bool
+operator< (const X &lhs, const Y &rhs)
 {
-    return lhs < rhs.xval_;
+    return conv_to_bool::make (lhs < rhs.xval_);
 }
 
 /**************************************************************************/
@@ -69,18 +70,11 @@
         funcalls_ = 0;
     }
 
-    class ConvertibleToBool {
-        bool result_;
-    public:
-        ConvertibleToBool (bool res): result_ (res) { /* empty */ }
-        operator bool() const { return result_; }
-    };
-
     // return a type other than bool but one that is implicitly
     // convertible to bool to detect incorrect assumptions
-    ConvertibleToBool operator() (const X &lhs, const Y &rhs) {
+    conv_to_bool operator() (const X &lhs, const Y &rhs) {
         ++funcalls_;
-        return ConvertibleToBool (lhs < rhs.xval_);
+        return conv_to_bool::make (lhs < rhs.xval_);
     }
 
 private:
@@ -131,6 +125,10 @@
     const ForwardIterator result = predicate
         ? std::lower_bound (first, last, value, comp)
         : std::lower_bound (first, last, value);
+
+    // silence bogus EDG eccp 3.6 remark #550-D:
+    // variable was set but never used
+    _RWSTD_UNUSED (result);
 
     // verify correctness
     const std::size_t off = std::size_t (result.cur_ - xsrc);