yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 10:49:34 +02:00
Code Issues Releases Wiki Activity

Don't use nullptr keyword yet.

Browse source
This commit is contained in:
caheckman 2019-09-20 16:32:16 -04:00
parent efb6148b6c
commit 60e48ee1c3
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Ghidra/Features/Decompiler/src/decompile/cpp/slgh_compile.cc
View file

@ -1587,7 +1587,7 @@ void SleighCompile::buildDecisionTrees(void)
for(int4 i=0;i<tables.size();++i) for(int4 i=0;i<tables.size();++i)
tables[i]->buildDecisionTree(props); tables[i]->buildDecisionTree(props);
const vector<pair<Constructor*, Constructor*>> &ierrors( props.getIdentErrors() ); const vector<pair<Constructor*, Constructor*> > &ierrors( props.getIdentErrors() );
if (ierrors.size() != 0) { if (ierrors.size() != 0) {
string identMsg = "Constructor has identical pattern to constructor at "; string identMsg = "Constructor has identical pattern to constructor at ";
for(int4 i=0;i<ierrors.size();++i) { for(int4 i=0;i<ierrors.size();++i) {
@ -1599,7 +1599,7 @@ void SleighCompile::buildDecisionTrees(void)
} }
} }
const vector<pair<Constructor *, Constructor*>> &cerrors( props.getConflictErrors() ); const vector<pair<Constructor *, Constructor*> > &cerrors( props.getConflictErrors() );
if (!lenientconflicterrors && cerrors.size() != 0) { if (!lenientconflicterrors && cerrors.size() != 0) {
string conflictMsg = "Constructor pattern cannot be distinguished from constructor at "; string conflictMsg = "Constructor pattern cannot be distinguished from constructor at ";
for(int4 i=0;i<cerrors.size();++i) { for(int4 i=0;i<cerrors.size();++i) {
@ -1616,7 +1616,7 @@ void SleighCompile::buildPatterns(void)
{ {
if (root == 0) { if (root == 0) {
reportError(nullptr, "No patterns to match."); reportError((const Location *)0, "No patterns to match.");
return; return;
} }
ostringstream msg; ostringstream msg;

8
Ghidra/Features/Decompiler/src/decompile/cpp/slghsymbol.hh
View file

@ -525,13 +525,13 @@ public:
}; };
class DecisionProperties { class DecisionProperties {
vector<pair<Constructor *, Constructor *>> identerrors; vector<pair<Constructor *, Constructor *> > identerrors;
vector<pair<Constructor *, Constructor *>> conflicterrors; vector<pair<Constructor *, Constructor *> > conflicterrors;
public: public:
void identicalPattern(Constructor *a,Constructor *b); void identicalPattern(Constructor *a,Constructor *b);
void conflictingPattern(Constructor *a,Constructor *b); void conflictingPattern(Constructor *a,Constructor *b);
const vector<pair<Constructor *, Constructor *>> &getIdentErrors(void) const { return identerrors; } const vector<pair<Constructor *, Constructor *> > &getIdentErrors(void) const { return identerrors; }
const vector<pair<Constructor *, Constructor *>> &getConflictErrors(void) const { return conflicterrors; } const vector<pair<Constructor *, Constructor *> > &getConflictErrors(void) const { return conflicterrors; }
}; };
class DecisionNode { class DecisionNode {