Skip to content

Fix include guards #25070

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/swift/ABI/Class.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@ inline ObjCClassFlags operator|(ObjCClassFlags lhs, ObjCClassFlags rhs) {

}

#endif /* SWIFT_ABI_CLASS_H */
#endif // SWIFT_ABI_CLASS_H
6 changes: 3 additions & 3 deletions include/swift/ABI/HeapObject.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
//
//===----------------------------------------------------------------------===//

#ifndef __SWIFT_ABI_HEAPOBJECT_H__
#define __SWIFT_ABI_HEAPOBJECT_H__
#ifndef SWIFT_ABI_HEAPOBJECT_H
#define SWIFT_ABI_HEAPOBJECT_H

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

#endif // __SWIFT_ABI_HEAPOBJECT_H__
#endif // SWIFT_ABI_HEAPOBJECT_H
6 changes: 3 additions & 3 deletions include/swift/ABI/KeyPath.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef __SWIFT_ABI_KEYPATH_H__
#define __SWIFT_ABI_KEYPATH_H__
#ifndef SWIFT_ABI_KEYPATH_H
#define SWIFT_ABI_KEYPATH_H

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

}

#endif
#endif // SWIFT_ABI_KEYPATH_H
2 changes: 1 addition & 1 deletion include/swift/ABI/Metadata.h
Original file line number Diff line number Diff line change
Expand Up @@ -4442,4 +4442,4 @@ class DynamicReplacementScope

#pragma clang diagnostic pop

#endif /* SWIFT_ABI_METADATA_H */
#endif // SWIFT_ABI_METADATA_H
2 changes: 1 addition & 1 deletion include/swift/ABI/MetadataValues.h
Original file line number Diff line number Diff line change
Expand Up @@ -1752,4 +1752,4 @@ class IntegerLiteralFlags {

} // end namespace swift

#endif /* SWIFT_ABI_METADATAVALUES_H */
#endif // SWIFT_ABI_METADATAVALUES_H
6 changes: 3 additions & 3 deletions include/swift/ABI/System.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
//
//===----------------------------------------------------------------------===//

#ifndef __SWIFT_ABI_SYSTEM_H__
#define __SWIFT_ABI_SYSTEM_H__
#ifndef SWIFT_ABI_SYSTEM_H
#define SWIFT_ABI_SYSTEM_H

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

#endif // __SWIFT_ABI_SYSTEM_H__
#endif // SWIFT_ABI_SYSTEM_H
2 changes: 1 addition & 1 deletion include/swift/ABI/TypeIdentity.h
Original file line number Diff line number Diff line change
Expand Up @@ -215,4 +215,4 @@ class ParsedTypeIdentity {

} // end namespace swift

#endif /* SWIFT_ABI_TYPEIDENTITY_H */
#endif // SWIFT_ABI_TYPEIDENTITY_H
6 changes: 3 additions & 3 deletions include/swift/AST/ASTDemangler.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef __SWIFT_AST_ASTDEMANGLER_H__
#define __SWIFT_AST_ASTDEMANGLER_H__
#ifndef SWIFT_AST_ASTDEMANGLER_H
#define SWIFT_AST_ASTDEMANGLER_H

#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/StringRef.h"
Expand Down Expand Up @@ -185,4 +185,4 @@ class ASTBuilder {

} // namespace swift

#endif // __SWIFT_AST_ASTDEMANGLER_H__
#endif // SWIFT_AST_ASTDEMANGLER_H
6 changes: 3 additions & 3 deletions include/swift/AST/ASTMangler.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef __SWIFT_AST_ASTMANGLER_H__
#define __SWIFT_AST_ASTMANGLER_H__
#ifndef SWIFT_AST_ASTMANGLER_H
#define SWIFT_AST_ASTMANGLER_H

#include "swift/Basic/Mangler.h"
#include "swift/AST/Types.h"
Expand Down Expand Up @@ -350,4 +350,4 @@ class ASTMangler : public Mangler {
} // end namespace Mangle
} // end namespace swift

#endif // __SWIFT_AST_ASTMANGLER_H__
#endif // SWIFT_AST_ASTMANGLER_H
2 changes: 1 addition & 1 deletion include/swift/AST/ASTTypeIDs.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ class TypeAliasDecl;

} // end namespace swift

#endif /* SWIFT_AST_ASTTYPEIDS_H */
#endif // SWIFT_AST_ASTTYPEIDS_H
2 changes: 1 addition & 1 deletion include/swift/AST/DiagnosticSuppression.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ class DiagnosticSuppression {
};

}
#endif /* SWIFT_AST_DIAGNOSTIC_SUPPRESSION_H */
#endif // SWIFT_AST_DIAGNOSTIC_SUPPRESSION_H
6 changes: 3 additions & 3 deletions include/swift/AST/ExperimentalDependencies.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef ExperimentalDependencies_h
#define ExperimentalDependencies_h
#ifndef SWIFT_AST_EXPERIMENTAL_DEPENDENCIES_H
#define SWIFT_AST_EXPERIMENTAL_DEPENDENCIES_H

#include "swift/Basic/LLVM.h"
#include "swift/Basic/Range.h"
Expand Down Expand Up @@ -981,4 +981,4 @@ struct SequenceTraits<
LLVM_YAML_DECLARE_MAPPING_TRAITS(
swift::experimental_dependencies::SourceFileDepGraph)

#endif /* ExperimentalDependencies_h */
#endif // SWIFT_AST_EXPERIMENTAL_DEPENDENCIES_H
2 changes: 1 addition & 1 deletion include/swift/AST/TrailingCallArguments.h
Original file line number Diff line number Diff line change
Expand Up @@ -127,4 +127,4 @@ class TrailingCallArguments

} // end namespace swift

#endif /* SWIFT_AST_TRAILINGCALLARGUMENTS_H */
#endif // SWIFT_AST_TRAILINGCALLARGUMENTS_H
2 changes: 1 addition & 1 deletion include/swift/AST/TypeResolutionStage.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ void simple_display(llvm::raw_ostream &out, const TypeResolutionStage &value);

} // end namespace swift

#endif /* SWIFT_AST_TYPE_RESOLUTION_STAGE_H */
#endif // SWIFT_AST_TYPE_RESOLUTION_STAGE_H
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,4 @@ class ExponentialGrowthAppendingBinaryByteStream

} // end namespace swift

#endif /* SWIFT_BASIC_EXPONENTIALGROWTHAPPENDINGBINARYBYTESTREAM_H */
#endif // SWIFT_BASIC_EXPONENTIALGROWTHAPPENDINGBINARYBYTESTREAM_H
2 changes: 1 addition & 1 deletion include/swift/Basic/PrimarySpecificPaths.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ class PrimarySpecificPaths {
};
} // namespace swift

#endif /* SWIFT_BASIC_PRIMARYSPECIFICPATHS_H */
#endif // SWIFT_BASIC_PRIMARYSPECIFICPATHS_H
2 changes: 1 addition & 1 deletion include/swift/Basic/SupplementaryOutputPaths.h
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,4 @@ struct SupplementaryOutputPaths {
};
} // namespace swift

#endif /* SWIFT_FRONTEND_SUPPLEMENTARYOUTPUTPATHS_H */
#endif // SWIFT_FRONTEND_SUPPLEMENTARYOUTPUTPATHS_H
2 changes: 1 addition & 1 deletion include/swift/Driver/ExperimentalDependencyDriverGraph.h
Original file line number Diff line number Diff line change
Expand Up @@ -468,4 +468,4 @@ class ModuleDepGraph {
} // namespace experimental_dependencies
} // namespace swift

#endif /* ExperimentalDependencyGraph_h */
#endif // ExperimentalDependencyGraph_h
2 changes: 1 addition & 1 deletion include/swift/Frontend/FrontendInputsAndOutputs.h
Original file line number Diff line number Diff line change
Expand Up @@ -243,4 +243,4 @@ class FrontendInputsAndOutputs {

} // namespace swift

#endif /* SWIFT_FRONTEND_FRONTENDINPUTS_H */
#endif // SWIFT_FRONTEND_FRONTENDINPUTS_H
2 changes: 1 addition & 1 deletion include/swift/Frontend/InputFile.h
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,4 @@ class InputFile {
};
} // namespace swift

#endif /* SWIFT_FRONTEND_INPUTFILE_H */
#endif // SWIFT_FRONTEND_INPUTFILE_H
2 changes: 1 addition & 1 deletion include/swift/Runtime/Casting.h
Original file line number Diff line number Diff line change
Expand Up @@ -246,4 +246,4 @@ const WitnessTable *swift_conformsToProtocol(const Metadata *type,

} // end namespace swift

#endif /* SWIFT_RUNTIME_CASTING_H */
#endif // SWIFT_RUNTIME_CASTING_H
6 changes: 3 additions & 3 deletions include/swift/Runtime/Debug.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef _SWIFT_RUNTIME_DEBUG_HELPERS_
#define _SWIFT_RUNTIME_DEBUG_HELPERS_
#ifndef SWIFT_RUNTIME_DEBUG_HELPERS_H
#define SWIFT_RUNTIME_DEBUG_HELPERS_H

#include <cstdarg>
#include <cstdio>
Expand Down Expand Up @@ -268,4 +268,4 @@ inline static int swift_asprintf(char **strp, const char *fmt, ...) {
// namespace swift
}

#endif // _SWIFT_RUNTIME_DEBUG_HELPERS_
#endif // SWIFT_RUNTIME_DEBUG_HELPERS_H
2 changes: 1 addition & 1 deletion include/swift/Runtime/Heap.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
#ifndef SWIFT_RUNTIME_HEAP_H
#define SWIFT_RUNTIME_HEAP_H

#endif /* SWIFT_RUNTIME_HEAP_H */
#endif // SWIFT_RUNTIME_HEAP_H
Loading