]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Fix some small test issues with std_cxx11::bind. 2925/head
authorDavid Wells <wellsd2@rpi.edu>
Sat, 6 Aug 2016 15:13:40 +0000 (11:13 -0400)
committerDavid Wells <wellsd2@rpi.edu>
Sat, 6 Aug 2016 16:06:29 +0000 (12:06 -0400)
tests/lac/block_vector_iterator.cc
tests/lac/complex_block_vector_iterator.cc
tests/petsc/block_vector_iterator_03.cc

index b9ba9f10b901ed563630015c586248372a6e4732..1c4fc0a9e685d7d8bc1a68cc848e1c3015fba72e 100644 (file)
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2000 - 2015 by the deal.II authors
+// Copyright (C) 2000 - 2016 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -17,6 +17,7 @@
 
 #include "../tests.h"
 #include <deal.II/base/logstream.h>
+#include <deal.II/base/std_cxx11/bind.h>
 #include <deal.II/lac/block_vector.h>
 #include <fstream>
 #include <iomanip>
@@ -176,9 +177,9 @@ void test ()
 
       // check std::transform
       std::transform (v1.begin(), v1.end(), v2.begin(),
-                      std::bind (std::multiplies<double>(),
-                                 std::placeholders::_1,
-                                 2.0));
+                      std_cxx11::bind (std::multiplies<double>(),
+                                       std_cxx11::_1,
+                                       2.0));
       v2 *= 1./2;
       deallog << "Check 7: " << (v1 == v2 ? "true" : "false") << std::endl;
 
index 9e9cd815d9c2ebb89804c7f26a16d6cf125b806c..7ccaeb106dfa42bb8811eff3e0d760eee6b8a5d6 100644 (file)
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2000 - 2015 by the deal.II authors
+// Copyright (C) 2000 - 2016 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -17,6 +17,7 @@
 
 #include "../tests.h"
 #include <deal.II/base/logstream.h>
+#include <deal.II/base/std_cxx11/bind.h>
 #include <deal.II/lac/block_vector.h>
 #include <fstream>
 #include <iomanip>
@@ -176,9 +177,9 @@ void test ()
 
       // check std::transform
       std::transform (v1.begin(), v1.end(), v2.begin(),
-                      std::bind (std::multiplies<std::complex<double> >(),
-                                 std_cxx11::_1,
-                                 2.0));
+                      std_cxx11::bind (std::multiplies<std::complex<double> >(),
+                                       std_cxx11::_1,
+                                       2.0));
       v2 *= std::complex<double>(1./2.);
       deallog << "Check 7: " << (v1 == v2 ? "true" : "false") << std::endl;
 
index 377adacadb14dce893d34e2006fca50728386387..de9f47438cd8bda03421a072e18ff8a1fe79a3b4 100644 (file)
@@ -179,7 +179,7 @@ void test ()
       // check std::transform
       std::transform (v1.begin(), v1.end(), v2.begin(),
                       std_cxx11::bind (std::multiplies<double>(),
-                                       std_cxx11::_1
+                                       std_cxx11::_1,
                                        2.0));
       v2 *= 1./2.;
       deallog << "Check 7: " << (v1 == v2 ? "true" : "false") << std::endl;

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.