mirror of
https://github.com/id-Software/DOOM-3-BFG.git
synced 2025-03-15 07:00:58 +00:00
Fixed VS2017 Build
This commit is contained in:
parent
17d34d8562
commit
6ae887a591
2 changed files with 4 additions and 3 deletions
|
@ -103,6 +103,7 @@ If you have questions concerning this license or the applicable additional terms
|
|||
#pragma warning(disable : 4100) // unreferenced formal parameter
|
||||
#pragma warning(disable : 4127) // conditional expression is constant
|
||||
#pragma warning(disable : 4244) // conversion to smaller type, possible loss of data
|
||||
#pragma warning(disable : 4267) // RB 'initializing': conversion from 'size_t' to 'int', possible loss of data
|
||||
#pragma warning(disable : 4714) // function marked as __forceinline not inlined
|
||||
#pragma warning(disable : 4996) // unsafe string operations
|
||||
#endif // _MSC_VER
|
||||
|
|
|
@ -95,16 +95,16 @@ struct idNullPtr
|
|||
{
|
||||
// one pointer member initialized to zero so you can pass NULL as a vararg
|
||||
void* value;
|
||||
idNullPtr() : value( 0 ) { }
|
||||
constexpr idNullPtr() : value( 0 ) { }
|
||||
|
||||
// implicit conversion to all pointer types
|
||||
template<typename T1> operator T1* () const
|
||||
template<typename T1> constexpr operator T1* () const
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
// implicit conversion to all pointer to member types
|
||||
template<typename T1, typename T2> operator T1 T2::* () const
|
||||
template<typename T1, typename T2> constexpr operator T1 T2::* () const
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue