Skip to content

Commit 3e1205e

Browse files
authored
Merge pull request github#480 from jketema/udl
Resolve name clash with CodeQL defined `UserDefinedLiteral`
2 parents c263cd3 + 378f4fa commit 3e1205e

4 files changed

+8
-8
lines changed

cpp/autosar/src/rules/A13-1-2/UserDefinedLiteralOperatorSuffixViolation.ql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515

1616
import cpp
1717
import codingstandards.cpp.autosar
18-
import codingstandards.cpp.UserDefinedLiteral
18+
import codingstandards.cpp.UserDefinedLiteral as udl
1919

20-
from UserDefinedLiteral udl
20+
from udl::UserDefinedLiteral udl
2121
where
2222
not isExcluded(udl, NamingPackage::userDefinedLiteralOperatorSuffixViolationQuery()) and
2323
not udl.hasCompliantSuffix()

cpp/autosar/src/rules/A13-1-3/UserDefinedLiteralsOperatorsShallNotHaveSideEffects.ql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414

1515
import cpp
1616
import codingstandards.cpp.autosar
17-
import codingstandards.cpp.UserDefinedLiteral
17+
import codingstandards.cpp.UserDefinedLiteral as udl
1818
import codingstandards.cpp.SideEffect
1919
import codingstandards.cpp.sideeffect.DefaultEffects
2020

21-
from UserDefinedLiteral udl, SideEffect e
21+
from udl::UserDefinedLiteral udl, SideEffect e
2222
where
2323
not isExcluded(udl,
2424
SideEffects2Package::userDefinedLiteralsOperatorsShallNotHaveSideEffectsQuery()) and

cpp/autosar/src/rules/A13-1-3/UserDefinedLiteralsOperatorsShallOnlyPerformConversionOfPassedParameters.ql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
import cpp
1717
import codingstandards.cpp.dataflow.TaintTracking
1818
import codingstandards.cpp.autosar
19-
import codingstandards.cpp.UserDefinedLiteral
19+
import codingstandards.cpp.UserDefinedLiteral as udl
2020
import codingstandards.cpp.SideEffect
2121

22-
from UserDefinedLiteral udl, Expr retExpr
22+
from udl::UserDefinedLiteral udl, Expr retExpr
2323
where
2424
not isExcluded(udl,
2525
SideEffects2Package::userDefinedLiteralsOperatorsShallOnlyPerformConversionOfPassedParametersQuery()) and

cpp/cert/src/rules/DCL51-CPP/UseOfReservedLiteralSuffixIdentifier.ql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515

1616
import cpp
1717
import codingstandards.cpp.cert
18-
import codingstandards.cpp.UserDefinedLiteral
18+
import codingstandards.cpp.UserDefinedLiteral as udl
1919

20-
from UserDefinedLiteral udl
20+
from udl::UserDefinedLiteral udl
2121
where
2222
not isExcluded(udl, NamingPackage::useOfReservedLiteralSuffixIdentifierQuery()) and
2323
not udl.hasCompliantSuffix()

0 commit comments

Comments
 (0)