diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp
index 83ff9b9..fb786a4 100644
--- a/VulkanHppGenerator.cpp
+++ b/VulkanHppGenerator.cpp
@@ -8089,7 +8089,7 @@ namespace std
   {
 #ifdef VULKAN_HPP_NO_EXCEPTIONS
     ignore(message);
-    VULKAN_HPP_ASSERT( result == Result::eSuccess );
+    VULKAN_HPP_ASSERT_ON_RESULT( result == Result::eSuccess );
     return result;
 #else
     if ( result != Result::eSuccess )
@@ -8104,7 +8104,7 @@ namespace std
   {
 #ifdef VULKAN_HPP_NO_EXCEPTIONS
     ignore(message);
-    VULKAN_HPP_ASSERT( result == Result::eSuccess );
+    VULKAN_HPP_ASSERT_ON_RESULT( result == Result::eSuccess );
     return ResultValue<T>( result, std::move( data ) );
 #else
     if ( result != Result::eSuccess )
@@ -8119,7 +8119,7 @@ namespace std
   {
 #ifdef VULKAN_HPP_NO_EXCEPTIONS
     ignore(message);
-    VULKAN_HPP_ASSERT( std::find( successCodes.begin(), successCodes.end(), result ) != successCodes.end() );
+    VULKAN_HPP_ASSERT_ON_RESULT( std::find( successCodes.begin(), successCodes.end(), result ) != successCodes.end() );
 #else
     if ( std::find( successCodes.begin(), successCodes.end(), result ) == successCodes.end() )
     {
@@ -8134,7 +8134,7 @@ namespace std
   {
 #ifdef VULKAN_HPP_NO_EXCEPTIONS
     ignore(message);
-    VULKAN_HPP_ASSERT( std::find( successCodes.begin(), successCodes.end(), result ) != successCodes.end() );
+    VULKAN_HPP_ASSERT_ON_RESULT( std::find( successCodes.begin(), successCodes.end(), result ) != successCodes.end() );
 #else
     if ( std::find( successCodes.begin(), successCodes.end(), result ) == successCodes.end() )
     {
@@ -8150,7 +8150,7 @@ namespace std
   {
 #ifdef VULKAN_HPP_NO_EXCEPTIONS
     ignore(message);
-    VULKAN_HPP_ASSERT( result == Result::eSuccess );
+    VULKAN_HPP_ASSERT_ON_RESULT( result == Result::eSuccess );
     return ResultValue<UniqueHandle<T,D>>( result, UniqueHandle<T,D>(data, deleter) );
 #else
     if ( result != Result::eSuccess )
@@ -8166,7 +8166,7 @@ namespace std
   {
 #ifdef VULKAN_HPP_NO_EXCEPTIONS
     ignore(message);
-    VULKAN_HPP_ASSERT( std::find( successCodes.begin(), successCodes.end(), result ) != successCodes.end() );
+    VULKAN_HPP_ASSERT_ON_RESULT( std::find( successCodes.begin(), successCodes.end(), result ) != successCodes.end() );
     return ResultValue<UniqueHandle<T,D>>( result, UniqueHandle<T,D>(data, deleter) );
 #else
     if ( std::find( successCodes.begin(), successCodes.end(), result ) == successCodes.end() )
diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp
index e90841d..dad9608 100644
--- a/vulkan/vulkan.hpp
+++ b/vulkan/vulkan.hpp
@@ -16128,7 +16128,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
 #ifdef VULKAN_HPP_NO_EXCEPTIONS
     ignore( message );
-    VULKAN_HPP_ASSERT( result == Result::eSuccess );
+    VULKAN_HPP_ASSERT_ON_RESULT( result == Result::eSuccess );
     return result;
 #else
     if ( result != Result::eSuccess )
@@ -16143,7 +16143,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
 #ifdef VULKAN_HPP_NO_EXCEPTIONS
     ignore( message );
-    VULKAN_HPP_ASSERT( result == Result::eSuccess );
+    VULKAN_HPP_ASSERT_ON_RESULT( result == Result::eSuccess );
     return ResultValue<T>( result, std::move( data ) );
 #else
     if ( result != Result::eSuccess )
@@ -16160,7 +16160,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
 #ifdef VULKAN_HPP_NO_EXCEPTIONS
     ignore( message );
-    VULKAN_HPP_ASSERT( std::find( successCodes.begin(), successCodes.end(), result ) != successCodes.end() );
+    VULKAN_HPP_ASSERT_ON_RESULT( std::find( successCodes.begin(), successCodes.end(), result ) != successCodes.end() );
 #else
     if ( std::find( successCodes.begin(), successCodes.end(), result ) == successCodes.end() )
     {
@@ -16176,7 +16176,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
 #ifdef VULKAN_HPP_NO_EXCEPTIONS
     ignore( message );
-    VULKAN_HPP_ASSERT( std::find( successCodes.begin(), successCodes.end(), result ) != successCodes.end() );
+    VULKAN_HPP_ASSERT_ON_RESULT( std::find( successCodes.begin(), successCodes.end(), result ) != successCodes.end() );
 #else
     if ( std::find( successCodes.begin(), successCodes.end(), result ) == successCodes.end() )
     {
@@ -16193,7 +16193,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
 #  ifdef VULKAN_HPP_NO_EXCEPTIONS
     ignore( message );
-    VULKAN_HPP_ASSERT( result == Result::eSuccess );
+    VULKAN_HPP_ASSERT_ON_RESULT( result == Result::eSuccess );
     return ResultValue<UniqueHandle<T, D>>( result, UniqueHandle<T, D>( data, deleter ) );
 #  else
     if ( result != Result::eSuccess )
@@ -16214,7 +16214,7 @@ namespace VULKAN_HPP_NAMESPACE
   {
 #  ifdef VULKAN_HPP_NO_EXCEPTIONS
     ignore( message );
-    VULKAN_HPP_ASSERT( std::find( successCodes.begin(), successCodes.end(), result ) != successCodes.end() );
+    VULKAN_HPP_ASSERT_ON_RESULT( std::find( successCodes.begin(), successCodes.end(), result ) != successCodes.end() );
     return ResultValue<UniqueHandle<T, D>>( result, UniqueHandle<T, D>( data, deleter ) );
 #  else
     if ( std::find( successCodes.begin(), successCodes.end(), result ) == successCodes.end() )