diff --git a/lib/library.cpp b/lib/library.cpp index 962d1e7dc..8719ce50e 100644 --- a/lib/library.cpp +++ b/lib/library.cpp @@ -178,7 +178,7 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc) temp.arg = atoi(arg); else temp.arg = -1; - _alloc[memorynode->GetText()] = temp; + mAlloc[memorynode->GetText()] = temp; } else if (memorynodename == "dealloc") { AllocFunc temp; temp.groupId = allocationId; @@ -825,7 +825,7 @@ bool Library::isuninitargbad(const Token *ftok, int argnr) const const Library::AllocFunc* Library::alloc(const Token *tok) const { const std::string funcname = getFunctionName(tok); - return isNotLibraryFunction(tok) && functions.find(funcname) != functions.end() ? nullptr : getAllocDealloc(_alloc, funcname); + return isNotLibraryFunction(tok) && functions.find(funcname) != functions.end() ? nullptr : getAllocDealloc(mAlloc, funcname); } /** get deallocation info for function */ diff --git a/lib/library.h b/lib/library.h index 178aa997a..574fc4107 100644 --- a/lib/library.h +++ b/lib/library.h @@ -89,7 +89,7 @@ public: /** get allocation info for function by name (deprecated, use other alloc) */ const AllocFunc* alloc(const char name[]) const { - return getAllocDealloc(_alloc, name); + return getAllocDealloc(mAlloc, name); } /** get deallocation info for function by name (deprecated, use other alloc) */ @@ -99,7 +99,7 @@ public: /** get allocation id for function by name (deprecated, use other alloc) */ int allocId(const char name[]) const { - const AllocFunc* af = getAllocDealloc(_alloc, name); + const AllocFunc* af = getAllocDealloc(mAlloc, name); return af ? af->groupId : 0; } @@ -111,8 +111,8 @@ public: /** set allocation id for function */ void setalloc(const std::string &functionname, int id, int arg) { - _alloc[functionname].groupId = id; - _alloc[functionname].arg = arg; + mAlloc[functionname].groupId = id; + mAlloc[functionname].arg = arg; } void setdealloc(const std::string &functionname, int id, int arg) { @@ -496,7 +496,7 @@ private: }; int allocid; std::set mFiles; - std::map _alloc; // allocation functions + std::map mAlloc; // allocation functions std::map _dealloc; // deallocation functions std::map _noreturn; // is function noreturn? std::map _returnValue;