ecl-core: updating to 0.61.18

Due to the update, this commit drops the patch for ecl-containers
that has been included in the current upstream version.

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
This commit is contained in:
Lukas Bulwahn 2017-07-01 09:46:34 +02:00
parent b0bf3da6d5
commit 79ecc9267c
24 changed files with 2 additions and 38 deletions

View File

@ -1,34 +0,0 @@
From 8f40c9b006c70326bcfca73daebb54187a65aa5e Mon Sep 17 00:00:00 2001
From: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
Date: Mon, 26 Jun 2017 17:05:01 +0300
Subject: [PATCH] [ecl_containers] Fix gcc v7.1 compilation issue
When built with gcc v7.1 compilation fails with an error message
about using an expression as a function when updating
the private attribute FloatContainerFormatter.prm_width.
The patch uses assignment to update the attribute.
Upstream-Status: Accepted [https://github.com/stonier/ecl_core/pull/58]
Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
---
ecl_containers/include/ecl/containers/common/formatters.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ecl_containers/include/ecl/containers/common/formatters.hpp b/ecl_containers/include/ecl/containers/common/formatters.hpp
index e26ec60..5f4c026 100644
--- a/ecl_containers/include/ecl/containers/common/formatters.hpp
+++ b/ecl_containers/include/ecl/containers/common/formatters.hpp
@@ -123,7 +123,7 @@ class ECL_LOCAL FloatContainerFormatter {
* @param w : the width to use for the inserted float.
* @return FloatContainerFormatter& : this formatter readied for use with a stream.
*/
- FloatContainerFormatter& operator()(const unsigned int p, const int w) { format.precision(p); prm_width(w); return *this; } // Permanent
+ FloatContainerFormatter& operator()(const unsigned int p, const int w) { format.precision(p); prm_width = w; return *this; } // Permanent
/**
* Convenient stream formatter. This function directly readies the formatter
* with the specified container and the stored (permanent) settings.
--
2.9.3

View File

@ -6,5 +6,3 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=14;endline=14;md5=d566ef916e9de
DEPENDS = "ecl-license ecl-config ecl-errors ecl-exceptions ecl-formatters ecl-converters ecl-mpl ecl-type-traits ecl-utilities"
require ecl-core.inc
SRC_URI += "file://0001-ecl_containers-Fix-gcc-v7.1-compilation-issue.patch;patchdir=.."

View File

@ -1,6 +1,6 @@
SRC_URI = "https://github.com/stonier/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "625fa08e6e23adb58d9de2caaaf2be08"
SRC_URI[sha256sum] = "ea2e3e8e7572d6e18374b8be3736ce4761ea1f18c6af046af3fe4fcaadfc5285"
SRC_URI[md5sum] = "78f4275f5c7cec759ca096e22d1570d2"
SRC_URI[sha256sum] = "358e9de2a31cf0df70e1b5d6e0d9dc5f00d042f1974c786eabbb7bcb48151477"
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"