Change -Wfloating-point-conversion to -Wfloat-conversion.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@207037 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Basic/DiagnosticGroups.td b/include/clang/Basic/DiagnosticGroups.td
index 0521e30ad18e0e449f78462201cae415e0bbe0f7..b1665f5373b3fe9abb7a56cab983fa1cf47a9c22 100644 (file)
--- a/include/clang/Basic/DiagnosticGroups.td
+++ b/include/clang/Basic/DiagnosticGroups.td
@@ -41,7 +41,7 @@ def PointerBoolConversion : DiagGroup<"pointer-bool-conversion">;
 def BoolConversion : DiagGroup<"bool-conversion", [ PointerBoolConversion ] >;
 def IntConversion : DiagGroup<"int-conversion">;
 def EnumConversion : DiagGroup<"enum-conversion">;
-def FloatingPointConversion : DiagGroup<"floating-point-conversion">;
+def FloatConversion : DiagGroup<"float-conversion">;
 def EnumTooLarge : DiagGroup<"enum-too-large">;
 def NonLiteralNullConversion : DiagGroup<"non-literal-null-conversion">;
 def NullConversion : DiagGroup<"null-conversion">;
@@ -487,7 +487,7 @@ def Conversion : DiagGroup<"conversion",
                            [BoolConversion,
                             ConstantConversion,
                             EnumConversion,
-                            FloatingPointConversion,
+                            FloatConversion,
                             Shorten64To32,
                             IntConversion,
                             LiteralConversion,

diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index d04b69d6692029c802d455811d070c16dc6b9e05..a81154596b7c62a7704168470d6a3a9d47a375e5 100644 (file)
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -2319,7 +2319,7 @@ def warn_impcast_float_precision : Warning<
   InGroup<Conversion>, DefaultIgnore;
 def warn_impcast_float_integer : Warning<
   "implicit conversion turns floating-point number into integer: %0 to %1">,
-  InGroup<FloatingPointConversion>, DefaultIgnore;
+  InGroup<FloatConversion>, DefaultIgnore;
 def warn_impcast_integer_sign : Warning<
   "implicit conversion changes signedness: %0 to %1">,
   InGroup<SignConversion>, DefaultIgnore;

diff --git a/test/SemaCXX/warn-floating-point-conversion.cpp b/test/SemaCXX/warn-float-conversion.cpp
similarity index 92%
rename from test/SemaCXX/warn-floating-point-conversion.cpp
rename to test/SemaCXX/warn-float-conversion.cpp
index 1a88c2d3f38e1ef83b0f8568e731f6cc073d8c2f..22c33040b26b8cc4c959f1f010517d89778b1cc7 100644 (file)
--- a/test/SemaCXX/warn-floating-point-conversion.cpp
+++ b/test/SemaCXX/warn-float-conversion.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -verify -fsyntax-only %s -Wfloating-point-conversion
+// RUN: %clang_cc1 -verify -fsyntax-only %s -Wfloat-conversion
 
 bool ReturnBool(float f) {
   return f;  //expected-warning{{conversion}}