summaryrefslogtreecommitdiffstats
path: root/include/clang
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2015-01-15 22:31:35 +0000
committerdim <dim@FreeBSD.org>2015-01-15 22:31:35 +0000
commitc696171ff15f0ee60dea4abfd99a135473c95656 (patch)
tree6c840e234e0c97d0adf033bb41f667a5f5b528b6 /include/clang
parent173a4f43a911175643bda81ee675e8d9269056ea (diff)
downloadFreeBSD-src-c696171ff15f0ee60dea4abfd99a135473c95656.zip
FreeBSD-src-c696171ff15f0ee60dea4abfd99a135473c95656.tar.gz
Vendor import of clang RELEASE_351/final tag r225668 (effectively, 3.5.1 release):
https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_351/final@225668
Diffstat (limited to 'include/clang')
-rw-r--r--include/clang/Basic/DiagnosticSemaKinds.td3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index 89749ed..1665a45 100644
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -2115,6 +2115,9 @@ def warn_attribute_invalid_on_definition : Warning<
InGroup<IgnoredAttributes>;
def err_attribute_dll_redeclaration : Error<
"redeclaration of %q0 cannot add %q1 attribute">;
+def warn_attribute_dll_redeclaration : Warning<
+ "redeclaration of %q0 should not add %q1 attribute">,
+ InGroup<DiagGroup<"dll-attribute-on-redeclaration">>;
def err_attribute_dllimport_function_definition : Error<
"dllimport cannot be applied to non-inline function definition">;
def err_attribute_dll_deleted : Error<
OpenPOWER on IntegriCloud