Commit Graph

4 Commits

Author SHA1 Message Date
Max Moiseev
3a3984877a Merge remote-tracking branch 'origin/master' into swift-3-api-guidelines 2016-02-15 15:43:34 -08:00
Michael Gottesman
904301a6a0 Make two IDE tests only run on macosx. Argyrios is going to fix them after the merge. 2016-02-06 11:22:28 -08:00
Jordan Rose
b05363bab5 [test] Mark print_clang_header_swift_name.swift as requiring ObjC.
Enums with fixed underlying type are a C++ and Objective-C feature,
but are not available in C, even as a Clang extension.
2015-12-23 13:42:02 -08:00
Kevin Ballard
f047c45ae7 [ClangImporter] Ignore swift_name when calculating enum constant prefix
Enum constants are naturally going to be named after their ObjC name,
not their Swift name. As such, ignore the swift_name attr on the enum
decl when calculating the common prefix. It turns out this is actually
simpler anyway as it also bypasses the swift_private handling that the
code was already trying to work around.
2015-12-22 22:07:06 -08:00