commit c1c948d38570ce07a6d3cb1eb78c7a3f339c518e
author peter klausler <pklausler@nvidia.com> Tue Oct 12 17:40:28 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Oct 12 17:45:34 2021 -0700
tree 4e3204896a35aed3000e0b839d801e61426b5731
parent 62a46bbe31a34237673d94c6f3e82fcbd8e56a37

[flang] Fix "latest-clang" build warnings

A recent patch to fix warnings from a Windows build regarding
inconsistent "struct" vs "class" usage missed a few code sites
and now the "latest-clang" build bot is also failing.  This
patch should resolve those failing builds.

GitOrigin-RevId: bc1a0c2c013799d69fff21a53696a2ad09026ab7

include/flang/Evaluate/expression.h

diff --git a/include/flang/Evaluate/expression.h b/include/flang/Evaluate/expression.h
index 798aa3e..f24750e 100644
--- a/include/flang/Evaluate/expression.h
+++ b/include/flang/Evaluate/expression.h
@@ -882,10 +882,10 @@
 #define INSTANTIATE_EXPRESSION_TEMPLATES \
   FOR_EACH_INTRINSIC_KIND(template class Expr, ) \
   FOR_EACH_CATEGORY_TYPE(template class Expr, ) \
-  FOR_EACH_INTEGER_KIND(template struct Relational, ) \
-  FOR_EACH_REAL_KIND(template struct Relational, ) \
-  FOR_EACH_CHARACTER_KIND(template struct Relational, ) \
-  template struct Relational<SomeType>; \
+  FOR_EACH_INTEGER_KIND(template class Relational, ) \
+  FOR_EACH_REAL_KIND(template class Relational, ) \
+  FOR_EACH_CHARACTER_KIND(template class Relational, ) \
+  template class Relational<SomeType>; \
   FOR_EACH_TYPE_AND_KIND(template class ExpressionBase, ) \
   FOR_EACH_INTRINSIC_KIND(template class ArrayConstructorValues, ) \
   FOR_EACH_INTRINSIC_KIND(template class ArrayConstructor, )