mirror of
https://github.com/SFML/SFML.git
synced 2024-11-25 04:41:05 +08:00
Use std::
namespace
This commit is contained in:
parent
5580720ae0
commit
d99d673330
@ -508,7 +508,7 @@ bool AudioDevice::initialize()
|
|||||||
// Update the current device string from the the device we just initialized
|
// Update the current device string from the the device we just initialized
|
||||||
{
|
{
|
||||||
std::array<char, MA_MAX_DEVICE_NAME_LENGTH + 1> deviceName{};
|
std::array<char, MA_MAX_DEVICE_NAME_LENGTH + 1> deviceName{};
|
||||||
size_t deviceNameLength{};
|
std::size_t deviceNameLength{};
|
||||||
|
|
||||||
if (const auto result = ma_device_get_name(&*m_playbackDevice,
|
if (const auto result = ma_device_get_name(&*m_playbackDevice,
|
||||||
ma_device_type_playback,
|
ma_device_type_playback,
|
||||||
|
@ -52,8 +52,8 @@
|
|||||||
|
|
||||||
#if defined(SFML_SYSTEM_MACOS) || defined(SFML_SYSTEM_IOS)
|
#if defined(SFML_SYSTEM_MACOS) || defined(SFML_SYSTEM_IOS)
|
||||||
|
|
||||||
#define castToGlHandle(x) reinterpret_cast<GLEXT_GLhandle>(static_cast<ptrdiff_t>(x))
|
#define castToGlHandle(x) reinterpret_cast<GLEXT_GLhandle>(static_cast<std::ptrdiff_t>(x))
|
||||||
#define castFromGlHandle(x) static_cast<unsigned int>(reinterpret_cast<ptrdiff_t>(x))
|
#define castFromGlHandle(x) static_cast<unsigned int>(reinterpret_cast<std::ptrdiff_t>(x))
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
|
@ -214,7 +214,7 @@ GlFunctionPointer WglContext::getFunction(const char* name)
|
|||||||
if (address)
|
if (address)
|
||||||
{
|
{
|
||||||
// Test whether the returned value is a valid error code
|
// Test whether the returned value is a valid error code
|
||||||
auto errorCode = reinterpret_cast<ptrdiff_t>(address);
|
auto errorCode = reinterpret_cast<std::ptrdiff_t>(address);
|
||||||
|
|
||||||
if ((errorCode != -1) && (errorCode != 1) && (errorCode != 2) && (errorCode != 3))
|
if ((errorCode != -1) && (errorCode != 1) && (errorCode != 2) && (errorCode != 3))
|
||||||
return address;
|
return address;
|
||||||
|
Loading…
Reference in New Issue
Block a user