Fix Preprocessor.json, for defined in if directive

Author: MichaelRFairhurst

cpp/misra/src/rules/RULE-19-1-1/DefinedOperatorExpandedInIfDirective.ql

@@ -19,7 +19,7 @@ import codingstandards.cpp.misra
 
 from PreprocessorIf ifDirective, MacroInvocation mi
 where
-  not isExcluded(ifDirective, PreprocessorPackage::macroDefinitionContainsDefinedOperatorQuery()) and
+  not isExcluded(ifDirective, PreprocessorPackage::definedOperatorExpandedInIfDirectiveQuery()) and
   ifDirective.getLocation().subsumes(mi.getLocation()) and
   mi.getMacro().getBody().regexpMatch(".*defined.*")
 select ifDirective,

rule_packages/cpp/Preprocessor.json

@@ -98,46 +98,6 @@
         }
       ],
       "title": "The #include directive shall be followed by either a <filename> or \"filename\" sequence"
-    },
-    "RULE-19-3-4": {
-      "properties": {
-        "enforcement": "decidable",
-        "obligation": "required"
-      },
-      "queries": [
-        {
-          "description": "",
-          "kind": "problem",
-          "name": "Parentheses shall be used to ensure macro arguments are expanded appropriately",
-          "precision": "very-high",
-          "severity": "error",
-          "short_name": "ParenthesesNotUsedToEnsureMacroArgumentsAreExpandedAppropriately",
-          "tags": [
-            "scope/single-translation-unit"
-          ]
-        }
-      ],
-      "title": "Parentheses shall be used to ensure macro arguments are expanded appropriately"
-    },
-    "RULE-19-6-1": {
-      "properties": {
-        "enforcement": "decidable",
-        "obligation": "advisory"
-      },
-      "queries": [
-        {
-          "description": "",
-          "kind": "problem",
-          "name": "The #pragma directive and the _Pragma operator should not be used",
-          "precision": "very-high",
-          "severity": "error",
-          "short_name": "PragmaDirectiveAndThePragmaOperatorShouldNotBeUsed",
-          "tags": [
-            "scope/single-translation-unit"
-          ]
-        }
-      ],
-      "title": "The #pragma directive and the _Pragma operator should not be used"
     }
   }
 }