[cxx-interop] Fix header guards in test/Interop (swiftlang#35039)

hlopko · web-flow · commit bde9c3b68322 · 2020-12-15T09:20:19.000+01:00
diff --git a/test/Interop/C/chars/Inputs/import-cchar-types.h b/test/Interop/C/chars/Inputs/import-cchar-types.h
@@ -1,4 +1,9 @@
+#ifndef TEST_INTEROP_C_CHARS_INPUTS_IMPORT_CCHAR_TYPES_H
+#define TEST_INTEROP_C_CHARS_INPUTS_IMPORT_CCHAR_TYPES_H
+
 #include <stddef.h>
 
 extern char a_char;
 extern wchar_t a_wchar;
+
+#endif // TEST_INTEROP_C_CHARS_INPUTS_IMPORT_CCHAR_TYPES_H
diff --git a/test/Interop/C/macros/Inputs/redefined-macro.h b/test/Interop/C/macros/Inputs/redefined-macro.h
@@ -1,3 +1,6 @@
+#ifndef TEST_INTEROP_C_MACROS_INPUTS_REDEFINED_MACRO_H
+#define TEST_INTEROP_C_MACROS_INPUTS_REDEFINED_MACRO_H
+
 #define FOO 0
 #define TMP_FOO FOO
 #undef FOO
@@ -12,4 +15,5 @@
 #define THREE THE_MAX
 
 #define BAR 0
-#define BAZ BAR
+#define BAZ BAR
+#endif // TEST_INTEROP_C_MACROS_INPUTS_REDEFINED_MACRO_H
diff --git a/test/Interop/C/modules/print-qualified-clang-types/Inputs/foreign-a.h b/test/Interop/C/modules/print-qualified-clang-types/Inputs/foreign-a.h
@@ -1 +1,6 @@
+#ifndef TEST_INTEROP_C_MODULES_PRINT_QUALIFIED_CLANG_TYPES_INPUTS_FOREIGN_A_H
+#define TEST_INTEROP_C_MODULES_PRINT_QUALIFIED_CLANG_TYPES_INPUTS_FOREIGN_A_H
+
 #include "textual-header.h"
+
+#endif // TEST_INTEROP_C_MODULES_PRINT_QUALIFIED_CLANG_TYPES_INPUTS_FOREIGN_A_H
diff --git a/test/Interop/C/modules/print-qualified-clang-types/Inputs/foreign-b.h b/test/Interop/C/modules/print-qualified-clang-types/Inputs/foreign-b.h
@@ -1 +1,6 @@
+#ifndef TEST_INTEROP_C_MODULES_PRINT_QUALIFIED_CLANG_TYPES_INPUTS_FOREIGN_B_H
+#define TEST_INTEROP_C_MODULES_PRINT_QUALIFIED_CLANG_TYPES_INPUTS_FOREIGN_B_H
+
 #include "textual-header.h"
+
+#endif // TEST_INTEROP_C_MODULES_PRINT_QUALIFIED_CLANG_TYPES_INPUTS_FOREIGN_B_H
diff --git a/test/Interop/C/modules/print-qualified-clang-types/Inputs/textual-header.h b/test/Interop/C/modules/print-qualified-clang-types/Inputs/textual-header.h
@@ -1 +1,6 @@
+#ifndef TEST_INTEROP_C_MODULES_PRINT_QUALIFIED_CLANG_TYPES_INPUTS_TEXTUAL_HEADER_H
+#define TEST_INTEROP_C_MODULES_PRINT_QUALIFIED_CLANG_TYPES_INPUTS_TEXTUAL_HEADER_H
+
 struct ForeignStruct {};
+
+#endif // TEST_INTEROP_C_MODULES_PRINT_QUALIFIED_CLANG_TYPES_INPUTS_TEXTUAL_HEADER_H
diff --git a/test/Interop/Cxx/class/Inputs/constructors-objc.h b/test/Interop/Cxx/class/Inputs/constructors-objc.h
@@ -1,5 +1,10 @@
+#ifndef TEST_INTEROP_CXX_CLASS_INPUTS_CONSTRUCTORS_OBJC_H
+#define TEST_INTEROP_CXX_CLASS_INPUTS_CONSTRUCTORS_OBJC_H
+
 #import <Foundation.h>
 
 struct ConstructorWithNSArrayParam {
   ConstructorWithNSArrayParam(NSArray *array) {}
 };
+
+#endif // TEST_INTEROP_CXX_CLASS_INPUTS_CONSTRUCTORS_OBJC_H
diff --git a/test/Interop/Cxx/class/Inputs/constructors.h b/test/Interop/Cxx/class/Inputs/constructors.h
@@ -1,3 +1,6 @@
+#ifndef TEST_INTEROP_CXX_CLASS_INPUTS_CONSTRUCTORS_H
+#define TEST_INTEROP_CXX_CLASS_INPUTS_CONSTRUCTORS_H
+
 struct ExplicitDefaultConstructor {
   ExplicitDefaultConstructor() : x(42) {}
   int x;
@@ -65,3 +68,5 @@ struct TemplatedConstructorWithExtraArg {
 struct UsingBaseConstructor : ConstructorWithParam {
   using ConstructorWithParam::ConstructorWithParam;
 };
+
+#endif // TEST_INTEROP_CXX_CLASS_INPUTS_CONSTRUCTORS_H
diff --git a/test/Interop/Cxx/class/Inputs/debug-info.h b/test/Interop/Cxx/class/Inputs/debug-info.h
@@ -1,3 +1,8 @@
+#ifndef TEST_INTEROP_CXX_CLASS_INPUTS_DEBUG_INFO_H
+#define TEST_INTEROP_CXX_CLASS_INPUTS_DEBUG_INFO_H
+
 struct IntWrapper {
   int value;
 };
+
+#endif // TEST_INTEROP_CXX_CLASS_INPUTS_DEBUG_INFO_H
diff --git a/test/Interop/Cxx/class/Inputs/nested-records.h b/test/Interop/Cxx/class/Inputs/nested-records.h
@@ -1,3 +1,6 @@
+#ifndef TEST_INTEROP_CXX_CLASS_INPUTS_NESTED_RECORDS_H
+#define TEST_INTEROP_CXX_CLASS_INPUTS_NESTED_RECORDS_H
+
 struct S1 {
   struct S2 {
     bool A : 1;
@@ -43,3 +46,5 @@ struct S10 {
 };
 
 // TODO: Nested class templates (SR-13853).
+
+#endif // TEST_INTEROP_CXX_CLASS_INPUTS_NESTED_RECORDS_H
diff --git a/test/Interop/Cxx/class/Inputs/protocol-conformance.h b/test/Interop/Cxx/class/Inputs/protocol-conformance.h
@@ -1,7 +1,12 @@
+#ifndef TEST_INTEROP_CXX_CLASS_INPUTS_PROTOCOL_CONFORMANCE_H
+#define TEST_INTEROP_CXX_CLASS_INPUTS_PROTOCOL_CONFORMANCE_H
+
 struct ConformsToProtocol {
   int return42() { return 42; }
 };
 
 struct DoesNotConformToProtocol {
   int returnFortyTwo() { return 42; }
 };
+
+#endif // TEST_INTEROP_CXX_CLASS_INPUTS_PROTOCOL_CONFORMANCE_H
diff --git a/test/Interop/Cxx/class/Inputs/type-classification.h b/test/Interop/Cxx/class/Inputs/type-classification.h
@@ -1,5 +1,5 @@
-#ifndef TEST_INTEROP_CXX_CLASS_INPUTS_LOADABLE_TYPES_H
-#define TEST_INTEROP_CXX_CLASS_INPUTS_LOADABLE_TYPES_H
+#ifndef TEST_INTEROP_CXX_CLASS_INPUTS_TYPE_CLASSIFICATION_H
+#define TEST_INTEROP_CXX_CLASS_INPUTS_TYPE_CLASSIFICATION_H
 
 struct EmptyStruct {};
 
@@ -189,4 +189,4 @@ struct StructWithCopyConstructorAndSubobjectCopyConstructorAndValue {
       : member(other.member) {}
 };
 
-#endif
+#endif // TEST_INTEROP_CXX_CLASS_INPUTS_TYPE_CLASSIFICATION_H
diff --git a/test/Interop/Cxx/enum/Inputs/bool-enums.h b/test/Interop/Cxx/enum/Inputs/bool-enums.h
@@ -1,6 +1,11 @@
+#ifndef TEST_INTEROP_CXX_ENUM_INPUTS_BOOL_ENUMS_H
+#define TEST_INTEROP_CXX_ENUM_INPUTS_BOOL_ENUMS_H
+
 enum Maybe : bool { No, Yes };
 enum BinaryNumbers : bool { One = 1, Zero = 0 };
 enum class EnumClass : bool { Foo, Bar };
 struct WrapperStruct {
   enum InnerBoolEnum : bool { A, B };
 };
+
+#endif // TEST_INTEROP_CXX_ENUM_INPUTS_BOOL_ENUMS_H
diff --git a/test/Interop/Cxx/templates/Inputs/class-template-eager-instantiation-problems.h b/test/Interop/Cxx/templates/Inputs/class-template-eager-instantiation-problems.h
@@ -1,5 +1,5 @@
-#ifndef TEST_INTEROP_CXX_TEMPLATES_INPUTS_EAGER_INSTANTIATION_PROBLEMS_H
-#define TEST_INTEROP_CXX_TEMPLATES_INPUTS_EAGER_INSTANTIATION_PROBLEMS_H
+#ifndef TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_EAGER_INSTANTIATION_PROBLEMS_H
+#define TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_EAGER_INSTANTIATION_PROBLEMS_H
 
 struct MagicNumber {
   int getInt() const { return 42; }
@@ -21,4 +21,4 @@ struct MagicWrapper {
 
 typedef MagicWrapper<int> BrokenMagicWrapper;
 
-#endif // TEST_INTEROP_CXX_TEMPLATES_INPUTS_EAGER_INSTANTIATION_PROBLEMS_H
+#endif // TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_EAGER_INSTANTIATION_PROBLEMS_H
diff --git a/test/Interop/Cxx/templates/Inputs/class-template-non-type-parameter.h b/test/Interop/Cxx/templates/Inputs/class-template-non-type-parameter.h
@@ -8,4 +8,4 @@ struct MagicArray {
 
 typedef MagicArray<int, 2> MagicIntPair;
 
-#endif  // TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_NON_TYPE_PARAMETER_H
+#endif // TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_NON_TYPE_PARAMETER_H
diff --git a/test/Interop/Cxx/templates/Inputs/class-template-template-parameter.h b/test/Interop/Cxx/templates/Inputs/class-template-template-parameter.h
@@ -20,4 +20,4 @@ struct TemplatedMagicWrapper {
 
 typedef TemplatedMagicWrapper<MagicWrapper> TemplatedWrappedMagicInt;
 typedef MagicWrapper<IntWrapper> WrappedMagicInt;
-#endif  // TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_TEMPLATE_PARAMETER_H
+#endif // TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_TEMPLATE_PARAMETER_H
diff --git a/test/Interop/Cxx/templates/Inputs/class-template-variadic.h b/test/Interop/Cxx/templates/Inputs/class-template-variadic.h
@@ -27,4 +27,4 @@ struct IntWrapper {
 
 typedef Tuple<IntWrapper, IntWrapper> Pair;
 
-#endif  // TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_VARIADIC_H
+#endif // TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_VARIADIC_H
diff --git a/test/Interop/Cxx/templates/Inputs/class-template-with-primitive-argument.h b/test/Interop/Cxx/templates/Inputs/class-template-with-primitive-argument.h
@@ -1,5 +1,5 @@
-#ifndef TEST_INTEROP_CXX_TEMPLATES_INPUTS_DECL_WITH_PRIMITIVE_ARGUMENT_H
-#define TEST_INTEROP_CXX_TEMPLATES_INPUTS_DECL_WITH_PRIMITIVE_ARGUMENT_H
+#ifndef TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_WITH_PRIMITIVE_ARGUMENT_H
+#define TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_WITH_PRIMITIVE_ARGUMENT_H
 
 template<class T>
 struct MagicWrapper {
@@ -9,4 +9,4 @@ struct MagicWrapper {
 
 typedef MagicWrapper<int> WrappedMagicInt;
 
-#endif // TEST_INTEROP_CXX_TEMPLATES_INPUTS_DECL_WITH_PRIMITIVE_ARGUMENT_H
+#endif // TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_WITH_PRIMITIVE_ARGUMENT_H
diff --git a/test/Interop/Cxx/templates/Inputs/class-template-with-typedef.h b/test/Interop/Cxx/templates/Inputs/class-template-with-typedef.h
@@ -1,3 +1,6 @@
+#ifndef TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_WITH_TYPEDEF_H
+#define TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_WITH_TYPEDEF_H
+
 // Make sure that we can import a type that uses a "dependent type" after being
 // specialized (i.e. "size_type" in "Lander").
 template <class T> struct Lander;
@@ -13,3 +16,5 @@ template <class T> struct Lander {
 };
 
 using Surveyor = Lander<char>;
+
+#endif // TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_WITH_TYPEDEF_H
diff --git a/test/Interop/Cxx/templates/Inputs/explicit-class-specialization.h b/test/Interop/Cxx/templates/Inputs/explicit-class-specialization.h
@@ -1,5 +1,5 @@
-#ifndef TEST_INTEROP_CXX_TEMPLATES_INPUTS_EXPLICIT_SPECIALIZATION_H
-#define TEST_INTEROP_CXX_TEMPLATES_INPUTS_EXPLICIT_SPECIALIZATION_H
+#ifndef TEST_INTEROP_CXX_TEMPLATES_INPUTS_EXPLICIT_CLASS_SPECIALIZATION_H
+#define TEST_INTEROP_CXX_TEMPLATES_INPUTS_EXPLICIT_CLASS_SPECIALIZATION_H
 
 struct SpecializedIntWrapper {
   int value;
@@ -61,4 +61,4 @@ template <class T, class... Ts> class HasSpecializations<int, T, Ts...> {
   enum Maybe : int { No, Yes };
 };
 
-#endif // TEST_INTEROP_CXX_TEMPLATES_INPUTS_EXPLICIT_SPECIALIZATION_H
+#endif // TEST_INTEROP_CXX_TEMPLATES_INPUTS_EXPLICIT_CLASS_SPECIALIZATION_H
diff --git a/test/Interop/Cxx/templates/Inputs/fully-pre-defined-class-template.h b/test/Interop/Cxx/templates/Inputs/fully-pre-defined-class-template.h
@@ -1,5 +1,5 @@
-#ifndef TEST_INTEROP_CXX_TEMPLATES_INPUTS_DECL_WITH_DEFINITION_INCLUDING_MEMBERS_H
-#define TEST_INTEROP_CXX_TEMPLATES_INPUTS_DECL_WITH_DEFINITION_INCLUDING_MEMBERS_H
+#ifndef TEST_INTEROP_CXX_TEMPLATES_INPUTS_FULLY_PRE_DEFINED_CLASS_TEMPLATE_H
+#define TEST_INTEROP_CXX_TEMPLATES_INPUTS_FULLY_PRE_DEFINED_CLASS_TEMPLATE_H
 
 template<class T>
 struct MagicWrapper {
@@ -23,4 +23,4 @@ inline int forceInstantiation() {
 // compiler.
 typedef MagicWrapper<IntWrapper> FullyPreDefinedMagicallyWrappedInt;
 
-#endif // TEST_INTEROP_CXX_TEMPLATES_INPUTS_DECL_WITH_DEFINITION_INCLUDING_MEMBERS_H
+#endif // TEST_INTEROP_CXX_TEMPLATES_INPUTS_FULLY_PRE_DEFINED_CLASS_TEMPLATE_H
diff --git a/test/Interop/Cxx/templates/Inputs/function-templates.h b/test/Interop/Cxx/templates/Inputs/function-templates.h
@@ -1,3 +1,6 @@
+#ifndef TEST_INTEROP_CXX_TEMPLATES_INPUTS_FUNCTION_TEMPLATES_H
+#define TEST_INTEROP_CXX_TEMPLATES_INPUTS_FUNCTION_TEMPLATES_H
+
 template <class T> T add(T a, T b) { return a + b; }
 
 template <class A, class B> A addTwoTemplates(A a, B b) { return a + b; }
@@ -85,3 +88,5 @@ struct HasImposibleMember {
 };
 
 } // namespace Unimportable
+
+#endif // TEST_INTEROP_CXX_TEMPLATES_INPUTS_FUNCTION_TEMPLATES_H
diff --git a/test/Interop/Cxx/templates/Inputs/not-pre-defined-class-template.h b/test/Interop/Cxx/templates/Inputs/not-pre-defined-class-template.h
@@ -1,5 +1,5 @@
-#ifndef TEST_INTEROP_CXX_TEMPLATES_INPUTS_DECL_WITHOUT_DEFINITION_H
-#define TEST_INTEROP_CXX_TEMPLATES_INPUTS_DECL_WITHOUT_DEFINITION_H
+#ifndef TEST_INTEROP_CXX_TEMPLATES_INPUTS_NOT_PRE_DEFINED_CLASS_TEMPLATE_H
+#define TEST_INTEROP_CXX_TEMPLATES_INPUTS_NOT_PRE_DEFINED_CLASS_TEMPLATE_H
 
 template<class T>
 struct MagicWrapper {
@@ -17,4 +17,4 @@ struct IntWrapper {
 // instantiation. Therefore, the Swift compiler must trigger instantiation.
 typedef MagicWrapper<IntWrapper> MagicallyWrappedIntWithoutDefinition;
 
-#endif // TEST_INTEROP_CXX_TEMPLATES_INPUTS_DECL_WITHOUT_DEFINITION_H
+#endif // TEST_INTEROP_CXX_TEMPLATES_INPUTS_NOT_PRE_DEFINED_CLASS_TEMPLATE_H
diff --git a/test/Interop/Cxx/templates/Inputs/partially-pre-defined-class-template.h b/test/Interop/Cxx/templates/Inputs/partially-pre-defined-class-template.h
@@ -1,5 +1,5 @@
-#ifndef TEST_INTEROP_CXX_TEMPLATES_INPUTS_DECL_WITH_DEFINITION_H
-#define TEST_INTEROP_CXX_TEMPLATES_INPUTS_DECL_WITH_DEFINITION_H
+#ifndef TEST_INTEROP_CXX_TEMPLATES_INPUTS_PARTIALLY_PRE_DEFINED_CLASS_TEMPLATE_H
+#define TEST_INTEROP_CXX_TEMPLATES_INPUTS_PARTIALLY_PRE_DEFINED_CLASS_TEMPLATE_H
 
 template<class T>
 struct MagicWrapper {
@@ -21,4 +21,4 @@ inline MagicWrapper<IntWrapper> forceInstantiation() {
 // instantiated though, the Swift compiler needs to instantiate them.
 typedef MagicWrapper<IntWrapper> PartiallyPreDefinedMagicallyWrappedInt;
 
-#endif // TEST_INTEROP_CXX_TEMPLATES_INPUTS_DECL_WITH_DEFINITION_H
+#endif // TEST_INTEROP_CXX_TEMPLATES_INPUTS_PARTIALLY_PRE_DEFINED_CLASS_TEMPLATE_H
