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

Merge pull request #1407 from asuessenbach/algorithm

Browse Source 
Unconditionally include <algorithm> in vulkan.hpp.
This commit is contained in:
Andreas Süßenbach 2022-09-13 08:29:20 +02:00 committed by GitHub
commit 984ab4e846
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
snippets/includes.hpp
View File

@ -19,6 +19,7 @@
# error "vulkan.hpp needs at least c++ standard version 11" # error "vulkan.hpp needs at least c++ standard version 11"
#endif #endif
#include <algorithm>
#include <array> // ArrayWrapperND #include <array> // ArrayWrapperND
#include <string> // std::string #include <string> // std::string
#include <vulkan/vulkan.h> #include <vulkan/vulkan.h>
@ -39,10 +40,6 @@
# include <system_error> // std::is_error_code_enum # include <system_error> // std::is_error_code_enum
#endif #endif
#if !defined( VULKAN_HPP_NO_SMART_HANDLE )
# include <algorithm> // std::transform
#endif
#if defined( VULKAN_HPP_NO_CONSTRUCTORS ) #if defined( VULKAN_HPP_NO_CONSTRUCTORS )
# if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS ) # if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
# define VULKAN_HPP_NO_STRUCT_CONSTRUCTORS # define VULKAN_HPP_NO_STRUCT_CONSTRUCTORS

5
vulkan/vulkan.hpp
View File

@ -26,6 +26,7 @@
# error "vulkan.hpp needs at least c++ standard version 11" # error "vulkan.hpp needs at least c++ standard version 11"
#endif #endif
#include <algorithm>
#include <array> // ArrayWrapperND #include <array> // ArrayWrapperND
#include <string> // std::string #include <string> // std::string
#include <vulkan/vulkan.h> #include <vulkan/vulkan.h>
@ -46,10 +47,6 @@
# include <system_error> // std::is_error_code_enum # include <system_error> // std::is_error_code_enum
#endif #endif
#if !defined( VULKAN_HPP_NO_SMART_HANDLE )
# include <algorithm> // std::transform
#endif
#if defined( VULKAN_HPP_NO_CONSTRUCTORS ) #if defined( VULKAN_HPP_NO_CONSTRUCTORS )
# if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS ) # if !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )
# define VULKAN_HPP_NO_STRUCT_CONSTRUCTORS # define VULKAN_HPP_NO_STRUCT_CONSTRUCTORS