stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1242128 - in /stdcxx/branches/4.2.x: include/valarray tests/regress/26.valarray.binary.stdcxx-1061.cpp
Date Wed, 08 Feb 2012 21:59:53 GMT
Author: vitek
Date: Wed Feb  8 21:59:52 2012
New Revision: 1242128

URL: http://svn.apache.org/viewvc?rev=1242128&view=rev
Log:

2012-02-08  Travis Vitek  <vitek@roguewave.com>

	* include/valarray (operator&&): Use appropriate function
	object logical_and<> to implement non-member operator&&.
	* test/regress/26.valarray.binary.stdcxx-1061.cpp: Add new
	regression test.


Added:
    stdcxx/branches/4.2.x/tests/regress/26.valarray.binary.stdcxx-1061.cpp
Modified:
    stdcxx/branches/4.2.x/include/valarray

Modified: stdcxx/branches/4.2.x/include/valarray
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/include/valarray?rev=1242128&r1=1242127&r2=1242128&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/include/valarray (original)
+++ stdcxx/branches/4.2.x/include/valarray Wed Feb  8 21:59:52 2012
@@ -776,7 +776,7 @@ inline valarray<bool>
 operator&& (const valarray<_TypeT> &__lhs, const _TypeT &__rhs)
 {
     return _RW::__rw_binary_function (__lhs,
-                                      bind2nd (equal_to<_TypeT>(), __rhs));
+                                      bind2nd (logical_and<_TypeT>(), __rhs));
 }
 
 template<class _TypeT>

Added: stdcxx/branches/4.2.x/tests/regress/26.valarray.binary.stdcxx-1061.cpp
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/tests/regress/26.valarray.binary.stdcxx-1061.cpp?rev=1242128&view=auto
==============================================================================
--- stdcxx/branches/4.2.x/tests/regress/26.valarray.binary.stdcxx-1061.cpp (added)
+++ stdcxx/branches/4.2.x/tests/regress/26.valarray.binary.stdcxx-1061.cpp Wed Feb  8 21:59:52
2012
@@ -0,0 +1,45 @@
+/************************************************************************
+ *
+ * 26.valarray.binary.stdcxx-1061.cpp - regression test for STDCXX-1061
+ *
+ *   http://issues.apache.org/jira/browse/STDCXX-1061
+ *
+ * $Id: 26.valarray.binary.stdcxx-1061.cpp 590132 2007-10-30 16:01:33Z faridz $
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ * 
+ **************************************************************************/
+
+#include <cassert>
+#include <cstddef>
+#include <valarray>
+
+int main ()
+{
+    const int a[] = { 0, 1, 0, 3, 0, -5, 0, -7, 0, -11 };
+
+    const std::valarray<int>  v0 (a, sizeof a);
+    const std::valarray<bool> v1 = std::operator&& (v0, 1);
+
+    for (std::size_t i = 0; i < sizeof a; ++i)
+        assert ((a [i] && 1) == v1 [i]);
+    
+    return 0;
+}
+



Mime
View raw message