mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

glmark2: Fix gcc 6 deprecated declaration error

Browse Source 
Replace auto_ptr with unique_ptr.

Upstream-Status: Pending

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Tom Hochstein
2016-08-08 11:39:55 -05:00
committed by Martin Jansa
parent c29c7ed764
commit 98c0577972
2 changed files with 63 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-benchmark/glmark2/files/Fix-deprecated-declarations.patch
+61
View File
@@ -0,0 +1,61 @@
Index: git/src/image-reader.cpp
===================================================================
--- git.orig/src/image-reader.cpp 2016-07-29 16:17:51.000000000 -0500
+++ git/src/image-reader.cpp 2016-07-29 16:18:43.000000000 -0500
@@ -120,7 +120,7 @@
Log::debug("Reading PNG file %s\n", filename.c_str());
- const std::auto_ptr<std::istream> is_ptr(Util::get_resource(filename));
+ const std::unique_ptr<std::istream> is_ptr(Util::get_resource(filename));
if (!(*is_ptr)) {
Log::error("Cannot open file %s!\n", filename.c_str());
return false;
Index: git/src/libmatrix/shader-source.cc
===================================================================
--- git.orig/src/libmatrix/shader-source.cc 2016-07-29 16:18:14.000000000 -0500
+++ git/src/libmatrix/shader-source.cc 2016-07-29 16:18:43.000000000 -0500
@@ -34,7 +34,7 @@
bool
ShaderSource::load_file(const std::string& filename, std::string& str)
{
- std::auto_ptr<std::istream> is_ptr(Util::get_resource(filename));
+ std::unique_ptr<std::istream> is_ptr(Util::get_resource(filename));
std::istream& inputFile(*is_ptr);
if (!inputFile)
Index: git/src/model.cpp
===================================================================
--- git.orig/src/model.cpp 2016-07-29 16:18:00.000000000 -0500
+++ git/src/model.cpp 2016-07-29 16:18:43.000000000 -0500
@@ -361,7 +361,7 @@
Log::debug("Loading model from 3ds file '%s'\n", filename.c_str());
- const std::auto_ptr<std::istream> input_file_ptr(Util::get_resource(filename));
+ const std::unique_ptr<std::istream> input_file_ptr(Util::get_resource(filename));
std::istream& input_file(*input_file_ptr);
if (!input_file) {
@@ -681,7 +681,7 @@
{
Log::debug("Loading model from obj file '%s'\n", filename.c_str());
- const std::auto_ptr<std::istream> input_file_ptr(Util::get_resource(filename));
+ const std::unique_ptr<std::istream> input_file_ptr(Util::get_resource(filename));
std::istream& inputFile(*input_file_ptr);
if (!inputFile)
{
Index: git/src/scene-jellyfish.cpp
===================================================================
--- git.orig/src/scene-jellyfish.cpp 2016-07-29 16:18:08.000000000 -0500
+++ git/src/scene-jellyfish.cpp 2016-07-29 16:18:43.000000000 -0500
@@ -272,7 +272,7 @@
{
Log::debug("Loading model from file '%s'\n", filename.c_str());
- const std::auto_ptr<std::istream> input_file_ptr(Util::get_resource(filename));
+ const std::unique_ptr<std::istream> input_file_ptr(Util::get_resource(filename));
std::istream& inputFile(*input_file_ptr);
if (!inputFile)
{
meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
+2 -1
View File
@@ -15,7 +15,8 @@ PV = "2014.03+${SRCPV}"
SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https \
file://build-Check-packages-to-be-used-by-the-enabled-flavo.patch \
file://0001-Fix-wl_surface-should-be-destoryed-after-the-wl_wind.patch \
file://Fix-configure-for-sqrt-check.patch"
file://Fix-configure-for-sqrt-check.patch \
file://Fix-deprecated-declarations.patch"
SRCREV = "fa71af2dfab711fac87b9504b6fc9862f44bf72a"
S = "${WORKDIR}/git"