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

[Richard Trieu]

Author: rtrieu
Date: Wed Apr 23 16:53:59 2014
New Revision: 207037

URL: http://llvm.org/viewvc/llvm-project?rev=207037&view=rev
Log:
Change -Wfloating-point-conversion to -Wfloat-conversion.

Added:
    cfe/trunk/test/SemaCXX/warn-float-conversion.cpp
      - copied, changed from r207026, cfe/trunk/test/SemaCXX/warn-floating-point-conversion.cpp
Removed:
    cfe/trunk/test/SemaCXX/warn-floating-point-conversion.cpp
Modified:
    cfe/trunk/include/clang/Basic/DiagnosticGroups.td
    cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td

Modified: cfe/trunk/include/clang/Basic/DiagnosticGroups.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticGroups.td?rev=207037&r1=207036&r2=207037&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticGroups.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticGroups.td Wed Apr 23 16:53:59 2014
@@ -41,7 +41,7 @@ def PointerBoolConversion : DiagGroup<"p
 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,

Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=207037&r1=207036&r2=207037&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Wed Apr 23 16:53:59 2014
@@ -2319,7 +2319,7 @@ def warn_impcast_float_precision : Warni
   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;

Copied: cfe/trunk/test/SemaCXX/warn-float-conversion.cpp (from r207026, cfe/trunk/test/SemaCXX/warn-floating-point-conversion.cpp)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/warn-float-conversion.cpp?p2=cfe/trunk/test/SemaCXX/warn-float-conversion.cpp&p1=cfe/trunk/test/SemaCXX/warn-floating-point-conversion.cpp&r1=207026&r2=207037&rev=207037&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/warn-floating-point-conversion.cpp (original)
+++ cfe/trunk/test/SemaCXX/warn-float-conversion.cpp Wed Apr 23 16:53:59 2014
@@ -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}}

Removed: cfe/trunk/test/SemaCXX/warn-floating-point-conversion.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/warn-floating-point-conversion.cpp?rev=207036&view=auto
==============================================================================
--- cfe/trunk/test/SemaCXX/warn-floating-point-conversion.cpp (original)
+++ cfe/trunk/test/SemaCXX/warn-floating-point-conversion.cpp (removed)
@@ -1,38 +0,0 @@
-// RUN: %clang_cc1 -verify -fsyntax-only %s -Wfloating-point-conversion
-
-bool ReturnBool(float f) {
-  return f;  //expected-warning{{conversion}}
-}
-
-char ReturnChar(float f) {
-  return f;  //expected-warning{{conversion}}
-}
-
-int ReturnInt(float f) {
-  return f;  //expected-warning{{conversion}}
-}
-
-long ReturnLong(float f) {
-  return f;  //expected-warning{{conversion}}
-}
-
-void Convert(float f, double d, long double ld) {
-  bool b;
-  char c;
-  int i;
-  long l;
-
-  b = f;  //expected-warning{{conversion}}
-  b = d;  //expected-warning{{conversion}}
-  b = ld;  //expected-warning{{conversion}}
-  c = f;  //expected-warning{{conversion}}
-  c = d;  //expected-warning{{conversion}}
-  c = ld;  //expected-warning{{conversion}}
-  i = f;  //expected-warning{{conversion}}
-  i = d;  //expected-warning{{conversion}}
-  i = ld;  //expected-warning{{conversion}}
-  l = f;  //expected-warning{{conversion}}
-  l = d;  //expected-warning{{conversion}}
-  l = ld;  //expected-warning{{conversion}}
-}
-