diff options
| author | Alex Lorenz <arphaman@gmail.com> | 2017-07-18 17:36:42 +0000 |
|---|---|---|
| committer | Alex Lorenz <arphaman@gmail.com> | 2017-07-18 17:36:42 +0000 |
| commit | 8856048c38146fac48a691610b440343e2c1a669 (patch) | |
| tree | fbcc6d71f06c3de13a38556ee948c710d72d4d41 /include/clang/Basic | |
| parent | 95c5cdeb80aaf0819eba8ddd4421d04be5e271ff (diff) | |
Revert r308327
I forgot to test clang-tools-extra which is now failing.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@308328 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/clang/Basic')
| -rw-r--r-- | include/clang/Basic/DiagnosticGroups.td | 3 | ||||
| -rw-r--r-- | include/clang/Basic/DiagnosticSemaKinds.td | 10 |
2 files changed, 1 insertions, 12 deletions
diff --git a/include/clang/Basic/DiagnosticGroups.td b/include/clang/Basic/DiagnosticGroups.td index adb71fa9d5..3a0564806b 100644 --- a/include/clang/Basic/DiagnosticGroups.td +++ b/include/clang/Basic/DiagnosticGroups.td @@ -467,9 +467,8 @@ def IgnoredPragmaIntrinsic : DiagGroup<"ignored-pragma-intrinsic">; def UnknownPragmas : DiagGroup<"unknown-pragmas">; def IgnoredPragmas : DiagGroup<"ignored-pragmas", [IgnoredPragmaIntrinsic]>; def PragmaClangAttribute : DiagGroup<"pragma-clang-attribute">; -def PragmaPack : DiagGroup<"pragma-pack">; def Pragmas : DiagGroup<"pragmas", [UnknownPragmas, IgnoredPragmas, - PragmaClangAttribute, PragmaPack]>; + PragmaClangAttribute]>; def UnknownWarningOption : DiagGroup<"unknown-warning-option">; def NSobjectAttribute : DiagGroup<"NSObject-attribute">; def IndependentClassAttribute : DiagGroup<"IndependentClass-attribute">; diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index aeeef5cae6..09ad1c5b2a 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/include/clang/Basic/DiagnosticSemaKinds.td @@ -712,16 +712,6 @@ def err_pragma_options_align_mac68k_target_unsupported : Error< def warn_pragma_pack_invalid_alignment : Warning< "expected #pragma pack parameter to be '1', '2', '4', '8', or '16'">, InGroup<IgnoredPragmas>; -def warn_pragma_pack_non_default_at_include : Warning< - "non-default #pragma pack value might change the alignment of struct or " - "union members in the included file">, InGroup<PragmaPack>; -def warn_pragma_pack_modified_after_include : Warning< - "the current #pragma pack aligment value is modified in the included " - "file">, InGroup<PragmaPack>; -def warn_pragma_pack_no_pop_eof : Warning<"unterminated " - "'#pragma pack (push, ...)' at end of file">, InGroup<PragmaPack>; -def note_pragma_pack_here : Note< - "previous '#pragma pack' directive that modifies alignment is here">; // Follow the Microsoft implementation. def warn_pragma_pack_show : Warning<"value of #pragma pack(show) == %0">; def warn_pragma_pack_pop_identifer_and_alignment : Warning< |