Avoid generic lambda of C++14 for compiler compatibility in unit test…

…s of parallel::partition_copy. And fix some tiny things.
STEllAR-GROUP · Jul 9, 2017 · 792fdf0 · 792fdf0
1 parent 2e246ef
commit 792fdf0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/tests/unit/parallel/algorithms/partition_copy_tests.hpp b/tests/unit/parallel/algorithms/partition_copy_tests.hpp
@@ -12,17 +12,16 @@
 #include <boost/random.hpp>
 #include <boost/range/functions.hpp>
 
+#include <algorithm>
 #include <cstddef>
 #include <iostream>
 #include <numeric>
 #include <string>
 #include <vector>
-#include <algorithm>
 
 #include "test_utils.hpp"
 
 ///////////////////////////////////////////////////////////////////////////////
-
 struct throw_always
 {
     template <typename T>
@@ -68,8 +67,8 @@ struct user_defined_type
 
     static const std::vector<std::string> name_list;
 
-    std::string name;
     int val;
+    std::string name;
 };
 
 const std::vector<std::string> user_defined_type::name_list{
@@ -334,15 +333,15 @@ void test_partition_copy()
 
     ////////// Test cases for user defined type.
     test_partition_copy(execution::seq, IteratorTag(), user_defined_type(),
-        [rand_base](auto const& t) -> bool {
+        [rand_base](user_defined_type const& t) -> bool {
             return t < rand_base;
         }, rand_base);
     test_partition_copy(execution::par, IteratorTag(), user_defined_type(),
-        [rand_base](auto const& t) -> bool {
+        [rand_base](user_defined_type const& t) -> bool {
             return !(t < rand_base);
         }, rand_base);
     test_partition_copy(execution::par_unseq, IteratorTag(), user_defined_type(),
-        [rand_base](auto const& t) -> bool {
+        [rand_base](user_defined_type const& t) -> bool {
             return t < rand_base;
         }, rand_base);
 
@@ -359,12 +358,12 @@ void test_partition_copy()
     ////////// Asynchronous test cases for user defined type.
     test_partition_copy_async(execution::seq(execution::task), IteratorTag(),
         user_defined_type(),
-        [rand_base](auto const& t) -> bool {
+        [rand_base](user_defined_type const& t) -> bool {
             return !(t < rand_base);
         }, rand_base);
     test_partition_copy_async(execution::par(execution::task), IteratorTag(),
         user_defined_type(),
-        [rand_base](auto const& t) -> bool {
+        [rand_base](user_defined_type const& t) -> bool {
             return t < rand_base;
         }, rand_base);
 
@@ -374,7 +373,7 @@ void test_partition_copy()
             return true;
         }, rand_base);
     test_partition_copy(execution::par_unseq, IteratorTag(), user_defined_type(),
-        [rand_base](auto const& t) -> bool {
+        [rand_base](user_defined_type const& t) -> bool {
             return false;
         }, rand_base);
 }

diff --git a/tests/unit/parallel/container_algorithms/partition_copy_range.cpp b/tests/unit/parallel/container_algorithms/partition_copy_range.cpp
@@ -50,8 +50,8 @@ struct user_defined_type
 
     static const std::vector<std::string> name_list;
 
-    std::string name;
     int val;
+    std::string name;
 };
 
 const std::vector<std::string> user_defined_type::name_list{