mirror of
https://github.com/KhronosGroup/Vulkan-Hpp.git
synced 2024-10-14 16:32:17 +00:00
Switched from using "typedef" to using "using". (#1823)
This commit is contained in:
parent
2b35399a73
commit
80826e4001
@ -91,9 +91,9 @@
|
|||||||
struct ResultValueType
|
struct ResultValueType
|
||||||
{
|
{
|
||||||
#ifdef VULKAN_HPP_NO_EXCEPTIONS
|
#ifdef VULKAN_HPP_NO_EXCEPTIONS
|
||||||
typedef ResultValue<T> type;
|
using type = ResultValue<T>;
|
||||||
#else
|
#else
|
||||||
typedef T type;
|
using type = T;
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -101,9 +101,9 @@
|
|||||||
struct ResultValueType<void>
|
struct ResultValueType<void>
|
||||||
{
|
{
|
||||||
#ifdef VULKAN_HPP_NO_EXCEPTIONS
|
#ifdef VULKAN_HPP_NO_EXCEPTIONS
|
||||||
typedef Result type;
|
using type = Result;
|
||||||
#else
|
#else
|
||||||
typedef void type;
|
using type = void;
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -26,11 +26,11 @@
|
|||||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined( __Fuchsia__ )
|
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined( __Fuchsia__ )
|
||||||
# include <dlfcn.h>
|
# include <dlfcn.h>
|
||||||
# elif defined( _WIN32 ) && !defined( VULKAN_HPP_NO_WIN32_PROTOTYPES )
|
# elif defined( _WIN32 ) && !defined( VULKAN_HPP_NO_WIN32_PROTOTYPES )
|
||||||
typedef struct HINSTANCE__ * HINSTANCE;
|
using HINSTANCE = struct HINSTANCE__ *;
|
||||||
# if defined( _WIN64 )
|
# if defined( _WIN64 )
|
||||||
typedef int64_t( __stdcall * FARPROC )();
|
using FARPROC = int64_t(__stdcall *)();
|
||||||
# else
|
# else
|
||||||
typedef int( __stdcall * FARPROC )();
|
using FARPROC = int(__stdcall *)();
|
||||||
# endif
|
# endif
|
||||||
extern "C" __declspec( dllimport ) HINSTANCE __stdcall LoadLibraryA( char const * lpLibFileName );
|
extern "C" __declspec( dllimport ) HINSTANCE __stdcall LoadLibraryA( char const * lpLibFileName );
|
||||||
extern "C" __declspec( dllimport ) int __stdcall FreeLibrary( HINSTANCE hLibModule );
|
extern "C" __declspec( dllimport ) int __stdcall FreeLibrary( HINSTANCE hLibModule );
|
||||||
|
@ -36,11 +36,11 @@
|
|||||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined( __Fuchsia__ )
|
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined( __Fuchsia__ )
|
||||||
# include <dlfcn.h>
|
# include <dlfcn.h>
|
||||||
# elif defined( _WIN32 ) && !defined( VULKAN_HPP_NO_WIN32_PROTOTYPES )
|
# elif defined( _WIN32 ) && !defined( VULKAN_HPP_NO_WIN32_PROTOTYPES )
|
||||||
typedef struct HINSTANCE__ * HINSTANCE;
|
using HINSTANCE = struct HINSTANCE__ *;
|
||||||
# if defined( _WIN64 )
|
# if defined( _WIN64 )
|
||||||
typedef int64_t( __stdcall * FARPROC )();
|
using FARPROC = int64_t( __stdcall * )();
|
||||||
# else
|
# else
|
||||||
typedef int( __stdcall * FARPROC )();
|
using FARPROC = int( __stdcall * )();
|
||||||
# endif
|
# endif
|
||||||
extern "C" __declspec( dllimport ) HINSTANCE __stdcall LoadLibraryA( char const * lpLibFileName );
|
extern "C" __declspec( dllimport ) HINSTANCE __stdcall LoadLibraryA( char const * lpLibFileName );
|
||||||
extern "C" __declspec( dllimport ) int __stdcall FreeLibrary( HINSTANCE hLibModule );
|
extern "C" __declspec( dllimport ) int __stdcall FreeLibrary( HINSTANCE hLibModule );
|
||||||
@ -6698,9 +6698,9 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
struct ResultValueType
|
struct ResultValueType
|
||||||
{
|
{
|
||||||
#ifdef VULKAN_HPP_NO_EXCEPTIONS
|
#ifdef VULKAN_HPP_NO_EXCEPTIONS
|
||||||
typedef ResultValue<T> type;
|
using type = ResultValue<T>;
|
||||||
#else
|
#else
|
||||||
typedef T type;
|
using type = T;
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -6708,9 +6708,9 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
struct ResultValueType<void>
|
struct ResultValueType<void>
|
||||||
{
|
{
|
||||||
#ifdef VULKAN_HPP_NO_EXCEPTIONS
|
#ifdef VULKAN_HPP_NO_EXCEPTIONS
|
||||||
typedef Result type;
|
using type = Result;
|
||||||
#else
|
#else
|
||||||
typedef void type;
|
using type = void;
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -16676,7 +16676,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
m_library = dlopen( "libvulkan.1.dylib", RTLD_NOW | RTLD_LOCAL );
|
m_library = dlopen( "libvulkan.1.dylib", RTLD_NOW | RTLD_LOCAL );
|
||||||
}
|
}
|
||||||
# elif defined( _WIN32 )
|
# elif defined( _WIN32 )
|
||||||
m_library = ::LoadLibraryA( "vulkan-1.dll" );
|
m_library = ::LoadLibraryA( "vulkan-1.dll" );
|
||||||
# else
|
# else
|
||||||
# error unsupported platform
|
# error unsupported platform
|
||||||
# endif
|
# endif
|
||||||
|
@ -36,11 +36,11 @@
|
|||||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined( __Fuchsia__ )
|
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined( __Fuchsia__ )
|
||||||
# include <dlfcn.h>
|
# include <dlfcn.h>
|
||||||
# elif defined( _WIN32 ) && !defined( VULKAN_HPP_NO_WIN32_PROTOTYPES )
|
# elif defined( _WIN32 ) && !defined( VULKAN_HPP_NO_WIN32_PROTOTYPES )
|
||||||
typedef struct HINSTANCE__ * HINSTANCE;
|
using HINSTANCE = struct HINSTANCE__ *;
|
||||||
# if defined( _WIN64 )
|
# if defined( _WIN64 )
|
||||||
typedef int64_t( __stdcall * FARPROC )();
|
using FARPROC = int64_t( __stdcall * )();
|
||||||
# else
|
# else
|
||||||
typedef int( __stdcall * FARPROC )();
|
using FARPROC = int( __stdcall * )();
|
||||||
# endif
|
# endif
|
||||||
extern "C" __declspec( dllimport ) HINSTANCE __stdcall LoadLibraryA( char const * lpLibFileName );
|
extern "C" __declspec( dllimport ) HINSTANCE __stdcall LoadLibraryA( char const * lpLibFileName );
|
||||||
extern "C" __declspec( dllimport ) int __stdcall FreeLibrary( HINSTANCE hLibModule );
|
extern "C" __declspec( dllimport ) int __stdcall FreeLibrary( HINSTANCE hLibModule );
|
||||||
@ -3838,9 +3838,9 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
struct ResultValueType
|
struct ResultValueType
|
||||||
{
|
{
|
||||||
#ifdef VULKAN_HPP_NO_EXCEPTIONS
|
#ifdef VULKAN_HPP_NO_EXCEPTIONS
|
||||||
typedef ResultValue<T> type;
|
using type = ResultValue<T>;
|
||||||
#else
|
#else
|
||||||
typedef T type;
|
using type = T;
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -3848,9 +3848,9 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
struct ResultValueType<void>
|
struct ResultValueType<void>
|
||||||
{
|
{
|
||||||
#ifdef VULKAN_HPP_NO_EXCEPTIONS
|
#ifdef VULKAN_HPP_NO_EXCEPTIONS
|
||||||
typedef Result type;
|
using type = Result;
|
||||||
#else
|
#else
|
||||||
typedef void type;
|
using type = void;
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -6950,7 +6950,7 @@ namespace VULKAN_HPP_NAMESPACE
|
|||||||
m_library = dlopen( "libvulkan.1.dylib", RTLD_NOW | RTLD_LOCAL );
|
m_library = dlopen( "libvulkan.1.dylib", RTLD_NOW | RTLD_LOCAL );
|
||||||
}
|
}
|
||||||
# elif defined( _WIN32 )
|
# elif defined( _WIN32 )
|
||||||
m_library = ::LoadLibraryA( "vulkan-1.dll" );
|
m_library = ::LoadLibraryA( "vulkan-1.dll" );
|
||||||
# else
|
# else
|
||||||
# error unsupported platform
|
# error unsupported platform
|
||||||
# endif
|
# endif
|
||||||
|
Loading…
Reference in New Issue
Block a user