CPP: Fix the query.

Author: geoffw0

cpp/ql/src/Likely Bugs/Arithmetic/ComparisonPrecedence.ql

@@ -14,5 +14,8 @@
 import cpp
 
 from ComparisonOperation co, ComparisonOperation chco
-where co.getAChild() = chco and not chco.isParenthesised()
+where
+  co.getAChild() = chco and
+  not chco.isParenthesised() and
+  not co.isFromUninstantiatedTemplate(_)
 select co, "Check the comparison operator precedence."

cpp/ql/test/query-tests/Likely Bugs/Arithmetic/ComparisonPrecedence/ComparisonPrecedence.expected

@@ -1,6 +1,4 @@
 | template.cpp:4:7:4:15 | ... < ... | Check the comparison operator precedence. |
-| template.cpp:4:7:4:15 | ... < ... | Check the comparison operator precedence. |
-| template.cpp:10:7:10:15 | ... < ... | Check the comparison operator precedence. |
 | test.cpp:42:6:42:14 | ... < ... | Check the comparison operator precedence. |
 | test.cpp:43:6:43:14 | ... > ... | Check the comparison operator precedence. |
 | test.cpp:44:6:44:16 | ... <= ... | Check the comparison operator precedence. |

cpp/ql/test/query-tests/Likely Bugs/Arithmetic/ComparisonPrecedence/template.cpp

@@ -7,7 +7,7 @@ void templateFunc1(T x, T y, T z) {
 
 template <typename T>
 void templateFunc2(T x, T y, T z) {
-  if (x < y < z) {} // GOOD (used with an overloaded `operator<`) [FALSE POSITIVE]
+  if (x < y < z) {} // GOOD (used with an overloaded `operator<`)
   if (x < y && y < z) {} // GOOD
 };