From 3b5c460ca61033d03b6f096fc2b5f10f4fee141d Mon Sep 17 00:00:00 2001 From: wolf Date: Wed, 13 Feb 2002 09:45:27 +0000 Subject: [PATCH] Prefix make_pair with std:: to avoid confusion about the role Koenig lookup has here. git-svn-id: https://svn.dealii.org/trunk@5515 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/base/source/parameter_handler.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/deal.II/base/source/parameter_handler.cc b/deal.II/base/source/parameter_handler.cc index a6f71755e8..06d3456192 100644 --- a/deal.II/base/source/parameter_handler.cc +++ b/deal.II/base/source/parameter_handler.cc @@ -553,7 +553,7 @@ bool ParameterHandler::declare_entry (const std::string &entry, if (p->entries.find (entry) != p->entries.end()) return false; - p->entries[entry] = make_pair(default_value, pattern.clone()); + p->entries[entry] = std::make_pair(default_value, pattern.clone()); // check whether default answer matches // the pattern @@ -1017,8 +1017,8 @@ bool ParameterHandler::scan_line (std::string line, // pointer, since we don't need the // pattern in the entries section -- only // in the defaults section) - pc->entries[entry_name] = make_pair(entry_value, - static_cast(0)); + pc->entries[entry_name] + = std::make_pair(entry_value, static_cast(0)); return true; }; @@ -1339,8 +1339,8 @@ void MultipleParameterLoop::fill_entry_values (const unsigned int run_no) // pointer, since we don't need the // pattern in the entries section -- only // in the defaults section) - pc->entries[choice->entry_name] = make_pair(entry_value, - static_cast(0)); + pc->entries[choice->entry_name] + = std::make_pair(entry_value, static_cast(0)); // get out of subsection again subsection_path.swap (choice->subsection_path); -- 2.39.5