From c090abef3be97afcf65806a8dac91938d1c34c5f Mon Sep 17 00:00:00 2001
From: peter klausler <pklausler@nvidia.com>
Date: Wed, 20 Mar 2019 13:11:49 -0700
Subject: [PATCH] [flang] checkpoint

Original-commit: flang-compiler/f18@1e213f3fbe93dbba161c59dde89c9a369a0e3a20
Reviewed-on: https://github.com/flang-compiler/f18/pull/346
Tree-same-pre-rewrite: false
---
 flang/lib/evaluate/characteristics.cc | 5 +++--
 flang/lib/evaluate/characteristics.h  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/flang/lib/evaluate/characteristics.cc b/flang/lib/evaluate/characteristics.cc
index 284012af..c518da4 100644
--- a/flang/lib/evaluate/characteristics.cc
+++ b/flang/lib/evaluate/characteristics.cc
@@ -61,8 +61,8 @@ bool DummyProcedure::operator==(const DummyProcedure &that) const {
 
 std::ostream &DummyProcedure::Dump(std::ostream &o) const {
   attrs.Dump(o, EnumToString);
-  if (explicitProcedure.has_value()) {
-    explicitProcedure.value().Dump(o);
+  if (explicitProcedure) {
+    explicitProcedure->Dump(o);
   }
   return o;
 }
@@ -98,5 +98,6 @@ std::ostream &Procedure::Dump(std::ostream &o) const {
   }
   return o << (sep == '(' ? "()" : ")");
 }
+DEFINE_DEFAULT_CONSTRUCTORS_AND_ASSIGNMENTS(DummyProcedure)
 }
 DEFINE_DELETER(Fortran::evaluate::characteristics::Procedure)
diff --git a/flang/lib/evaluate/characteristics.h b/flang/lib/evaluate/characteristics.h
index 14188a5..f4c7cc3 100644
--- a/flang/lib/evaluate/characteristics.h
+++ b/flang/lib/evaluate/characteristics.h
@@ -53,7 +53,7 @@ struct DummyDataObject {
 // 15.3.2.3
 struct DummyProcedure {
   ENUM_CLASS(Attr, Pointer, Optional)
-  DEFAULT_CONSTRUCTORS_AND_ASSIGNMENTS(DummyProcedure)
+  DECLARE_CONSTRUCTORS_AND_ASSIGNMENTS(DummyProcedure)
   std::unique_ptr<Procedure, common::Deleter<Procedure>> explicitProcedure;
   common::EnumSet<Attr, 32> attrs;
   bool operator==(const DummyProcedure &) const;
-- 
2.7.4