widelands-dev team mailing list archive

[Tino <tino.miegel@xxxxxxxxxxxxxx>]

Tino has proposed merging lp:~tino79/widelands/fixbug1204226 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1204226 in widelands: "FTBFS on Ubuntu 13.04 (use of deleted function ‘void std::unique_ptr<_Tp [], _Dp>::reset(_Up))"
  https://bugs.launchpad.net/widelands/+bug/1204226

For more details, see:
https://code.launchpad.net/~tino79/widelands/fixbug1204226/+merge/176620

A quick fix for bug #1204226
-- 
https://code.launchpad.net/~tino79/widelands/fixbug1204226/+merge/176620
Your team Widelands Developers is requested to review the proposed merge of lp:~tino79/widelands/fixbug1204226 into lp:widelands.

=== modified file 'src/graphic/render/gl_surface_screen.cc'
--- src/graphic/render/gl_surface_screen.cc	2013-07-23 18:04:32 +0000
+++ src/graphic/render/gl_surface_screen.cc	2013-07-24 08:03:33 +0000
@@ -72,7 +72,7 @@
 		glDrawPixels(m_w, m_h, GL_RGBA, GL_UNSIGNED_BYTE, m_pixels.get());
 	}
 
-	m_pixels.reset(0);
+	m_pixels.reset(nullptr);
 }
 
 uint16_t GLSurfaceScreen::get_pitch() const {

=== modified file 'src/graphic/render/gl_surface_texture.cc'
--- src/graphic/render/gl_surface_texture.cc	2013-07-23 18:04:32 +0000
+++ src/graphic/render/gl_surface_texture.cc	2013-07-24 08:03:33 +0000
@@ -228,7 +228,7 @@
 			 GL_UNSIGNED_BYTE,  m_pixels.get());
 	}
 
-	m_pixels.reset(0);
+	m_pixels.reset(nullptr);
 }
 
 uint16_t GLSurfaceTexture::get_pitch() const {