Bug 1372870 - Compiling with mingw-w64 based on GCC 6.3.0 breaks (operands to ?: have different types) r=mattwoodrow

This commit is contained in:
Jacek Caban 2017-06-22 17:33:39 +02:00
Родитель 51fdc64d9e
Коммит 209eeeaf94
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -239,7 +239,7 @@ public:
virtual ID3D11ShaderResourceView* GetShaderResourceView() override;
// Returns nullptr if this texture was created by a DXGI TextureHost.
virtual DataTextureSource* AsDataTextureSource() override { return mAllowTextureUploads ? this : false; }
virtual DataTextureSource* AsDataTextureSource() override { return mAllowTextureUploads ? this : nullptr; }
virtual void DeallocateDeviceData() override { mTexture = nullptr; }