Skip to content

Commit 7f9e020

Browse files
committed
Interop/Cxx: explicitly require C++ for modules
The C++ interop modules require C++ support. Explicitly require C++ as a feature when building these modules. This has no impact on the changes as all the tests enable C++ already.
1 parent b19c4d0 commit 7f9e020

File tree

8 files changed

+46
-0
lines changed

8 files changed

+46
-0
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,59 @@
11
module AccessSpecifiers {
22
header "access-specifiers.h"
3+
requires cplusplus
34
}
45

56
module TypeClassification {
67
header "type-classification.h"
8+
requires cplusplus
79
}
810

911
module Constructors {
1012
header "constructors.h"
13+
requires cplusplus
1114
}
1215

1316
module ConstructorsObjC {
1417
header "constructors-objc.h"
18+
requires cplusplus
1519
}
1620

1721
module LoadableTypes {
1822
header "loadable-types.h"
23+
requires cplusplus
1924
}
2025

2126
module MemberwiseInitializer {
2227
header "memberwise-initializer.h"
28+
requires cplusplus
2329
}
2430

2531
module MemoryLayout {
2632
header "memory-layout.h"
33+
requires cplusplus
2734
}
2835

2936
module MemberVariables {
3037
header "member-variables.h"
38+
requires cplusplus
3139
}
3240

3341
module ProtocolConformance {
3442
header "protocol-conformance.h"
43+
requires cplusplus
3544
}
3645

3746
module SynthesizedInitializers {
3847
header "synthesized-initializers.h"
48+
requires cplusplus
3949
}
4050

4151
module DebugInfo {
4252
header "debug-info.h"
53+
requires cplusplus
4354
}
4455

4556
module NestedRecords {
4657
header "nested-records.h"
58+
requires cplusplus
4759
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
module BoolEnums {
22
header "bool-enums.h"
3+
requires cplusplus
34
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
module ExternVar {
22
header "extern-var.h"
3+
requires cplusplus
34
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,29 @@
11
module UserA {
22
header "user-a.h"
33
export *
4+
requires cplusplus
45
}
56

67
module UserB {
78
header "user-b.h"
89
export *
10+
requires cplusplus
911
}
1012

1113
module UserC {
1214
header "user-c.h"
1315
export *
16+
requires cplusplus
1417
}
1518

1619
module DeclA {
1720
header "decl-a.h"
1821
export *
22+
requires cplusplus
1923
}
2024

2125
module DeclB {
2226
header "decl-b.h"
2327
export *
28+
requires cplusplus
2429
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
module MemberInline {
22
header "member-inline.h"
3+
requires cplusplus
34
}
45

56
module MemberOutOfLine {
67
header "member-out-of-line.h"
8+
requires cplusplus
79
}
810

911
module NonMemberInline {
1012
header "non-member-inline.h"
13+
requires cplusplus
1114
}
1215

1316
module NonMemberOutOfLine {
1417
header "non-member-out-of-line.h"
18+
requires cplusplus
1519
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
module Reference {
22
header "reference.h"
3+
requires cplusplus
34
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
11
module StaticVar {
22
header "static-var.h"
3+
requires cplusplus
34
}
45

56
module StaticLocalVar {
67
header "static-local-var.h"
8+
requires cplusplus
79
}
810

911
module StaticMemberVar {
1012
header "static-member-var.h"
13+
requires cplusplus
1114
}
1215

1316
module InlineStaticMemberVar {
1417
header "inline-static-member-var.h"
18+
requires cplusplus
1519
}
1620

1721
module StaticMemberFunc {
1822
header "static-member-func.h"
23+
requires cplusplus
1924
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,84 @@
11
module ClassTemplateWithPrimitiveArgument {
22
header "class-template-with-primitive-argument.h"
3+
requires cplusplus
34
}
45

56
module NotPreDefinedClassTemplate {
67
header "not-pre-defined-class-template.h"
8+
requires cplusplus
79
}
810

911
module PartiallyPreDefinedClassTemplate {
1012
header "partially-pre-defined-class-template.h"
13+
requires cplusplus
1114
}
1215

1316
module FullyPreDefinedClassTemplate {
1417
header "fully-pre-defined-class-template.h"
18+
requires cplusplus
1519
}
1620

1721
module CanonicalTypes {
1822
header "canonical-types.h"
23+
requires cplusplus
1924
}
2025

2126
module ExplicitClassSpecialization {
2227
header "explicit-class-specialization.h"
28+
requires cplusplus
2329
}
2430

2531
module FunctionTemplates {
2632
header "function-templates.h"
33+
requires cplusplus
2734
}
2835

2936
module UsingDirective {
3037
header "using-directive.h"
38+
requires cplusplus
3139
}
3240

3341
module ClassTemplateEagerInstantiationProblems {
3442
header "class-template-eager-instantiation-problems.h"
43+
requires cplusplus
3544
}
3645

3746
module Mangling {
3847
header "mangling.h"
48+
requires cplusplus
3949
}
4050

4151
module LinkageOfSwiftSymbolsForImportedTypes {
4252
header "linkage-of-swift-symbols-for-imported-types.h"
53+
requires cplusplus
4354
}
4455

4556
module ClassTemplateVariadic {
4657
header "class-template-variadic.h"
58+
requires cplusplus
4759
}
4860

4961
module ClassTemplateNonTypeParameter {
5062
header "class-template-non-type-parameter.h"
63+
requires cplusplus
5164
}
5265

5366
module ClassTemplateTemplateParameter {
5467
header "class-template-template-parameter.h"
68+
requires cplusplus
5569
}
5670

5771
module ClassTemplateWithTypedef {
5872
header "class-template-with-typedef.h"
73+
requires cplusplus
5974
}
6075

6176
module ClassTemplateInNamespace {
6277
header "class-template-in-namespace.h"
78+
requires cplusplus
6379
}
6480

6581
module MemberTemplates {
6682
header "member-templates.h"
83+
requires cplusplus
6784
}

0 commit comments

Comments
 (0)