Skip to content

Commit 636f8bb

Browse files
committed
Fix StringClass constructor ambiguity by explicitly casting nullptr to const TCHAR*
1 parent 8d3ea8e commit 636f8bb

File tree

1 file changed

+3
-3
lines changed
  • Core/Libraries/Source/WWVegas/WW3D2

1 file changed

+3
-3
lines changed

Core/Libraries/Source/WWVegas/WW3D2/rddesc.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ class RenderDeviceDescClass
6262

6363
public:
6464

65-
RenderDeviceDescClass(void) : DeviceName(nullptr), DeviceVendor(nullptr), DevicePlatform(nullptr),
66-
DriverName(nullptr), DriverVendor(nullptr), DriverVersion(nullptr),
67-
HardwareName(nullptr), HardwareVendor(nullptr), HardwareChipset(NULL)
65+
RenderDeviceDescClass(void) : DeviceName(static_cast<const TCHAR*>(nullptr)), DeviceVendor(static_cast<const TCHAR*>(nullptr)), DevicePlatform(static_cast<const TCHAR*>(nullptr)),
66+
DriverName(static_cast<const TCHAR*>(nullptr)), DriverVendor(static_cast<const TCHAR*>(nullptr)), DriverVersion(static_cast<const TCHAR*>(nullptr)),
67+
HardwareName(static_cast<const TCHAR*>(nullptr)), HardwareVendor(static_cast<const TCHAR*>(nullptr)), HardwareChipset(static_cast<const TCHAR*>(nullptr))
6868
{
6969
}
7070

0 commit comments

Comments
 (0)