Skip to content

Commit 38995f5

Browse files
compnerdcompnerd
authored
Merge pull request #25070 from moatom/fix-include-guard
Fix include guards
2 parents 93df66a + 2e95a0d commit 38995f5

35 files changed

+82
-82
lines changed

‎include/swift/ABI/Class.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,4 @@ inline ObjCClassFlags operator|(ObjCClassFlags lhs, ObjCClassFlags rhs) {
6565

6666
}
6767

68-
#endif /* SWIFT_ABI_CLASS_H */
68+
#endif // SWIFT_ABI_CLASS_H

‎include/swift/ABI/HeapObject.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
//
1515
//===----------------------------------------------------------------------===//
1616

17-
#ifndef __SWIFT_ABI_HEAPOBJECT_H__
18-
#define __SWIFT_ABI_HEAPOBJECT_H__
17+
#ifndef SWIFT_ABI_HEAPOBJECT_H
18+
#define SWIFT_ABI_HEAPOBJECT_H
1919

2020
#include "../../../stdlib/public/SwiftShims/HeapObject.h"
2121

22-
#endif // __SWIFT_ABI_HEAPOBJECT_H__
22+
#endif // SWIFT_ABI_HEAPOBJECT_H

‎include/swift/ABI/KeyPath.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
//
1515
//===----------------------------------------------------------------------===//
1616

17-
#ifndef __SWIFT_ABI_KEYPATH_H__
18-
#define __SWIFT_ABI_KEYPATH_H__
17+
#ifndef SWIFT_ABI_KEYPATH_H
18+
#define SWIFT_ABI_KEYPATH_H
1919

2020
// We include the basic constants in a shim header so that it can be shared with
2121
// the Swift implementation in the standard library.
@@ -235,4 +235,4 @@ class KeyPathComponentHeader {
235235

236236
}
237237

238-
#endif
238+
#endif // SWIFT_ABI_KEYPATH_H

‎include/swift/ABI/Metadata.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4442,4 +4442,4 @@ class DynamicReplacementScope
44424442

44434443
#pragma clang diagnostic pop
44444444

4445-
#endif /* SWIFT_ABI_METADATA_H */
4445+
#endif // SWIFT_ABI_METADATA_H

‎include/swift/ABI/MetadataValues.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1752,4 +1752,4 @@ class IntegerLiteralFlags {
17521752

17531753
} // end namespace swift
17541754

1755-
#endif /* SWIFT_ABI_METADATAVALUES_H */
1755+
#endif // SWIFT_ABI_METADATAVALUES_H

‎include/swift/ABI/System.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
//
1515
//===----------------------------------------------------------------------===//
1616

17-
#ifndef __SWIFT_ABI_SYSTEM_H__
18-
#define __SWIFT_ABI_SYSTEM_H__
17+
#ifndef SWIFT_ABI_SYSTEM_H
18+
#define SWIFT_ABI_SYSTEM_H
1919

2020
#include "../../../stdlib/public/SwiftShims/System.h"
2121

22-
#endif // __SWIFT_ABI_SYSTEM_H__
22+
#endif // SWIFT_ABI_SYSTEM_H

‎include/swift/ABI/TypeIdentity.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,4 +215,4 @@ class ParsedTypeIdentity {
215215

216216
} // end namespace swift
217217

218-
#endif /* SWIFT_ABI_TYPEIDENTITY_H */
218+
#endif // SWIFT_ABI_TYPEIDENTITY_H

‎include/swift/AST/ASTDemangler.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
//
2020
//===----------------------------------------------------------------------===//
2121

22-
#ifndef __SWIFT_AST_ASTDEMANGLER_H__
23-
#define __SWIFT_AST_ASTDEMANGLER_H__
22+
#ifndef SWIFT_AST_ASTDEMANGLER_H
23+
#define SWIFT_AST_ASTDEMANGLER_H
2424

2525
#include "llvm/ADT/ArrayRef.h"
2626
#include "llvm/ADT/StringRef.h"
@@ -185,4 +185,4 @@ class ASTBuilder {
185185

186186
} // namespace swift
187187

188-
#endif // __SWIFT_AST_ASTDEMANGLER_H__
188+
#endif // SWIFT_AST_ASTDEMANGLER_H

‎include/swift/AST/ASTMangler.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#ifndef __SWIFT_AST_ASTMANGLER_H__
14-
#define __SWIFT_AST_ASTMANGLER_H__
13+
#ifndef SWIFT_AST_ASTMANGLER_H
14+
#define SWIFT_AST_ASTMANGLER_H
1515

1616
#include "swift/Basic/Mangler.h"
1717
#include "swift/AST/Types.h"
@@ -350,4 +350,4 @@ class ASTMangler : public Mangler {
350350
} // end namespace Mangle
351351
} // end namespace swift
352352

353-
#endif // __SWIFT_AST_ASTMANGLER_H__
353+
#endif // SWIFT_AST_ASTMANGLER_H

‎include/swift/AST/ASTTypeIDs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ class Type;
3838

3939
} // end namespace swift
4040

41-
#endif /* SWIFT_AST_ASTTYPEIDS_H */
41+
#endif // SWIFT_AST_ASTTYPEIDS_H

‎include/swift/AST/DiagnosticSuppression.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ class DiagnosticSuppression {
4040
};
4141

