From: Luca Heltai <luca.heltai@sissa.it>
Date: Tue, 5 May 2020 15:24:41 +0000 (+0200)
Subject: Make sure we don't implicitly convert from tuple to pair.
X-Git-Tag: v9.2.0-rc1~47^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=698ab3dc32b483efc747b2126587dceed5c13e43;p=dealii.git

Make sure we don't implicitly convert from tuple to pair.
---

diff --git a/include/deal.II/base/patterns.h b/include/deal.II/base/patterns.h
index 9541bbbf79..a4582cd63c 100644
--- a/include/deal.II/base/patterns.h
+++ b/include/deal.II/base/patterns.h
@@ -2255,7 +2255,7 @@ namespace Patterns
       {
         std::tuple<Key, Value> m;
         m = Convert<decltype(m)>::to_value(s, pattern);
-        return m;
+        return std::make_pair(std::get<0>(m), std::get<1>(m));
       }
     };
 
diff --git a/tests/parameter_handler/pattern_tools_02.output b/tests/parameter_handler/pattern_tools_02.output
index 400718a688..4a1a8a9e57 100644
--- a/tests/parameter_handler/pattern_tools_02.output
+++ b/tests/parameter_handler/pattern_tools_02.output
@@ -20,9 +20,9 @@ DEAL::To value : 0, 0, 0
 DEAL::Pattern  : [List of <[Double -MAX_DOUBLE...MAX_DOUBLE (inclusive)]> of length 2...2 (inclusive)]
 DEAL::To String: 1, 2
 DEAL::To value : 1, 2
-DEAL::Pattern  : [Map of <[Integer range -2147483648...2147483647 (inclusive)]>:<[Double -MAX_DOUBLE...MAX_DOUBLE (inclusive)]> of length 1...1 (inclusive)]
-DEAL::To String: 1:2
-DEAL::To value : 1:2
+DEAL::Pattern  : [Tuple of <2> elements <[Integer range -2147483648...2147483647 (inclusive)]>, <[Double -MAX_DOUBLE...MAX_DOUBLE (inclusive)]>]
+DEAL::To String: 1 : 2
+DEAL::To value : 1 : 2
 DEAL::Pattern  : [List of <[List of <[Double -MAX_DOUBLE...MAX_DOUBLE (inclusive)]> of length 1...1 (inclusive)]> of length 1...1 (inclusive) separated by <;>]
 DEAL::To String: 0
 DEAL::To value : 0