From dc40bfb9a3da13dccb27e911269db46d2bb20fdb Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Thu, 7 Mar 2019 11:38:47 +0100
Subject: [PATCH] [wip/{py-,}sot-core-v3] add patch-ae to fix c++11 build
---
py-sot-core-v3/distinfo | 1 +
py-sot-core-v3/patches/patch-ae | 31 +++++++++++++++++++++++++++++++
sot-core-v3/distinfo | 1 +
sot-core-v3/patches/patch-ae | 31 +++++++++++++++++++++++++++++++
4 files changed, 64 insertions(+)
create mode 100644 py-sot-core-v3/patches/patch-ae
create mode 100644 sot-core-v3/patches/patch-ae
diff --git a/py-sot-core-v3/distinfo b/py-sot-core-v3/distinfo
index 5ab68825..16c08eb5 100644
--- a/py-sot-core-v3/distinfo
+++ b/py-sot-core-v3/distinfo
@@ -5,3 +5,4 @@ SHA1 (patch-aa) = 228fbffed1db2ddbb5926764e0d77750774fe716
SHA1 (patch-ab) = 65531cbbc1ea697e9f4f63f864fd811a99e955ae
SHA1 (patch-ac) = f759462543db791b92b99428752ccc3db8a32dac
SHA1 (patch-ad) = 9731f90f2c33abec026a1d34cfaa653316b84427
+SHA1 (patch-ae) = 92c1519ebfa1af2fcc21e2ad1d492620ed1ed543
diff --git a/py-sot-core-v3/patches/patch-ae b/py-sot-core-v3/patches/patch-ae
new file mode 100644
index 00000000..9b485c18
--- /dev/null
+++ b/py-sot-core-v3/patches/patch-ae
@@ -0,0 +1,31 @@
+From 5961ecf4cefff6d7e22f493435a44008db178307 Mon Sep 17 00:00:00 2001
+From: Guilhem Saurel <guilhem.saurel@laas.fr>
+Date: Thu, 7 Mar 2019 10:41:47 +0100
+Subject: [PATCH] fix build on C++11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+src/tools/device.cpp:530:19: error: unable to find string literal operator ‘operator""what’ with ‘const char [31]’, ‘long unsigned int’ arguments
+ CHECK_BOUNDS(state_, lowerPosition_, upperPosition_, "position");
+ ^
+---
+ src/tools/device.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tools/device.cpp b/src/tools/device.cpp
+index 03ca73b..0e2df1e 100644
+--- src/tools/device.cpp
++++ src/tools/device.cpp
+@@ -508,7 +508,7 @@ saturateBounds (double& val, const double& lower, const double& upper)
+ for (int i = 0; i < val.size(); ++i) { \
+ double old = val(i); \
+ if (saturateBounds (val(i), lower(i), upper(i))) \
+- dgRTLOG () << "Robot "what" bound violation at DoF " << i << \
++ dgRTLOG () << "Robot " what " bound violation at DoF " << i << \
+ ": requested " << old << " but set " << val(i) << '\n'; \
+ }
+
+--
+2.7.4
+
diff --git a/sot-core-v3/distinfo b/sot-core-v3/distinfo
index 5bb8aa14..742e89ec 100644
--- a/sot-core-v3/distinfo
+++ b/sot-core-v3/distinfo
@@ -1,3 +1,4 @@
SHA1 (sot-core-4.1.1.tar.gz) = 13df07061624f1d1609489c6f50835cf0de3c40f
RMD160 (sot-core-4.1.1.tar.gz) = 2c43092f1f8dfa8b3b14a41fc509b75bdb0e617f
Size (sot-core-4.1.1.tar.gz) = 1082407 bytes
+SHA1 (patch-ae) = 92c1519ebfa1af2fcc21e2ad1d492620ed1ed543
diff --git a/sot-core-v3/patches/patch-ae b/sot-core-v3/patches/patch-ae
new file mode 100644
index 00000000..9b485c18
--- /dev/null
+++ b/sot-core-v3/patches/patch-ae
@@ -0,0 +1,31 @@
+From 5961ecf4cefff6d7e22f493435a44008db178307 Mon Sep 17 00:00:00 2001
+From: Guilhem Saurel <guilhem.saurel@laas.fr>
+Date: Thu, 7 Mar 2019 10:41:47 +0100
+Subject: [PATCH] fix build on C++11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+src/tools/device.cpp:530:19: error: unable to find string literal operator ‘operator""what’ with ‘const char [31]’, ‘long unsigned int’ arguments
+ CHECK_BOUNDS(state_, lowerPosition_, upperPosition_, "position");
+ ^
+---
+ src/tools/device.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tools/device.cpp b/src/tools/device.cpp
+index 03ca73b..0e2df1e 100644
+--- src/tools/device.cpp
++++ src/tools/device.cpp
+@@ -508,7 +508,7 @@ saturateBounds (double& val, const double& lower, const double& upper)
+ for (int i = 0; i < val.size(); ++i) { \
+ double old = val(i); \
+ if (saturateBounds (val(i), lower(i), upper(i))) \
+- dgRTLOG () << "Robot "what" bound violation at DoF " << i << \
++ dgRTLOG () << "Robot " what " bound violation at DoF " << i << \
+ ": requested " << old << " but set " << val(i) << '\n'; \
+ }
+
+--
+2.7.4
+
--
GitLab