File tree Expand file tree Collapse file tree 2 files changed +6
-34
lines changed Expand file tree Collapse file tree 2 files changed +6
-34
lines changed Original file line number Diff line number Diff line change @@ -567,15 +567,7 @@ template <typename T> BaseObject Designator<T>::GetBaseObject() const {
567
567
common::visitors{
568
568
[](SymbolRef symbol) { return BaseObject{symbol}; },
569
569
[](const Substring &sstring) { return sstring.GetBaseObject (); },
570
- [](const auto &x) {
571
- #if !__clang__ && __GNUC__ == 7 && __GNUC_MINOR__ == 2
572
- if constexpr (std::is_same_v<std::decay_t <decltype (x)>,
573
- Substring>) {
574
- return x.GetBaseObject ();
575
- } else
576
- #endif
577
- return BaseObject{x.GetFirstSymbol ()};
578
- },
570
+ [](const auto &x) { return BaseObject{x.GetFirstSymbol ()}; },
579
571
},
580
572
u);
581
573
}
@@ -585,15 +577,7 @@ template <typename T> const Symbol *Designator<T>::GetLastSymbol() const {
585
577
common::visitors{
586
578
[](SymbolRef symbol) { return &*symbol; },
587
579
[](const Substring &sstring) { return sstring.GetLastSymbol (); },
588
- [](const auto &x) {
589
- #if !__clang__ && __GNUC__ == 7 && __GNUC_MINOR__ == 2
590
- if constexpr (std::is_same_v<std::decay_t <decltype (x)>,
591
- Substring>) {
592
- return x.GetLastSymbol ();
593
- } else
594
- #endif
595
- return &x.GetLastSymbol ();
596
- },
580
+ [](const auto &x) { return &x.GetLastSymbol (); },
597
581
},
598
582
u);
599
583
}
Original file line number Diff line number Diff line change @@ -733,22 +733,10 @@ bool GenericKind::IsOperator() const {
733
733
734
734
std::string GenericKind::ToString () const {
735
735
return common::visit (
736
- common::visitors {
737
- [](const OtherKind &x) { return std::string{EnumToString (x)}; },
738
- [](const common::DefinedIo &x) { return AsFortran (x).ToString (); },
739
- #if !__clang__ && __GNUC__ == 7 && __GNUC_MINOR__ == 2
740
- [](const common::NumericOperator &x) {
741
- return std::string{common::EnumToString (x)};
742
- },
743
- [](const common::LogicalOperator &x) {
744
- return std::string{common::EnumToString (x)};
745
- },
746
- [](const common::RelationalOperator &x) {
747
- return std::string{common::EnumToString (x)};
748
- },
749
- #else
750
- [](const auto &x) { return std::string{common::EnumToString (x)}; },
751
- #endif
736
+ common::visitors{
737
+ [](const OtherKind &x) { return std::string{EnumToString (x)}; },
738
+ [](const common::DefinedIo &x) { return AsFortran (x).ToString (); },
739
+ [](const auto &x) { return std::string{common::EnumToString (x)}; },
752
740
},
753
741
u);
754
742
}
You can’t perform that action at this time.
0 commit comments