From b3a87d4e27d23361e47410206a7c7fd83dcf8283 Mon Sep 17 00:00:00 2001
From: Eric Schweitz <eschweitz@nvidia.com>
Date: Thu, 6 Sep 2018 13:33:51 -0700
Subject: [PATCH] [flang] More renaming

Original-commit: flang-compiler/f18@9ef9ef4479468f5054edfe3183e4c4d14dc87111
Reviewed-on: https://github.com/flang-compiler/f18/pull/170
Tree-same-pre-rewrite: false
---
 flang/lib/semantics/resolve-labels.cc | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/flang/lib/semantics/resolve-labels.cc b/flang/lib/semantics/resolve-labels.cc
index 45049453be75..c8bfd34d0aa5 100644
--- a/flang/lib/semantics/resolve-labels.cc
+++ b/flang/lib/semantics/resolve-labels.cc
@@ -33,22 +33,22 @@ using IndexList = std::vector<std::pair<parser::CharBlock, parser::CharBlock>>;
 // because the parse tree does not actually have the scopes required.
 using ProxyForScope = unsigned;
 struct LabeledStatementInfoTuplePOD {
-  LabeledStatementInfoTuplePOD(const ProxyForScope &_proxyForScope,
-      const parser::CharBlock &_parserCharBlock,
-      const LabeledStmtClassificationSet &_labeledStmtClassificationSet)
-    : proxyForScope{_proxyForScope}, parserCharBlock{_parserCharBlock},
-      labeledStmtClassificationSet{_labeledStmtClassificationSet} {}
+  LabeledStatementInfoTuplePOD(const ProxyForScope &proxyForScope,
+      const parser::CharBlock &parserCharBlock,
+      const LabeledStmtClassificationSet &labeledStmtClassificationSet)
+    : proxyForScope{proxyForScope}, parserCharBlock{parserCharBlock},
+      labeledStmtClassificationSet{labeledStmtClassificationSet} {}
   ProxyForScope proxyForScope;
   parser::CharBlock parserCharBlock;
   LabeledStmtClassificationSet labeledStmtClassificationSet;
 };
 using TargetStmtMap = std::map<parser::Label, LabeledStatementInfoTuplePOD>;
 struct SourceStatementInfoTuplePOD {
-  SourceStatementInfoTuplePOD(const parser::Label &_parserLabel,
-      const ProxyForScope &_proxyForScope,
-      const parser::CharBlock &_parserCharBlock)
-    : parserLabel{_parserLabel}, proxyForScope{_proxyForScope},
-      parserCharBlock{_parserCharBlock} {}
+  SourceStatementInfoTuplePOD(const parser::Label &parserLabel,
+      const ProxyForScope &proxyForScope,
+      const parser::CharBlock &parserCharBlock)
+    : parserLabel{parserLabel}, proxyForScope{proxyForScope},
+      parserCharBlock{parserCharBlock} {}
   parser::Label parserLabel;
   ProxyForScope proxyForScope;
   parser::CharBlock parserCharBlock;