TheCloud/Vulkan-Hpp
1
0
Fork 0
mirror of https://github.com/KhronosGroup/Vulkan-Hpp.git synced 2025-09-12 21:38:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

bracket the exception definitions by "#ifndef VULKAN_HPP_NO_EXCEPTIONS" (#114)

Browse Source
This commit is contained in:
Andreas Süßenbach 2017-06-26 15:25:53 +02:00 committed by Markus Tavenrath
parent c71fcac937
commit 195479de01
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
VulkanHppGenerator.cpp
View File

@ -3392,7 +3392,6 @@ R"( default: throw SystemError( make_error_code( result ) );
} }
)"; )";
leaveProtect(os, enumData.protect); leaveProtect(os, enumData.protect);
os << std::endl;
} }
void writeDeleterClasses(std::ostream & os, std::pair<std::string, std::set<std::string>> const& deleterTypes, std::map<std::string, DeleterData> const& deleterData) void writeDeleterClasses(std::ostream & os, std::pair<std::string, std::set<std::string>> const& deleterTypes, std::map<std::string, DeleterData> const& deleterData)
@ -4166,10 +4165,12 @@ int main( int argc, char **argv )
assert(it != vkData.dependencies.end()); assert(it != vkData.dependencies.end());
writeTypeEnum(ofs, vkData.enums.find(it->name)->second); writeTypeEnum(ofs, vkData.enums.find(it->name)->second);
writeEnumsToString(ofs, vkData.enums.find(it->name)->second); writeEnumsToString(ofs, vkData.enums.find(it->name)->second);
ofs << "#ifndef VULKAN_HPP_NO_EXCEPTIONS";
ofs << exceptionHeader; ofs << exceptionHeader;
ofs << exceptionClassesHeader; ofs << exceptionClassesHeader;
writeExceptionsForEnum(ofs, vkData.enums.find(it->name)->second); writeExceptionsForEnum(ofs, vkData.enums.find(it->name)->second);
writeThrowExceptions(ofs, vkData.enums.find(it->name)->second); writeThrowExceptions(ofs, vkData.enums.find(it->name)->second);
ofs << "#endif" << std::endl;
vkData.dependencies.erase(it); vkData.dependencies.erase(it);
ofs << "} // namespace vk" << std::endl ofs << "} // namespace vk" << std::endl

4
vulkan/vulkan.hpp
View File

@ -498,7 +498,7 @@ namespace vk
} }
} }
#ifndef VULKAN_HPP_NO_EXCEPTIONS
#if defined(_MSC_VER) && (_MSC_VER == 1800) #if defined(_MSC_VER) && (_MSC_VER == 1800)
# define noexcept _NOEXCEPT # define noexcept _NOEXCEPT
#endif #endif
@ -767,7 +767,7 @@ namespace vk
default: throw SystemError( make_error_code( result ) ); default: throw SystemError( make_error_code( result ) );
} }
} }
#endif
} // namespace vk } // namespace vk
namespace std namespace std