valueflow.cpp: changed ValueFlowAnalyzer::tokenlist back to a std::reference_wrapper and made it protected

firewave · firewave · commit f12375c72e17 · 2023-03-14T14:00:06.000+01:00
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
@@ -2339,7 +2339,9 @@ static bool bifurcate(const Token* tok, const std::set<nonneg int>& varids, cons
 }
 
 struct ValueFlowAnalyzer : Analyzer {
-    const TokenList& tokenlist;
+protected:
+    std::reference_wrapper<const TokenList> tokenlist;
+public:
     const Settings* settings;
     ProgramMemoryState pms;
 
@@ -2386,7 +2388,7 @@ struct ValueFlowAnalyzer : Analyzer {
     }
 
     bool isCPP() const {
-        return tokenlist.isCPP();
+        return tokenlist.get().isCPP();
     }
 
     const Settings* getSettings() const {

Original file line number	Diff line number	Diff line change
`@@ -2339,7 +2339,9 @@ static bool bifurcate(const Token* tok, const std::set<nonneg int>& varids, cons`
`2339`	`2339`	`}`
`2340`	`2340`
`2341`	`2341`	`struct ValueFlowAnalyzer : Analyzer {`
`2342`		`- const TokenList& tokenlist;`
	`2342`	`+protected:`
	`2343`	`+ std::reference_wrapper<const TokenList> tokenlist;`
	`2344`	`+public:`
`2343`	`2345`	`const Settings* settings;`
`2344`	`2346`	`ProgramMemoryState pms;`
`2345`	`2347`
`@@ -2386,7 +2388,7 @@ struct ValueFlowAnalyzer : Analyzer {`
`2386`	`2388`	`}`
`2387`	`2389`
`2388`	`2390`	`bool isCPP() const {`
`2389`		`- return tokenlist.isCPP();`
	`2391`	`+ return tokenlist.get().isCPP();`
`2390`	`2392`	`}`
`2391`	`2393`
`2392`	`2394`	`const Settings* getSettings() const {`