Merge new versions of cpp leap year queries

Author: ropwareJB

cpp/ql/src/Likely Bugs/Leap Year/Adding365DaysPerYear.qhelp

@@ -11,7 +11,7 @@ It is not safe to assume that a year is 365 days long.</p>
 
 <recommendation>
 <p>Determine whether the time span in question contains a leap day, then perform the calculation using the correct number
-of days.  Alternatively, use an established library routine that already contains correct leap year logic.</p>
+of days. Alternatively, use an established library routine that already contains correct leap year logic.</p>
 </recommendation>
 
 <references>

cpp/ql/src/Likely Bugs/Leap Year/Adding365DaysPerYear.ql

@@ -4,7 +4,7 @@
  *              value of 365, it may be a sign that leap years are not taken
  *              into account.
  * @kind problem
- * @problem.severity warning
+ * @problem.severity error
  * @id cpp/leap-year/adding-365-days-per-year
  * @precision medium
  * @tags leap-year
@@ -13,11 +13,13 @@
 
 import cpp
 import LeapYear
+import semmle.code.cpp.dataflow.new.DataFlow
 
 from Expr source, Expr sink
 where
   PossibleYearArithmeticOperationCheckFlow::flow(DataFlow::exprNode(source),
     DataFlow::exprNode(sink))
 select sink,
-  "An arithmetic operation $@ that uses a constant value of 365 ends up modifying this date/time, without considering leap year scenarios.",
-  source, source.toString()
+  "$@: This arithmetic operation $@ uses a constant value of 365 ends up modifying the date/time located at $@, without considering leap year scenarios.",
+  sink.getEnclosingFunction(), sink.getEnclosingFunction().toString(), source, source.toString(),
+  sink, sink.toString()

cpp/ql/src/Microsoft/Leap Year/AntiPattern5InvalidLeapYearCheck.ql renamed to cpp/ql/src/Likely Bugs/Leap Year/AntiPattern5InvalidLeapYearCheck.ql

@@ -2,12 +2,11 @@
  * @name Leap Year Invalid Check (AntiPattern 5)
  * @description An expression is used to check a year is presumably a leap year, but the conditions used are insufficient.
  * @kind problem
- * @problem.severity error
+ * @problem.severity warning
  * @id cpp/leap-year/invalid-leap-year-check
  * @precision medium
  * @tags leap-year
  *       correctness
- *       security
  */
 
 import cpp