Commit 57b16340 authored by Martin Jansa's avatar Martin Jansa
Browse files

{dashing} swri-{opencv,transform}-util: fix build with boost-1.69.0

Signed-off-by: default avatarMartin Jansa <martin.jansa@lge.com>
parent 827e620e
Showing with 87 additions and 0 deletions
+87 -0
From 2051f94de3a24a17e4edcca4223b036c0db23500 Mon Sep 17 00:00:00 2001
From: Martin Jansa <martin.jansa@lge.com>
Date: Sat, 11 Jan 2020 19:58:17 +0000
Subject: [PATCH] show.cpp: don't make CvWindows private
* with newer boost 1.69.0 it fails with:
In file included from /jenkins/mjansa/build-ros/webos-dashing-warrior/tmp-glibc/work/raspberrypi3-webos-linux-gnueabi/swri-opencv-util/3.0.3-1-r0/git/src/show.cpp:35:
/jenkins/mjansa/build-ros/webos-dashing-warrior/tmp-glibc/work/raspberrypi3-webos-linux-gnueabi/swri-opencv-util/3.0.3-1-r0/recipe-sysroot/usr/include/boost/serialization/singleton.hpp: In instantiation of 'boost::serialization::detail::singleton_wrapper<T>::singleton_wrapper() [with T = swri_opencv_util::CvWindows]':
/jenkins/mjansa/build-ros/webos-dashing-warrior/tmp-glibc/work/raspberrypi3-webos-linux-gnueabi/swri-opencv-util/3.0.3-1-r0/recipe-sysroot/usr/include/boost/serialization/singleton.hpp:171:47: required from 'static T& boost::serialization::singleton<T>::get_instance() [with T = swri_opencv_util::CvWindows]'
/jenkins/mjansa/build-ros/webos-dashing-warrior/tmp-glibc/work/raspberrypi3-webos-linux-gnueabi/swri-opencv-util/3.0.3-1-r0/recipe-sysroot/usr/include/boost/serialization/singleton.hpp:193:28: required from 'static T& boost::serialization::singleton<T>::get_mutable_instance() [with T = swri_opencv_util::CvWindows]'
/jenkins/mjansa/build-ros/webos-dashing-warrior/tmp-glibc/work/raspberrypi3-webos-linux-gnueabi/swri-opencv-util/3.0.3-1-r0/git/src/show.cpp:89:25: required from here
/jenkins/mjansa/build-ros/webos-dashing-warrior/tmp-glibc/work/raspberrypi3-webos-linux-gnueabi/swri-opencv-util/3.0.3-1-r0/recipe-sysroot/usr/include/boost/serialization/singleton.hpp:147:24: error: 'swri_opencv_util::CvWindows::CvWindows()' is private within this context
singleton_wrapper(){
^
/jenkins/mjansa/build-ros/webos-dashing-warrior/tmp-glibc/work/raspberrypi3-webos-linux-gnueabi/swri-opencv-util/3.0.3-1-r0/git/src/show.cpp:71:5: note: declared private here
CvWindows() {}
^~~~~~~~~
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
---
src/show.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/show.cpp b/src/show.cpp
index e85fb4867..e11e263ff 100644
--- a/src/show.cpp
+++ b/src/show.cpp
@@ -67,8 +67,8 @@ namespace swri_opencv_util
#else
friend class boost::serialization::detail::singleton_wrapper<CvWindows>;
#endif
- private:
CvWindows() {}
+ private:
boost::mutex mutex_;
std::map<std::string, std::string> windows_;
};
# Copyright (c) 2020 LG Electronics, Inc.
# Fails with boost-1.69.0
FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
SRC_URI += "file://0001-show.cpp-don-t-make-CvWindows-private.patch"
From d14253a0810ffbbdebaeb124a550d700f6995353 Mon Sep 17 00:00:00 2001
From: Martin Jansa <martin.jansa@lge.com>
Date: Sat, 11 Jan 2020 20:01:42 +0000
Subject: [PATCH] utm_util.h: don't make UtmData private
* with newer boost-1.69.0 it fails with:
In file included from /jenkins/mjansa/build-ros/webos-dashing-warrior/tmp-glibc/work/raspberrypi3-webos-linux-gnueabi/swri-transform-util/3.0.3-1-r0/git/include/swri_transform_util/utm_util.h:35,
from /jenkins/mjansa/build-ros/webos-dashing-warrior/tmp-glibc/work/raspberrypi3-webos-linux-gnueabi/swri-transform-util/3.0.3-1-r0/git/src/utm_util.cpp:30:
/jenkins/mjansa/build-ros/webos-dashing-warrior/tmp-glibc/work/raspberrypi3-webos-linux-gnueabi/swri-transform-util/3.0.3-1-r0/recipe-sysroot/usr/include/boost/serialization/singleton.hpp: In instantiation of 'boost::serialization::detail::singleton_wrapper<T>::singleton_wrapper() [with T = swri_transform_util::UtmUtil::UtmData]':
/jenkins/mjansa/build-ros/webos-dashing-warrior/tmp-glibc/work/raspberrypi3-webos-linux-gnueabi/swri-transform-util/3.0.3-1-r0/recipe-sysroot/usr/include/boost/serialization/singleton.hpp:171:47: required from 'static T& boost::serialization::singleton<T>::get_instance() [with T = swri_transform_util::UtmUtil::UtmData]'
/jenkins/mjansa/build-ros/webos-dashing-warrior/tmp-glibc/work/raspberrypi3-webos-linux-gnueabi/swri-transform-util/3.0.3-1-r0/recipe-sysroot/usr/include/boost/serialization/singleton.hpp:196:28: required from 'static const T& boost::serialization::singleton<T>::get_const_instance() [with T = swri_transform_util::UtmUtil::UtmData]'
/jenkins/mjansa/build-ros/webos-dashing-warrior/tmp-glibc/work/raspberrypi3-webos-linux-gnueabi/swri-transform-util/3.0.3-1-r0/git/src/utm_util.cpp:180:33: required from here
/jenkins/mjansa/build-ros/webos-dashing-warrior/tmp-glibc/work/raspberrypi3-webos-linux-gnueabi/swri-transform-util/3.0.3-1-r0/recipe-sysroot/usr/include/boost/serialization/singleton.hpp:147:24: error: 'swri_transform_util::UtmUtil::UtmData::UtmData()' is private within this context
singleton_wrapper(){
^
/jenkins/mjansa/build-ros/webos-dashing-warrior/tmp-glibc/work/raspberrypi3-webos-linux-gnueabi/swri-transform-util/3.0.3-1-r0/git/src/utm_util.cpp:82:3: note: declared private here
UtmUtil::UtmData::UtmData()
^~~~~~~
Signed-off-by: Martin Jansa <martin.jansa@lge.com>
---
include/swri_transform_util/utm_util.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/swri_transform_util/utm_util.h b/include/swri_transform_util/utm_util.h
index b323ad0bb..40289ac2b 100644
--- a/include/swri_transform_util/utm_util.h
+++ b/include/swri_transform_util/utm_util.h
@@ -163,8 +163,8 @@ namespace swri_transform_util
#else
friend class boost::serialization::detail::singleton_wrapper<swri_transform_util::UtmUtil::UtmData>;
#endif
- private:
UtmData();
+ private:
projPJ lat_lon_;
projPJ utm_north_[60];
# Copyright (c) 2020 LG Electronics, Inc.
# Fails with boost-1.69.0
FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
SRC_URI += "file://0001-utm_util.h-don-t-make-UtmData-private.patch"
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