Revert "Some more from-the-hip ctad-maybe-unsupported fixes for flang"

-Wctad-maybe-unsupported is now disabled for flang so these explicit
deduction guides are not required.

This reverts commit ec3956b6e63c1524d6b024ba5db9ffcd7281ada0.

diff --git a/flang/include/flang/Evaluate/expression.h b/flang/include/flang/Evaluate/expression.h
index bce5fc6..90309af 100644 (file)
--- a/flang/include/flang/Evaluate/expression.h
+++ b/flang/include/flang/Evaluate/expression.h
@@ -264,14 +264,6 @@ struct ComplexComponent
 };
 
 template <int KIND>
-ComplexComponent(bool, const Expr<Type<TypeCategory::Complex, KIND>> &)
-    -> ComplexComponent<KIND>;
-
-template <int KIND>
-ComplexComponent(bool, Expr<Type<TypeCategory::Complex, KIND>> &&)
-    -> ComplexComponent<KIND>;
-
-template <int KIND>
 struct Not : public Operation<Not<KIND>, Type<TypeCategory::Logical, KIND>,
                  Type<TypeCategory::Logical, KIND>> {
   using Result = Type<TypeCategory::Logical, KIND>;

diff --git a/flang/include/flang/Parser/instrumented-parser.h b/flang/include/flang/Parser/instrumented-parser.h
index 1770744..9d958b9 100644 (file)
--- a/flang/include/flang/Parser/instrumented-parser.h
+++ b/flang/include/flang/Parser/instrumented-parser.h
@@ -76,10 +76,6 @@ private:
 };
 
 template <typename PA>
-InstrumentedParser(const MessageFixedText &, const PA &)
-    -> InstrumentedParser<PA>;
-
-template <typename PA>
 inline constexpr auto instrumented(
     const MessageFixedText &tag, const PA &parser) {
   return InstrumentedParser{tag, parser};

diff --git a/flang/lib/Parser/basic-parsers.h b/flang/lib/Parser/basic-parsers.h
index 330ede9..e2355a7 100644 (file)
--- a/flang/lib/Parser/basic-parsers.h
+++ b/flang/lib/Parser/basic-parsers.h
@@ -194,9 +194,6 @@ private:
 };
 
 template <typename PA>
-MessageContextParser(MessageFixedText, PA) -> MessageContextParser<PA>;
-
-template <typename PA>
 inline constexpr auto inContext(MessageFixedText context, PA parser) {
   return MessageContextParser{context, parser};
 }
@@ -245,9 +242,6 @@ private:
 };
 
 template <typename PA>
-WithMessageParser(MessageFixedWidth, PA) -> WithMessageParser<PA>;
-
-template <typename PA>
 inline constexpr auto withMessage(MessageFixedText msg, PA parser) {
   return WithMessageParser{msg, parser};
 }