4242
}
43-
#endif /* SWIFT_AST_DIAGNOSTIC_SUPPRESSION_H */
43+
#endif // SWIFT_AST_DIAGNOSTIC_SUPPRESSION_H

‎include/swift/AST/ExperimentalDependencies.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#ifndef ExperimentalDependencies_h
14-
#define ExperimentalDependencies_h
13+
#ifndef SWIFT_AST_EXPERIMENTAL_DEPENDENCIES_H
14+
#define SWIFT_AST_EXPERIMENTAL_DEPENDENCIES_H
1515

1616
#include "swift/Basic/LLVM.h"
1717
#include "swift/Basic/Range.h"
@@ -982,4 +982,4 @@ struct SequenceTraits<
982982
LLVM_YAML_DECLARE_MAPPING_TRAITS(
983983
swift::experimental_dependencies::SourceFileDepGraph)
984984

985-
#endif /* ExperimentalDependencies_h */
985+
#endif // SWIFT_AST_EXPERIMENTAL_DEPENDENCIES_H

‎include/swift/AST/TrailingCallArguments.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,4 +127,4 @@ class TrailingCallArguments
127127

128128
} // end namespace swift
129129

130-
#endif /* SWIFT_AST_TRAILINGCALLARGUMENTS_H */
130+
#endif // SWIFT_AST_TRAILINGCALLARGUMENTS_H

‎include/swift/AST/TypeResolutionStage.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ void simple_display(llvm::raw_ostream &out, const TypeResolutionStage &value);
4242

4343
} // end namespace swift
4444

45-
#endif /* SWIFT_AST_TYPE_RESOLUTION_STAGE_H */
45+
#endif // SWIFT_AST_TYPE_RESOLUTION_STAGE_H

‎include/swift/Basic/ExponentialGrowthAppendingBinaryByteStream.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,4 @@ class ExponentialGrowthAppendingBinaryByteStream
9191

9292
} // end namespace swift
9393

94-
#endif /* SWIFT_BASIC_EXPONENTIALGROWTHAPPENDINGBINARYBYTESTREAM_H */
94+
#endif // SWIFT_BASIC_EXPONENTIALGROWTHAPPENDINGBINARYBYTESTREAM_H

‎include/swift/Basic/PrimarySpecificPaths.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,4 @@ class PrimarySpecificPaths {
5252
};
5353
} // namespace swift
5454

55-
#endif /* SWIFT_BASIC_PRIMARYSPECIFICPATHS_H */
55+
#endif // SWIFT_BASIC_PRIMARYSPECIFICPATHS_H

‎include/swift/Basic/SupplementaryOutputPaths.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,4 +137,4 @@ struct SupplementaryOutputPaths {
137137
};
138138
} // namespace swift
139139

140-
#endif /* SWIFT_FRONTEND_SUPPLEMENTARYOUTPUTPATHS_H */
140+
#endif // SWIFT_FRONTEND_SUPPLEMENTARYOUTPUTPATHS_H

‎include/swift/Driver/ExperimentalDependencyDriverGraph.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,4 +468,4 @@ class ModuleDepGraph {
468468
} // namespace experimental_dependencies
469469
} // namespace swift
470470

471-
#endif /* ExperimentalDependencyGraph_h */
471+
#endif // ExperimentalDependencyGraph_h

‎include/swift/Frontend/FrontendInputsAndOutputs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,4 +243,4 @@ class FrontendInputsAndOutputs {
243243

244244
} // namespace swift
245245

246-
#endif /* SWIFT_FRONTEND_FRONTENDINPUTS_H */
246+
#endif // SWIFT_FRONTEND_FRONTENDINPUTS_H

‎include/swift/Frontend/InputFile.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,4 +102,4 @@ class InputFile {
102102
};
103103
} // namespace swift
104104

105-
#endif /* SWIFT_FRONTEND_INPUTFILE_H */
105+
#endif // SWIFT_FRONTEND_INPUTFILE_H

‎include/swift/Runtime/Casting.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,4 +246,4 @@ const WitnessTable *swift_conformsToProtocol(const Metadata *type,
246246

247247
} // end namespace swift
248248

249-
#endif /* SWIFT_RUNTIME_CASTING_H */
249+
#endif // SWIFT_RUNTIME_CASTING_H

‎include/swift/Runtime/Debug.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
//
1515
//===----------------------------------------------------------------------===//
1616

17-
#ifndef _SWIFT_RUNTIME_DEBUG_HELPERS_
18-
#define _SWIFT_RUNTIME_DEBUG_HELPERS_
17+
#ifndef SWIFT_RUNTIME_DEBUG_HELPERS_H
18+
#define SWIFT_RUNTIME_DEBUG_HELPERS_H
1919

2020
#include <cstdarg>
2121
#include <cstdio>
@@ -268,4 +268,4 @@ inline static int swift_asprintf(char **strp, const char *fmt, ...) {
268268
// namespace swift
269269
}
270270

271-
#endif // _SWIFT_RUNTIME_DEBUG_HELPERS_
271+
#endif // SWIFT_RUNTIME_DEBUG_HELPERS_H

‎include/swift/Runtime/Heap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
#ifndef SWIFT_RUNTIME_HEAP_H
1818
#define SWIFT_RUNTIME_HEAP_H
1919

20-
#endif /* SWIFT_RUNTIME_HEAP_H */
20+
#endif // SWIFT_RUNTIME_HEAP_H

0 commit comments

Comments
 (0)