Merge branch 'main' into lcartey/rule-8-3-linker-aware

cpp/cert/test/rules/DCL51-CPP/FunctionReusesReservedName.expected

@@ -1 +1 @@
-| test.cpp:20:6:20:8 | min | The function $@ reuses a reserved standard library name. | test.cpp:20:6:20:8 | min | min |
+| test.cpp:22:6:22:8 | min | The function $@ reuses a reserved standard library name. | test.cpp:22:6:22:8 | min | min |

cpp/cert/test/rules/DCL51-CPP/ObjectReusesReservedName.expected

@@ -1 +1 @@
-| test.cpp:18:5:18:10 | tzname | The variable $@ reuses a reserved standard library name. | test.cpp:18:5:18:10 | tzname | tzname |
+| test.cpp:19:5:19:10 | tzname | The variable $@ reuses a reserved standard library name. | test.cpp:19:5:19:10 | tzname | tzname |

cpp/cert/test/rules/DCL51-CPP/RedefiningOfStandardLibraryName.expected

@@ -1,3 +1,3 @@
 | test.cpp:6:1:6:14 | #undef INT_MAX | Redefinition of INT_MAX declared in a standard library header. |
 | test.cpp:7:1:7:20 | #define SIZE_MAX 256 | Redefinition of SIZE_MAX declared in a standard library header. |
-| test.cpp:37:1:38:9 | #define FD_SET(X) int _ ## X | Redefinition of FD_SET declared in a standard library header. |
+| test.cpp:39:1:40:9 | #define FD_SET(X) int _ ## X | Redefinition of FD_SET declared in a standard library header. |

cpp/cert/test/rules/DCL51-CPP/UseOfDoubleUnderscoreReservedPrefix.expected

@@ -1,2 +1,2 @@
-| test.cpp:25:5:25:7 | __x | Name $@ uses the reserved prefix '__'. | test.cpp:25:5:25:7 | __x | __x |
-| test.cpp:30:5:30:7 | __x | Name $@ uses the reserved prefix '__'. | test.cpp:30:5:30:7 | __x | __x |
+| test.cpp:27:5:27:7 | __x | Name $@ uses the reserved prefix '__'. | test.cpp:27:5:27:7 | __x | __x |
+| test.cpp:32:5:32:7 | __x | Name $@ uses the reserved prefix '__'. | test.cpp:32:5:32:7 | __x | __x |

cpp/cert/test/rules/DCL51-CPP/UseOfReservedLiteralSuffixIdentifier.expected

@@ -1 +1 @@
-| test.cpp:22:6:22:17 | operator ""x | Literal suffix identifier $@ does not start with an underscore. | test.cpp:22:6:22:17 | operator ""x | operator ""x |
+| test.cpp:24:6:24:17 | operator ""x | Literal suffix identifier $@ does not start with an underscore. | test.cpp:24:6:24:17 | operator ""x | operator ""x |

cpp/cert/test/rules/DCL51-CPP/UseOfSingleUnderscoreReservedPrefix.expected

@@ -1,5 +1,5 @@
-| test.cpp:26:5:26:6 | _X | Name $@ uses the reserved prefix '_'. | test.cpp:26:5:26:6 | _X | _X |
-| test.cpp:27:5:27:6 | _x | Name $@ uses the reserved prefix '_'. | test.cpp:27:5:27:6 | _x | _x |
-| test.cpp:31:5:31:6 | _X | Name $@ uses the reserved prefix '_'. | test.cpp:31:5:31:6 | _X | _X |
-| test.cpp:35:1:35:3 | _i | Name $@ uses the reserved prefix '_'. | test.cpp:35:1:35:3 | _i | _i |
+| test.cpp:28:5:28:6 | _X | Name $@ uses the reserved prefix '_'. | test.cpp:28:5:28:6 | _X | _X |
+| test.cpp:29:5:29:6 | _x | Name $@ uses the reserved prefix '_'. | test.cpp:29:5:29:6 | _x | _x |
+| test.cpp:33:5:33:6 | _X | Name $@ uses the reserved prefix '_'. | test.cpp:33:5:33:6 | _X | _X |
+| test.cpp:37:1:37:3 | _i | Name $@ uses the reserved prefix '_'. | test.cpp:37:1:37:3 | _i | _i |
 | test.h:2:1:2:15 | #define _TEST_H | Name $@ uses the reserved prefix '_'. | test.h:2:1:2:15 | #define _TEST_H | _TEST_H |

cpp/cert/test/rules/DCL51-CPP/test.cpp

@@ -15,7 +15,9 @@ enum {
 
 // int NULL = 0; // NON_COMPLIANT, but not supported by compilers in practice
 
+namespace ns {
 int tzname = 0; // NON_COMPLIANT
+}
 
 void min() {} // NON_COMPLIANT
 
@@ -48,4 +50,4 @@ void test_lambda(const int y) {
   // Lambda generates a static function called `_FUN` when the lambda is
   // converted to a function pointer
   g([](int x) { return x; }); // COMPLIANT - compiler generated
-}
+}

cpp/common/test/rules/macrooffsetofused/MacroOffsetofUsed.expected.gcc

@@ -1 +1 @@
-| test.cpp:9:32:9:51 | offsetof(__typ,__id) | Use of banned macro offsetof. |
+| test.cpp:9:32:9:51 | offsetof(TYPE,MEMBER) | Use of banned macro offsetof. |