Commit 7945bc2a authored by Florent Revest's avatar Florent Revest

cor: Fix build with GCC 6

parent d2255fb5
From 6ae25562fb7950755e719060e3642c8a65bb4f5e Mon Sep 17 00:00:00 2001
From: Florent Revest <revestflo@gmail.com>
Date: Sun, 30 Oct 2016 17:49:03 +0100
Subject: [PATCH] Fix error with GCC 6 caused by an inconsistent usage of
'auto'
---
include/cor/error.hpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/cor/error.hpp b/include/cor/error.hpp
index 72fe5d4..645ae75 100644
--- a/include/cor/error.hpp
+++ b/include/cor/error.hpp
@@ -93,7 +93,8 @@ public:
std::copy(&src.frames[0], &src.frames[count_], frames.begin());
if (src.symbols) {
symbols.reset((const char**)calloc(src.count_, sizeof(*symbols)));
- auto to = src.symbols.get(), from = symbols.get();
+ auto to = src.symbols.get();
+ auto from = symbols.get();
std::copy(from, from + count_, to);
}
}
--
2.10.1
...@@ -3,7 +3,8 @@ HOMEPAGE = "https://git.merproject.org/mer-core/cor" ...@@ -3,7 +3,8 @@ HOMEPAGE = "https://git.merproject.org/mer-core/cor"
LICENSE = "LGPL-2.1+" LICENSE = "LGPL-2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=d2c621b4dd653efb7cbad641e0a30c59" LIC_FILES_CHKSUM = "file://COPYING;md5=d2c621b4dd653efb7cbad641e0a30c59"
SRC_URI = "git://git.merproject.org/mer-core/cor.git;protocol=https" SRC_URI = "git://git.merproject.org/mer-core/cor.git;protocol=https \
file://0001-Fix-error-with-GCC-6.patch"
SRCREV = "52362ca66838694bbfa32071a1c14e1cb0cab1eb" SRCREV = "52362ca66838694bbfa32071a1c14e1cb0cab1eb"
PR = "r1" PR = "r1"
PV = "+git${SRCREV}" PV = "+git${SRCREV}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment