walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Rename private member _platform_types

This commit is contained in:
Daniel Marjamäki 2018-06-17 16:58:28 +02:00
parent 074177fc6e
commit 610b26bfbc
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/library.cpp
View File

@ -507,7 +507,7 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
return Error(DUPLICATE_PLATFORM_TYPE, type_name); return Error(DUPLICATE_PLATFORM_TYPE, type_name);
return Error(PLATFORM_TYPE_REDEFINED, type_name); return Error(PLATFORM_TYPE_REDEFINED, type_name);
} }
mPlatforms[*it]._platform_types[type_name] = type; mPlatforms[*it].mPlatformTypes[type_name] = type;
} }
} }
} }

6
lib/library.h
View File

@ -411,10 +411,10 @@ public:
struct Platform { struct Platform {
const PlatformType *platform_type(const std::string &name) const { const PlatformType *platform_type(const std::string &name) const {
const std::map<std::string, struct PlatformType>::const_iterator it = _platform_types.find(name); const std::map<std::string, struct PlatformType>::const_iterator it = mPlatformTypes.find(name);
return (it != _platform_types.end()) ? &(it->second) : nullptr; return (it != mPlatformTypes.end()) ? &(it->second) : nullptr;
} }
std::map<std::string, PlatformType> _platform_types; std::map<std::string, PlatformType> mPlatformTypes;
}; };
const PlatformType *platform_type(const std::string &name, const std::string & platform) const { const PlatformType *platform_type(const std::string &name, const std::string & platform) const {

2
test/testsymboldatabase.cpp
View File

@ -5789,7 +5789,7 @@ private:
settingsUnix32.platformType = Settings::Unix32; settingsUnix32.platformType = Settings::Unix32;
Library::PlatformType s32; Library::PlatformType s32;
s32.mType = "int"; s32.mType = "int";
settingsUnix32.library.mPlatforms[settingsUnix32.platformString()]._platform_types["s32"] = s32; settingsUnix32.library.mPlatforms[settingsUnix32.platformString()].mPlatformTypes["s32"] = s32;
ValueType vt; ValueType vt;
ASSERT_EQUALS(true, vt.fromLibraryType("s32", &settingsUnix32)); ASSERT_EQUALS(true, vt.fromLibraryType("s32", &settingsUnix32));
ASSERT_EQUALS(ValueType::Type::INT, vt.type); ASSERT_EQUALS(ValueType::Type::INT, vt.type);