From 115d3cdf52d737a46861277ef34681d73c9b9c2a Mon Sep 17 00:00:00 2001
From: peter klausler <pklausler@nvidia.com>
Date: Wed, 13 Feb 2019 12:02:42 -0800
Subject: [PATCH] [flang] catch up with master

Original-commit: flang-compiler/f18@e66ef3699c6f4c9c1053305aafeae0eefbe19b9b
Reviewed-on: https://github.com/flang-compiler/f18/pull/287
Tree-same-pre-rewrite: false
---
 flang/lib/semantics/resolve-names.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flang/lib/semantics/resolve-names.cc b/flang/lib/semantics/resolve-names.cc
index 26f1a80..29a6824 100644
--- a/flang/lib/semantics/resolve-names.cc
+++ b/flang/lib/semantics/resolve-names.cc
@@ -2733,12 +2733,12 @@ void DeclarationVisitor::Post(const parser::DerivedTypeSpec &x) {
       seenAnyName = true;
       name = optKeyword->v.source;
       auto it{std::find_if(parameterDecls.begin(), parameterDecls.end(),
-          [&](Symbol *symbol) { return symbol->name() == name; })};
+          [&](const Symbol *symbol) { return symbol->name() == name; })};
       if (it == parameterDecls.end()) {
         Say(name,
             "'%s' is not the name of a parameter for this type"_err_en_US);
       } else {
-        Resolve(optKeyword->v, *it);
+        Resolve(optKeyword->v, const_cast<Symbol *>(*it));
       }
     } else if (seenAnyName) {
       Say(typeName.source, "Type parameter value must have a name"_err_en_US);
@@ -2769,7 +2769,7 @@ void DeclarationVisitor::Post(const parser::DerivedTypeSpec &x) {
   for (const SourceName &name : parameterNames) {
     if (!spec.FindParameter(name)) {
       auto it{std::find_if(parameterDecls.begin(), parameterDecls.end(),
-          [&](Symbol *symbol) { return symbol->name() == name; })};
+          [&](const Symbol *symbol) { return symbol->name() == name; })};
       CHECK(it != parameterDecls.end());
       auto &symbol{**it};
       const auto *details{symbol.detailsIf<TypeParamDetails>()};
-- 
2.7.4