Add missing "std::" to nullptr_t. (#83)

Fixes issue #81.
This commit is contained in:
Andreas Süßenbach 2017-02-16 16:20:25 +01:00 committed by Markus Tavenrath
parent 413dfd8f12
commit 8e3dd21d42
2 changed files with 69 additions and 67 deletions

View File

@ -3400,7 +3400,7 @@ void writeTypeHandle(std::ofstream & ofs, VkData const& vkData, DependencyData c
<< " : m_" << memberName << "(VK_NULL_HANDLE)" << std::endl << " : m_" << memberName << "(VK_NULL_HANDLE)" << std::endl
<< " {}" << std::endl << " {}" << std::endl
<< std::endl << std::endl
<< " " << dependencyData.name << "( nullptr_t )" << std::endl << " " << dependencyData.name << "( std::nullptr_t )" << std::endl
<< " : m_" << memberName << "(VK_NULL_HANDLE)" << std::endl << " : m_" << memberName << "(VK_NULL_HANDLE)" << std::endl
<< " {}" << std::endl << " {}" << std::endl
<< std::endl << std::endl
@ -3418,8 +3418,8 @@ void writeTypeHandle(std::ofstream & ofs, VkData const& vkData, DependencyData c
<< " }" << std::endl << " }" << std::endl
<< "#endif\n" << "#endif\n"
<< std::endl << std::endl
// assignment from nullptr_t // assignment from std::nullptr_t
<< " " << dependencyData.name << "& operator=( nullptr_t )" << std::endl << " " << dependencyData.name << "& operator=( std::nullptr_t )" << std::endl
<< " {" << std::endl << " {" << std::endl
<< " m_" << memberName << " = VK_NULL_HANDLE;" << std::endl << " m_" << memberName << " = VK_NULL_HANDLE;" << std::endl
<< " return *this;" << std::endl << " return *this;" << std::endl
@ -3854,6 +3854,7 @@ int main( int argc, char **argv )
<< "#include <algorithm>" << std::endl << "#include <algorithm>" << std::endl
<< "#include <array>" << std::endl << "#include <array>" << std::endl
<< "#include <cassert>" << std::endl << "#include <cassert>" << std::endl
<< "#include <cstddef>" << std::endl
<< "#include <cstdint>" << std::endl << "#include <cstdint>" << std::endl
<< "#include <cstring>" << std::endl << "#include <cstring>" << std::endl
<< "#include <initializer_list>" << std::endl << "#include <initializer_list>" << std::endl

View File

@ -28,6 +28,7 @@
#include <algorithm> #include <algorithm>
#include <array> #include <array>
#include <cassert> #include <cassert>
#include <cstddef>
#include <cstdint> #include <cstdint>
#include <cstring> #include <cstring>
#include <initializer_list> #include <initializer_list>
@ -1097,7 +1098,7 @@ namespace vk
: m_deviceMemory(VK_NULL_HANDLE) : m_deviceMemory(VK_NULL_HANDLE)
{} {}
DeviceMemory( nullptr_t ) DeviceMemory( std::nullptr_t )
: m_deviceMemory(VK_NULL_HANDLE) : m_deviceMemory(VK_NULL_HANDLE)
{} {}
@ -1113,7 +1114,7 @@ namespace vk
} }
#endif #endif
DeviceMemory& operator=( nullptr_t ) DeviceMemory& operator=( std::nullptr_t )
{ {
m_deviceMemory = VK_NULL_HANDLE; m_deviceMemory = VK_NULL_HANDLE;
return *this; return *this;
@ -1161,7 +1162,7 @@ namespace vk
: m_commandPool(VK_NULL_HANDLE) : m_commandPool(VK_NULL_HANDLE)
{} {}
CommandPool( nullptr_t ) CommandPool( std::nullptr_t )
: m_commandPool(VK_NULL_HANDLE) : m_commandPool(VK_NULL_HANDLE)
{} {}
@ -1177,7 +1178,7 @@ namespace vk
} }
#endif #endif
CommandPool& operator=( nullptr_t ) CommandPool& operator=( std::nullptr_t )
{ {
m_commandPool = VK_NULL_HANDLE; m_commandPool = VK_NULL_HANDLE;
return *this; return *this;
@ -1225,7 +1226,7 @@ namespace vk
: m_buffer(VK_NULL_HANDLE) : m_buffer(VK_NULL_HANDLE)
{} {}
Buffer( nullptr_t ) Buffer( std::nullptr_t )
: m_buffer(VK_NULL_HANDLE) : m_buffer(VK_NULL_HANDLE)
{} {}
@ -1241,7 +1242,7 @@ namespace vk
} }
#endif #endif
Buffer& operator=( nullptr_t ) Buffer& operator=( std::nullptr_t )
{ {
m_buffer = VK_NULL_HANDLE; m_buffer = VK_NULL_HANDLE;
return *this; return *this;
@ -1289,7 +1290,7 @@ namespace vk
: m_bufferView(VK_NULL_HANDLE) : m_bufferView(VK_NULL_HANDLE)
{} {}
BufferView( nullptr_t ) BufferView( std::nullptr_t )
: m_bufferView(VK_NULL_HANDLE) : m_bufferView(VK_NULL_HANDLE)
{} {}
@ -1305,7 +1306,7 @@ namespace vk
} }
#endif #endif
BufferView& operator=( nullptr_t ) BufferView& operator=( std::nullptr_t )
{ {
m_bufferView = VK_NULL_HANDLE; m_bufferView = VK_NULL_HANDLE;
return *this; return *this;
@ -1353,7 +1354,7 @@ namespace vk
: m_image(VK_NULL_HANDLE) : m_image(VK_NULL_HANDLE)
{} {}
Image( nullptr_t ) Image( std::nullptr_t )
: m_image(VK_NULL_HANDLE) : m_image(VK_NULL_HANDLE)
{} {}
@ -1369,7 +1370,7 @@ namespace vk
} }
#endif #endif
Image& operator=( nullptr_t ) Image& operator=( std::nullptr_t )
{ {
m_image = VK_NULL_HANDLE; m_image = VK_NULL_HANDLE;
return *this; return *this;
@ -1417,7 +1418,7 @@ namespace vk
: m_imageView(VK_NULL_HANDLE) : m_imageView(VK_NULL_HANDLE)
{} {}
ImageView( nullptr_t ) ImageView( std::nullptr_t )
: m_imageView(VK_NULL_HANDLE) : m_imageView(VK_NULL_HANDLE)
{} {}
@ -1433,7 +1434,7 @@ namespace vk
} }
#endif #endif
ImageView& operator=( nullptr_t ) ImageView& operator=( std::nullptr_t )
{ {
m_imageView = VK_NULL_HANDLE; m_imageView = VK_NULL_HANDLE;
return *this; return *this;
@ -1481,7 +1482,7 @@ namespace vk
: m_shaderModule(VK_NULL_HANDLE) : m_shaderModule(VK_NULL_HANDLE)
{} {}
ShaderModule( nullptr_t ) ShaderModule( std::nullptr_t )
: m_shaderModule(VK_NULL_HANDLE) : m_shaderModule(VK_NULL_HANDLE)
{} {}
@ -1497,7 +1498,7 @@ namespace vk
} }
#endif #endif
ShaderModule& operator=( nullptr_t ) ShaderModule& operator=( std::nullptr_t )
{ {
m_shaderModule = VK_NULL_HANDLE; m_shaderModule = VK_NULL_HANDLE;
return *this; return *this;
@ -1545,7 +1546,7 @@ namespace vk
: m_pipeline(VK_NULL_HANDLE) : m_pipeline(VK_NULL_HANDLE)
{} {}
Pipeline( nullptr_t ) Pipeline( std::nullptr_t )
: m_pipeline(VK_NULL_HANDLE) : m_pipeline(VK_NULL_HANDLE)
{} {}
@ -1561,7 +1562,7 @@ namespace vk
} }
#endif #endif
Pipeline& operator=( nullptr_t ) Pipeline& operator=( std::nullptr_t )
{ {
m_pipeline = VK_NULL_HANDLE; m_pipeline = VK_NULL_HANDLE;
return *this; return *this;
@ -1609,7 +1610,7 @@ namespace vk
: m_pipelineLayout(VK_NULL_HANDLE) : m_pipelineLayout(VK_NULL_HANDLE)
{} {}
PipelineLayout( nullptr_t ) PipelineLayout( std::nullptr_t )
: m_pipelineLayout(VK_NULL_HANDLE) : m_pipelineLayout(VK_NULL_HANDLE)
{} {}
@ -1625,7 +1626,7 @@ namespace vk
} }
#endif #endif
PipelineLayout& operator=( nullptr_t ) PipelineLayout& operator=( std::nullptr_t )
{ {
m_pipelineLayout = VK_NULL_HANDLE; m_pipelineLayout = VK_NULL_HANDLE;
return *this; return *this;
@ -1673,7 +1674,7 @@ namespace vk
: m_sampler(VK_NULL_HANDLE) : m_sampler(VK_NULL_HANDLE)
{} {}
Sampler( nullptr_t ) Sampler( std::nullptr_t )
: m_sampler(VK_NULL_HANDLE) : m_sampler(VK_NULL_HANDLE)
{} {}
@ -1689,7 +1690,7 @@ namespace vk
} }
#endif #endif
Sampler& operator=( nullptr_t ) Sampler& operator=( std::nullptr_t )
{ {
m_sampler = VK_NULL_HANDLE; m_sampler = VK_NULL_HANDLE;
return *this; return *this;
@ -1737,7 +1738,7 @@ namespace vk
: m_descriptorSet(VK_NULL_HANDLE) : m_descriptorSet(VK_NULL_HANDLE)
{} {}
DescriptorSet( nullptr_t ) DescriptorSet( std::nullptr_t )
: m_descriptorSet(VK_NULL_HANDLE) : m_descriptorSet(VK_NULL_HANDLE)
{} {}
@ -1753,7 +1754,7 @@ namespace vk
} }
#endif #endif
DescriptorSet& operator=( nullptr_t ) DescriptorSet& operator=( std::nullptr_t )
{ {
m_descriptorSet = VK_NULL_HANDLE; m_descriptorSet = VK_NULL_HANDLE;
return *this; return *this;
@ -1801,7 +1802,7 @@ namespace vk
: m_descriptorSetLayout(VK_NULL_HANDLE) : m_descriptorSetLayout(VK_NULL_HANDLE)
{} {}
DescriptorSetLayout( nullptr_t ) DescriptorSetLayout( std::nullptr_t )
: m_descriptorSetLayout(VK_NULL_HANDLE) : m_descriptorSetLayout(VK_NULL_HANDLE)
{} {}
@ -1817,7 +1818,7 @@ namespace vk
} }
#endif #endif
DescriptorSetLayout& operator=( nullptr_t ) DescriptorSetLayout& operator=( std::nullptr_t )
{ {
m_descriptorSetLayout = VK_NULL_HANDLE; m_descriptorSetLayout = VK_NULL_HANDLE;
return *this; return *this;
@ -1865,7 +1866,7 @@ namespace vk
: m_descriptorPool(VK_NULL_HANDLE) : m_descriptorPool(VK_NULL_HANDLE)
{} {}
DescriptorPool( nullptr_t ) DescriptorPool( std::nullptr_t )
: m_descriptorPool(VK_NULL_HANDLE) : m_descriptorPool(VK_NULL_HANDLE)
{} {}
@ -1881,7 +1882,7 @@ namespace vk
} }
#endif #endif
DescriptorPool& operator=( nullptr_t ) DescriptorPool& operator=( std::nullptr_t )
{ {
m_descriptorPool = VK_NULL_HANDLE; m_descriptorPool = VK_NULL_HANDLE;
return *this; return *this;
@ -1929,7 +1930,7 @@ namespace vk
: m_fence(VK_NULL_HANDLE) : m_fence(VK_NULL_HANDLE)
{} {}
Fence( nullptr_t ) Fence( std::nullptr_t )
: m_fence(VK_NULL_HANDLE) : m_fence(VK_NULL_HANDLE)
{} {}
@ -1945,7 +1946,7 @@ namespace vk
} }
#endif #endif
Fence& operator=( nullptr_t ) Fence& operator=( std::nullptr_t )
{ {
m_fence = VK_NULL_HANDLE; m_fence = VK_NULL_HANDLE;
return *this; return *this;
@ -1993,7 +1994,7 @@ namespace vk
: m_semaphore(VK_NULL_HANDLE) : m_semaphore(VK_NULL_HANDLE)
{} {}
Semaphore( nullptr_t ) Semaphore( std::nullptr_t )
: m_semaphore(VK_NULL_HANDLE) : m_semaphore(VK_NULL_HANDLE)
{} {}
@ -2009,7 +2010,7 @@ namespace vk
} }
#endif #endif
Semaphore& operator=( nullptr_t ) Semaphore& operator=( std::nullptr_t )
{ {
m_semaphore = VK_NULL_HANDLE; m_semaphore = VK_NULL_HANDLE;
return *this; return *this;
@ -2057,7 +2058,7 @@ namespace vk
: m_event(VK_NULL_HANDLE) : m_event(VK_NULL_HANDLE)
{} {}
Event( nullptr_t ) Event( std::nullptr_t )
: m_event(VK_NULL_HANDLE) : m_event(VK_NULL_HANDLE)
{} {}
@ -2073,7 +2074,7 @@ namespace vk
} }
#endif #endif
Event& operator=( nullptr_t ) Event& operator=( std::nullptr_t )
{ {
m_event = VK_NULL_HANDLE; m_event = VK_NULL_HANDLE;
return *this; return *this;
@ -2121,7 +2122,7 @@ namespace vk
: m_queryPool(VK_NULL_HANDLE) : m_queryPool(VK_NULL_HANDLE)
{} {}
QueryPool( nullptr_t ) QueryPool( std::nullptr_t )
: m_queryPool(VK_NULL_HANDLE) : m_queryPool(VK_NULL_HANDLE)
{} {}
@ -2137,7 +2138,7 @@ namespace vk
} }
#endif #endif
QueryPool& operator=( nullptr_t ) QueryPool& operator=( std::nullptr_t )
{ {
m_queryPool = VK_NULL_HANDLE; m_queryPool = VK_NULL_HANDLE;
return *this; return *this;
@ -2185,7 +2186,7 @@ namespace vk
: m_framebuffer(VK_NULL_HANDLE) : m_framebuffer(VK_NULL_HANDLE)
{} {}
Framebuffer( nullptr_t ) Framebuffer( std::nullptr_t )
: m_framebuffer(VK_NULL_HANDLE) : m_framebuffer(VK_NULL_HANDLE)
{} {}
@ -2201,7 +2202,7 @@ namespace vk
} }
#endif #endif
Framebuffer& operator=( nullptr_t ) Framebuffer& operator=( std::nullptr_t )
{ {
m_framebuffer = VK_NULL_HANDLE; m_framebuffer = VK_NULL_HANDLE;
return *this; return *this;
@ -2249,7 +2250,7 @@ namespace vk
: m_renderPass(VK_NULL_HANDLE) : m_renderPass(VK_NULL_HANDLE)
{} {}
RenderPass( nullptr_t ) RenderPass( std::nullptr_t )
: m_renderPass(VK_NULL_HANDLE) : m_renderPass(VK_NULL_HANDLE)
{} {}
@ -2265,7 +2266,7 @@ namespace vk
} }
#endif #endif
RenderPass& operator=( nullptr_t ) RenderPass& operator=( std::nullptr_t )
{ {
m_renderPass = VK_NULL_HANDLE; m_renderPass = VK_NULL_HANDLE;
return *this; return *this;
@ -2313,7 +2314,7 @@ namespace vk
: m_pipelineCache(VK_NULL_HANDLE) : m_pipelineCache(VK_NULL_HANDLE)
{} {}
PipelineCache( nullptr_t ) PipelineCache( std::nullptr_t )
: m_pipelineCache(VK_NULL_HANDLE) : m_pipelineCache(VK_NULL_HANDLE)
{} {}
@ -2329,7 +2330,7 @@ namespace vk
} }
#endif #endif
PipelineCache& operator=( nullptr_t ) PipelineCache& operator=( std::nullptr_t )
{ {
m_pipelineCache = VK_NULL_HANDLE; m_pipelineCache = VK_NULL_HANDLE;
return *this; return *this;
@ -2377,7 +2378,7 @@ namespace vk
: m_objectTableNVX(VK_NULL_HANDLE) : m_objectTableNVX(VK_NULL_HANDLE)
{} {}
ObjectTableNVX( nullptr_t ) ObjectTableNVX( std::nullptr_t )
: m_objectTableNVX(VK_NULL_HANDLE) : m_objectTableNVX(VK_NULL_HANDLE)
{} {}
@ -2393,7 +2394,7 @@ namespace vk
} }
#endif #endif
ObjectTableNVX& operator=( nullptr_t ) ObjectTableNVX& operator=( std::nullptr_t )
{ {
m_objectTableNVX = VK_NULL_HANDLE; m_objectTableNVX = VK_NULL_HANDLE;
return *this; return *this;
@ -2441,7 +2442,7 @@ namespace vk
: m_indirectCommandsLayoutNVX(VK_NULL_HANDLE) : m_indirectCommandsLayoutNVX(VK_NULL_HANDLE)
{} {}
IndirectCommandsLayoutNVX( nullptr_t ) IndirectCommandsLayoutNVX( std::nullptr_t )
: m_indirectCommandsLayoutNVX(VK_NULL_HANDLE) : m_indirectCommandsLayoutNVX(VK_NULL_HANDLE)
{} {}
@ -2457,7 +2458,7 @@ namespace vk
} }
#endif #endif
IndirectCommandsLayoutNVX& operator=( nullptr_t ) IndirectCommandsLayoutNVX& operator=( std::nullptr_t )
{ {
m_indirectCommandsLayoutNVX = VK_NULL_HANDLE; m_indirectCommandsLayoutNVX = VK_NULL_HANDLE;
return *this; return *this;
@ -2505,7 +2506,7 @@ namespace vk
: m_displayKHR(VK_NULL_HANDLE) : m_displayKHR(VK_NULL_HANDLE)
{} {}
DisplayKHR( nullptr_t ) DisplayKHR( std::nullptr_t )
: m_displayKHR(VK_NULL_HANDLE) : m_displayKHR(VK_NULL_HANDLE)
{} {}
@ -2521,7 +2522,7 @@ namespace vk
} }
#endif #endif
DisplayKHR& operator=( nullptr_t ) DisplayKHR& operator=( std::nullptr_t )
{ {
m_displayKHR = VK_NULL_HANDLE; m_displayKHR = VK_NULL_HANDLE;
return *this; return *this;
@ -2569,7 +2570,7 @@ namespace vk
: m_displayModeKHR(VK_NULL_HANDLE) : m_displayModeKHR(VK_NULL_HANDLE)
{} {}
DisplayModeKHR( nullptr_t ) DisplayModeKHR( std::nullptr_t )
: m_displayModeKHR(VK_NULL_HANDLE) : m_displayModeKHR(VK_NULL_HANDLE)
{} {}
@ -2585,7 +2586,7 @@ namespace vk
} }
#endif #endif
DisplayModeKHR& operator=( nullptr_t ) DisplayModeKHR& operator=( std::nullptr_t )
{ {
m_displayModeKHR = VK_NULL_HANDLE; m_displayModeKHR = VK_NULL_HANDLE;
return *this; return *this;
@ -2633,7 +2634,7 @@ namespace vk
: m_surfaceKHR(VK_NULL_HANDLE) : m_surfaceKHR(VK_NULL_HANDLE)
{} {}
SurfaceKHR( nullptr_t ) SurfaceKHR( std::nullptr_t )
: m_surfaceKHR(VK_NULL_HANDLE) : m_surfaceKHR(VK_NULL_HANDLE)
{} {}
@ -2649,7 +2650,7 @@ namespace vk
} }
#endif #endif
SurfaceKHR& operator=( nullptr_t ) SurfaceKHR& operator=( std::nullptr_t )
{ {
m_surfaceKHR = VK_NULL_HANDLE; m_surfaceKHR = VK_NULL_HANDLE;
return *this; return *this;
@ -2697,7 +2698,7 @@ namespace vk
: m_swapchainKHR(VK_NULL_HANDLE) : m_swapchainKHR(VK_NULL_HANDLE)
{} {}
SwapchainKHR( nullptr_t ) SwapchainKHR( std::nullptr_t )
: m_swapchainKHR(VK_NULL_HANDLE) : m_swapchainKHR(VK_NULL_HANDLE)
{} {}
@ -2713,7 +2714,7 @@ namespace vk
} }
#endif #endif
SwapchainKHR& operator=( nullptr_t ) SwapchainKHR& operator=( std::nullptr_t )
{ {
m_swapchainKHR = VK_NULL_HANDLE; m_swapchainKHR = VK_NULL_HANDLE;
return *this; return *this;
@ -2761,7 +2762,7 @@ namespace vk
: m_debugReportCallbackEXT(VK_NULL_HANDLE) : m_debugReportCallbackEXT(VK_NULL_HANDLE)
{} {}
DebugReportCallbackEXT( nullptr_t ) DebugReportCallbackEXT( std::nullptr_t )
: m_debugReportCallbackEXT(VK_NULL_HANDLE) : m_debugReportCallbackEXT(VK_NULL_HANDLE)
{} {}
@ -2777,7 +2778,7 @@ namespace vk
} }
#endif #endif
DebugReportCallbackEXT& operator=( nullptr_t ) DebugReportCallbackEXT& operator=( std::nullptr_t )
{ {
m_debugReportCallbackEXT = VK_NULL_HANDLE; m_debugReportCallbackEXT = VK_NULL_HANDLE;
return *this; return *this;
@ -17483,7 +17484,7 @@ namespace vk
: m_commandBuffer(VK_NULL_HANDLE) : m_commandBuffer(VK_NULL_HANDLE)
{} {}
CommandBuffer( nullptr_t ) CommandBuffer( std::nullptr_t )
: m_commandBuffer(VK_NULL_HANDLE) : m_commandBuffer(VK_NULL_HANDLE)
{} {}
@ -17499,7 +17500,7 @@ namespace vk
} }
#endif #endif
CommandBuffer& operator=( nullptr_t ) CommandBuffer& operator=( std::nullptr_t )
{ {
m_commandBuffer = VK_NULL_HANDLE; m_commandBuffer = VK_NULL_HANDLE;
return *this; return *this;
@ -18293,7 +18294,7 @@ namespace vk
: m_queue(VK_NULL_HANDLE) : m_queue(VK_NULL_HANDLE)
{} {}
Queue( nullptr_t ) Queue( std::nullptr_t )
: m_queue(VK_NULL_HANDLE) : m_queue(VK_NULL_HANDLE)
{} {}
@ -18309,7 +18310,7 @@ namespace vk
} }
#endif #endif
Queue& operator=( nullptr_t ) Queue& operator=( std::nullptr_t )
{ {
m_queue = VK_NULL_HANDLE; m_queue = VK_NULL_HANDLE;
return *this; return *this;
@ -18477,7 +18478,7 @@ namespace vk
: m_device(VK_NULL_HANDLE) : m_device(VK_NULL_HANDLE)
{} {}
Device( nullptr_t ) Device( std::nullptr_t )
: m_device(VK_NULL_HANDLE) : m_device(VK_NULL_HANDLE)
{} {}
@ -18493,7 +18494,7 @@ namespace vk
} }
#endif #endif
Device& operator=( nullptr_t ) Device& operator=( std::nullptr_t )
{ {
m_device = VK_NULL_HANDLE; m_device = VK_NULL_HANDLE;
return *this; return *this;
@ -20933,7 +20934,7 @@ namespace vk
: m_physicalDevice(VK_NULL_HANDLE) : m_physicalDevice(VK_NULL_HANDLE)
{} {}
PhysicalDevice( nullptr_t ) PhysicalDevice( std::nullptr_t )
: m_physicalDevice(VK_NULL_HANDLE) : m_physicalDevice(VK_NULL_HANDLE)
{} {}
@ -20949,7 +20950,7 @@ namespace vk
} }
#endif #endif
PhysicalDevice& operator=( nullptr_t ) PhysicalDevice& operator=( std::nullptr_t )
{ {
m_physicalDevice = VK_NULL_HANDLE; m_physicalDevice = VK_NULL_HANDLE;
return *this; return *this;
@ -21857,7 +21858,7 @@ namespace vk
: m_instance(VK_NULL_HANDLE) : m_instance(VK_NULL_HANDLE)
{} {}
Instance( nullptr_t ) Instance( std::nullptr_t )
: m_instance(VK_NULL_HANDLE) : m_instance(VK_NULL_HANDLE)
{} {}
@ -21873,7 +21874,7 @@ namespace vk
} }
#endif #endif
Instance& operator=( nullptr_t ) Instance& operator=( std::nullptr_t )
{ {
m_instance = VK_NULL_HANDLE; m_instance = VK_NULL_HANDLE;
return *this; return *this;