mirror/Vulkan-Hpp
1
0
Fork 0
mirror of https://github.com/KhronosGroup/Vulkan-Hpp.git synced 2024-10-14 16:32:17 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Rename variables named 'requires' which is a keyword in c++20 (#336)

Browse Source
This commit is contained in:
nyronium 2019-06-11 10:12:37 +02:00 committed by Andreas Süßenbach
parent 50e0a941e9
commit 96299b3a1f
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
VulkanHppGenerator.cpp
View File

@ -1053,25 +1053,25 @@ void VulkanHppGenerator::readBitmask(tinyxml2::XMLElement const* element, std::m
std::string name = children[1]->GetText(); std::string name = children[1]->GetText();
std::string requires; std::string requirement;
auto requiresIt = attributes.find("requires"); auto requiresIt = attributes.find("requires");
if (requiresIt != attributes.end()) if (requiresIt != attributes.end())
{ {
requires = requiresIt->second; requirement = requiresIt->second;
} }
else else
{ {
// Generate FlagBits name and add it to the list of enums and vulkan types // Generate FlagBits name and add it to the list of enums and vulkan types
requires = name; requirement = name;
size_t pos = requires.rfind("Flags"); size_t pos = requirement.rfind("Flags");
assert(pos != std::string::npos); assert(pos != std::string::npos);
requires.replace(pos, 5, "FlagBits"); requirement.replace(pos, 5, "FlagBits");
assert(m_bitmaskBits.find(requires) == m_bitmaskBits.end()); assert(m_bitmaskBits.find(requirement) == m_bitmaskBits.end());
m_bitmaskBits.insert(std::make_pair(requires, EnumData())); m_bitmaskBits.insert(std::make_pair(requirement, EnumData()));
} }
m_bitmasks.insert(std::make_pair(name, BitmaskData(requires))); m_bitmasks.insert(std::make_pair(name, BitmaskData(requirement)));
} }
} }
@ -1539,7 +1539,7 @@ void VulkanHppGenerator::readExtensionRequireType(tinyxml2::XMLElement const* el
{ {
assert(bmit->second.platform.empty()); assert(bmit->second.platform.empty());
bmit->second.platform = platform; bmit->second.platform = platform;
assert(m_bitmaskBits.find(bmit->second.requires) != m_bitmaskBits.end()); assert(m_bitmaskBits.find(bmit->second.requirement) != m_bitmaskBits.end());
} }
else else
{ {
@ -2222,7 +2222,7 @@ void VulkanHppGenerator::writeBitmasks(std::ostream & os) const
{ {
for (auto const& bitmask : m_bitmasks) for (auto const& bitmask : m_bitmasks)
{ {
auto bitmaskBits = m_bitmaskBits.find(bitmask.second.requires); auto bitmaskBits = m_bitmaskBits.find(bitmask.second.requirement);
assert(bitmaskBits != m_bitmaskBits.end()); assert(bitmaskBits != m_bitmaskBits.end());
os << std::endl; os << std::endl;
@ -3107,7 +3107,7 @@ void VulkanHppGenerator::writeFunctionHeaderArgumentEnhancedSimple(std::ostream
{ {
// get the enum corresponding to this flag, to check if it's empty // get the enum corresponding to this flag, to check if it's empty
std::string strippedBitmaskName = stripPrefix(bitmasksIt->first, "Vk"); std::string strippedBitmaskName = stripPrefix(bitmasksIt->first, "Vk");
std::map<std::string, EnumData>::const_iterator enumIt = m_bitmaskBits.find(bitmasksIt->second.requires); std::map<std::string, EnumData>::const_iterator enumIt = m_bitmaskBits.find(bitmasksIt->second.requirement);
assert(enumIt != m_bitmaskBits.end()); assert(enumIt != m_bitmaskBits.end());
if (enumIt->second.values.empty()) if (enumIt->second.values.empty())
{ {
@ -3270,7 +3270,7 @@ bool VulkanHppGenerator::writeFunctionHeaderArgumentStandard(std::ostream & os,
{ {
// get the enum corresponding to this flag, to check if it's empty // get the enum corresponding to this flag, to check if it's empty
std::string strippedBitmaskName = stripPrefix(bitmasksIt->first, "Vk"); std::string strippedBitmaskName = stripPrefix(bitmasksIt->first, "Vk");
std::map<std::string, EnumData>::const_iterator enumIt = m_bitmaskBits.find(bitmasksIt->second.requires); std::map<std::string, EnumData>::const_iterator enumIt = m_bitmaskBits.find(bitmasksIt->second.requirement);
assert(enumIt != m_bitmaskBits.end()); assert(enumIt != m_bitmaskBits.end());
if (enumIt->second.values.empty()) if (enumIt->second.values.empty())
{ {

4
VulkanHppGenerator.hpp
View File

@ -55,10 +55,10 @@ class VulkanHppGenerator
struct BitmaskData struct BitmaskData
{ {
BitmaskData(std::string const& r) BitmaskData(std::string const& r)
: requires(r) : requirement(r)
{} {}
std::string requires; // original vulkan name: VK*FlagBits std::string requirement; // original vulkan name: VK*FlagBits
std::string platform; std::string platform;
std::string alias; // original vulkan name std::string alias; // original vulkan name
}; };