@@ -69,50 +69,18 @@ header_exportable_declarations::header_exportable_declarations(
69
69
}
70
70
71
71
std::optional<llvm::StringRef> list = Options.get (" SkipDeclarations" );
72
- // TODO(LLVM-17) Remove clang 15 work-around.
73
- #if defined(__clang_major__) && __clang_major__ < 16
74
- if (list) {
75
- std::string_view s = *list;
76
- auto b = s.begin ();
77
- auto e = std::find (b, s.end (), ' ' );
78
- while (b != e) {
79
- skip_decls_.emplace (b, e);
80
- if (e == s.end ())
81
- break ;
82
- b = e + 1 ;
83
- e = std::find (b, s.end (), ' ' );
84
- }
85
- }
86
- #else // defined(__clang_major__) && __clang_major__ < 16
87
72
if (list)
88
73
for (auto decl : std::views::split (*list, ' ' )) {
89
74
std::string s;
90
75
std::ranges::copy (decl, std::back_inserter (s)); // use range based constructor
91
76
skip_decls_.emplace (std::move (s));
92
77
}
93
- #endif // defined(__clang_major__) && __clang_major__ < 16
94
78
decls_ = skip_decls_;
95
79
96
80
list = Options.get (" ExtraDeclarations" );
97
- // TODO(LLVM-17) Remove clang 15 work-around.
98
- #if defined(__clang_major__) && __clang_major__ < 16
99
- if (list) {
100
- std::string_view s = *list;
101
- auto b = s.begin ();
102
- auto e = std::find (b, s.end (), ' ' );
103
- while (b != e) {
104
- std::cout << " using ::" << std::string_view{b, e} << " ;\n " ;
105
- if (e == s.end ())
106
- break ;
107
- b = e + 1 ;
108
- e = std::find (b, s.end (), ' ' );
109
- }
110
- }
111
- #else // defined(__clang_major__) && __clang_major__ < 16
112
81
if (list)
113
82
for (auto decl : std::views::split (*list, ' ' ))
114
83
std::cout << " using ::" << std::string_view{decl.data (), decl.size ()} << " ;\n " ;
115
- #endif // defined(__clang_major__) && __clang_major__ < 16
116
84
}
117
85
118
86
header_exportable_declarations::~header_exportable_declarations () {
0 commit comments