From 629a29cacc09def1821def8f4d5455b4be5ac9b1 Mon Sep 17 00:00:00 2001
From: Peter Klausler <pklausler@nvidia.com>
Date: Fri, 2 Dec 2022 16:13:09 -0800
Subject: [PATCH] [flang][examples] Fix build of
 flang/examples/FlangOmpReport/FlangOmpReportVisitor.cpp (take 2)

Need to add casts to std::string.
---
 .../FlangOmpReport/FlangOmpReportVisitor.cpp       | 30 ++++++++++++++--------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/flang/examples/FlangOmpReport/FlangOmpReportVisitor.cpp b/flang/examples/FlangOmpReport/FlangOmpReportVisitor.cpp
index 702ea22..d54562f 100644
--- a/flang/examples/FlangOmpReport/FlangOmpReportVisitor.cpp
+++ b/flang/examples/FlangOmpReport/FlangOmpReportVisitor.cpp
@@ -187,42 +187,50 @@ void OpenMPCounterVisitor::PostConstructsCommon() {
 }
 
 void OpenMPCounterVisitor::Post(const OmpProcBindClause::Type &c) {
-  clauseDetails += "type="s + OmpProcBindClause::EnumToString(c) + ";"s;
+  clauseDetails +=
+      "type=" + std::string{OmpProcBindClause::EnumToString(c)} + ";";
 }
 void OpenMPCounterVisitor::Post(const OmpDefaultClause::Type &c) {
-  clauseDetails += "type="s + OmpDefaultClause::EnumToString(c) + ";"s;
+  clauseDetails +=
+      "type=" + std::string{OmpDefaultClause::EnumToString(c)} + ";";
 }
 void OpenMPCounterVisitor::Post(
     const OmpDefaultmapClause::ImplicitBehavior &c) {
   clauseDetails +=
-      "implicit_behavior="s + OmpDefaultmapClause::EnumToString(c) + ";"s;
+      "implicit_behavior=" + std::string{OmpDefaultmapClause::EnumToString(c)} +
+      ";";
 }
 void OpenMPCounterVisitor::Post(
     const OmpDefaultmapClause::VariableCategory &c) {
   clauseDetails +=
-      "variable_category="s + OmpDefaultmapClause::EnumToString(c) + ";"s;
+      "variable_category=" + std::string{OmpDefaultmapClause::EnumToString(c)} +
+      ";";
 }
 void OpenMPCounterVisitor::Post(const OmpScheduleModifierType::ModType &c) {
   clauseDetails +=
-      "modifier="s + OmpScheduleModifierType::EnumToString(c) + ";"s;
+      "modifier=" + std::string{OmpScheduleModifierType::EnumToString(c)} + ";";
 }
 void OpenMPCounterVisitor::Post(const OmpLinearModifier::Type &c) {
-  clauseDetails += "modifier="s + OmpLinearModifier::EnumToString(c) + ";"s;
+  clauseDetails +=
+      "modifier=" + std::string{OmpLinearModifier::EnumToString(c)} + ";";
 }
 void OpenMPCounterVisitor::Post(const OmpDependenceType::Type &c) {
-  clauseDetails += "type="s + OmpDependenceType::EnumToString(c) + ";"s;
+  clauseDetails +=
+      "type=" + std::string{OmpDependenceType::EnumToString(c)} + ";";
 }
 void OpenMPCounterVisitor::Post(const OmpMapType::Type &c) {
-  clauseDetails += "type="s + OmpMapType::EnumToString(c) + ";"s;
+  clauseDetails += "type=" + std::string{OmpMapType::EnumToString(c)} + ";";
 }
 void OpenMPCounterVisitor::Post(const OmpScheduleClause::ScheduleType &c) {
-  clauseDetails += "type="s + OmpScheduleClause::EnumToString(c) + ";"s;
+  clauseDetails +=
+      "type=" + std::string{OmpScheduleClause::EnumToString(c)} + ";";
 }
 void OpenMPCounterVisitor::Post(const OmpIfClause::DirectiveNameModifier &c) {
-  clauseDetails += "name_modifier="s + OmpIfClause::EnumToString(c) + ";"s;
+  clauseDetails +=
+      "name_modifier=" + std::string{OmpIfClause::EnumToString(c)} + ";";
 }
 void OpenMPCounterVisitor::Post(const OmpCancelType::Type &c) {
-  clauseDetails += "type="s + OmpCancelType::EnumToString(c) + ";"s;
+  clauseDetails += "type=" + std::string{OmpCancelType::EnumToString(c)} + ";";
 }
 void OpenMPCounterVisitor::Post(const OmpClause &c) {
   PostClauseCommon(normalize_clause_name(c.source.ToString()));
-- 
2.7.4