Merge pull request #509 from secure-software-engineering/f-RedeclarationForGCC

Fixes gcc redeclaration confusion

Author: pdschubert

include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/FlowFunctions/MapTaintedValuesToCaller.h

@@ -28,7 +28,7 @@ class MapTaintedValuesToCaller : public FlowFunction<ExtendedValue> {
 private:
   const llvm::CallInst *CallInst;
   const llvm::ReturnInst *RetInst;
-  TraceStats &TraceStats;
+  ::psr::TraceStats &TraceStats;
   ExtendedValue ZV;
 };
 

include/phasar/PhasarLLVM/DataFlowSolver/WPDS/WPDSSolverConfig.h

@@ -29,7 +29,7 @@ struct WPDSSolverConfig {
   WPDSSolverConfig &operator=(WPDSSolverConfig &&) = default;
   bool RecordWitnesses = false;
   WPDSSearchDirection Direction = WPDSSearchDirection::FORWARD;
-  WPDSType WPDSType = WPDSType::FWPDS;
+  ::psr::WPDSType WPDSType = WPDSType::FWPDS;
   friend llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
                                        const WPDSSolverConfig &SC);
 };