diff options
author | Tor Lillqvist <tml@iki.fi> | 2013-05-22 20:26:03 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2013-05-24 12:40:46 +0300 |
commit | ed74575bb6849cd5547cb320fdee54a52353f038 (patch) | |
tree | 37223fb8d44332d8d92ed04e3c06ca2ae186ea2f /vcl/quartz | |
parent | WaE: implicit conversion of NULL constant to nullptr_t (diff) | |
download | core-ed74575bb6849cd5547cb320fdee54a52353f038.tar.gz core-ed74575bb6849cd5547cb320fdee54a52353f038.zip |
Newer boost is more picky with null pointers
Change-Id: I7a2bcd802ad9316696398a2e176dc03ea25baed1
Diffstat (limited to 'vcl/quartz')
-rw-r--r-- | vcl/quartz/salbmp.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx index 4cfccb04bd6f..73ead103c6fa 100644 --- a/vcl/quartz/salbmp.cxx +++ b/vcl/quartz/salbmp.cxx @@ -280,7 +280,7 @@ bool QuartzSalBitmap::AllocateUserData() catch( const std::bad_alloc& ) { OSL_FAIL( "vcl::QuartzSalBitmap::AllocateUserData: bad alloc" ); - maUserBuffer.reset( NULL ); + maUserBuffer.reset( static_cast<sal_uInt8*>(NULL) ); mnBytesPerRow = 0; } |