diff -Nru yarp-3.6.0+ds1/debian/changelog yarp-3.6.0+ds1/debian/changelog --- yarp-3.6.0+ds1/debian/changelog 2021-12-31 18:28:17.000000000 +0000 +++ yarp-3.6.0+ds1/debian/changelog 2022-01-04 10:48:13.000000000 +0000 @@ -1,29 +1,29 @@ -yarp (3.6.0+ds1-0r1~ubuntu20.04~robotology1) focal; urgency=medium +yarp (3.6.0+ds1-0r2~ubuntu20.04~robotology1) focal; urgency=medium * Backport to focal. - -- Daniele E. Domenichelli Fri, 31 Dec 2021 19:28:17 +0100 + -- Daniele E. Domenichelli Tue, 04 Jan 2022 11:48:13 +0100 -yarp (3.6.0+ds1-0r1~ubuntu21.04~robotology1) hirsute; urgency=medium +yarp (3.6.0+ds1-0r2~ubuntu21.04~robotology1) hirsute; urgency=medium * Backport to hirsute. - -- Daniele E. Domenichelli Fri, 31 Dec 2021 19:26:00 +0100 + -- Daniele E. Domenichelli Tue, 04 Jan 2022 11:47:36 +0100 -yarp (3.6.0+ds1-0r1~ubuntu21.10~robotology2) impish; urgency=medium +yarp (3.6.0+ds1-0r2~ubuntu21.10~robotology1) impish; urgency=medium * Backport to impish. - -- Daniele E. Domenichelli Fri, 31 Dec 2021 19:24:39 +0100 + -- Daniele E. Domenichelli Tue, 04 Jan 2022 11:43:58 +0100 -yarp (3.6.0+ds1-0r1~ubuntu22.04~robotology1) jammy; urgency=medium +yarp (3.6.0+ds1-0r2~ubuntu22.04~robotology3) jammy; urgency=medium * Backport to jammy. - -- Daniele E. Domenichelli Fri, 31 Dec 2021 18:25:54 +0100 + -- Daniele E. Domenichelli Tue, 04 Jan 2022 11:42:47 +0100 -yarp (3.6.0+ds1-0r1) unstable; urgency=medium +yarp (3.6.0+ds1-0r2) unstable; urgency=medium * Initial release. (Closes: #682756) - -- Daniele E. Domenichelli Fri, 31 Dec 2021 18:25:22 +0100 + -- Daniele E. Domenichelli Tue, 04 Jan 2022 11:41:43 +0100 diff -Nru yarp-3.6.0+ds1/debian/control yarp-3.6.0+ds1/debian/control --- yarp-3.6.0+ds1/debian/control 2021-12-31 18:28:17.000000000 +0000 +++ yarp-3.6.0+ds1/debian/control 2022-01-04 10:48:13.000000000 +0000 @@ -78,7 +78,7 @@ ##################### LIBS Package: libyarp-os3 -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Multi-Arch: same Section: libs Depends: ${misc:Depends}, @@ -100,7 +100,7 @@ This package contains the os shared library. Package: libyarp-sig3 -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Multi-Arch: same Section: libs Depends: ${misc:Depends}, @@ -121,7 +121,7 @@ This package contains the sig shared library. Package: libyarp-math3 -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Multi-Arch: same Section: libs Depends: ${misc:Depends}, @@ -142,7 +142,7 @@ This package contains the math shared library. Package: libyarp-dev3 -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Multi-Arch: same Section: libs Depends: ${misc:Depends}, @@ -163,7 +163,7 @@ This package contains the dev shared library. Package: libyarp-gsl3 -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Multi-Arch: same Section: libs Depends: ${misc:Depends}, @@ -184,7 +184,7 @@ This package contains the gsl shared library. Package: libyarp-robotinterface3 -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Multi-Arch: same Section: libs Depends: ${misc:Depends}, @@ -205,7 +205,7 @@ This package contains the robotinterface shared library. Package: libyarp-robottestingframework3 -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Multi-Arch: same Section: libs Depends: ${misc:Depends}, @@ -227,7 +227,7 @@ ##################### DEV Package: libyarp-conf3-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends} Recommends: cmake (>= 3.12), @@ -249,7 +249,7 @@ This package contains the conf development files. Package: libyarp-os3-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends}, libyarp-os3 (= ${binary:Version}), @@ -271,7 +271,7 @@ This package contains the os development files. Package: libyarp-os3-private-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends}, libyarp-os3-dev (= ${binary:Version}) @@ -294,7 +294,7 @@ Use at your own risk. Package: libyarp-sig3-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends}, libyarp-conf3-dev (= ${binary:Version}), @@ -317,7 +317,7 @@ This package contains the sig development files. Package: libyarp-sig3-private-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends}, libyarp-sig3-dev (= ${binary:Version}) @@ -340,7 +340,7 @@ Use at your own risk. Package: libyarp-math3-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends}, libyarp-conf3-dev (= ${binary:Version}), @@ -364,7 +364,7 @@ This package contains the math development files. Package: libyarp-rosmsg-native3-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends}, libyarp-conf3-dev (= ${binary:Version}), @@ -386,7 +386,7 @@ This package contains the rosmsg_native development files. Package: libyarp-rosmsg-std-msgs3-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends}, libyarp-conf3-dev (= ${binary:Version}), @@ -408,7 +408,7 @@ This package contains the rosmsg_std_msgs development files. Package: libyarp-rosmsg-actionlib-msgs3-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends}, libyarp-conf3-dev (= ${binary:Version}), @@ -430,7 +430,7 @@ This package contains the rosmsg_actionlib_msgs development files. Package: libyarp-rosmsg-diagnostic-msgs3-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends}, libyarp-conf3-dev (= ${binary:Version}), @@ -452,7 +452,7 @@ This package contains the rosmsg_diagnostic_msgs development files. Package: libyarp-rosmsg-geometry-msgs3-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends}, libyarp-conf3-dev (= ${binary:Version}), @@ -474,7 +474,7 @@ This package contains the rosmsg_geometry_msgs development files. Package: libyarp-rosmsg-nav-msgs3-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends}, libyarp-conf3-dev (= ${binary:Version}), @@ -496,7 +496,7 @@ This package contains the rosmsg_nav_msgs development files. Package: libyarp-rosmsg-sensor-msgs3-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends}, libyarp-conf3-dev (= ${binary:Version}), @@ -518,7 +518,7 @@ This package contains the rosmsg_sensor_msgs development files. Package: libyarp-rosmsg-shape-msgs3-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends}, libyarp-conf3-dev (= ${binary:Version}), @@ -540,7 +540,7 @@ This package contains the rosmsg_shape_msgs development files. Package: libyarp-rosmsg-stereo-msgs3-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends}, libyarp-conf3-dev (= ${binary:Version}), @@ -562,7 +562,7 @@ This package contains the rosmsg_stereo_msgs development files. Package: libyarp-rosmsg-tf3-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends}, libyarp-conf3-dev (= ${binary:Version}), @@ -584,7 +584,7 @@ This package contains the rosmsg_tf development files. Package: libyarp-rosmsg-tf2-msgs3-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends}, libyarp-conf3-dev (= ${binary:Version}), @@ -606,7 +606,7 @@ This package contains the rosmsg_tf2_msgs development files. Package: libyarp-rosmsg-trajectory-msgs3-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends}, libyarp-conf3-dev (= ${binary:Version}), @@ -628,7 +628,7 @@ This package contains the rosmsg_trajectory_msgs development files. Package: libyarp-rosmsg-visualization-msgs3-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends}, libyarp-conf3-dev (= ${binary:Version}), @@ -650,7 +650,7 @@ This package contains the rosmsg_visualization_msgs development files. Package: libyarp-rosmsg3-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends}, libyarp-conf3-dev (= ${binary:Version}), @@ -685,7 +685,7 @@ This package contains the rosmsg development files. Package: libyarp-dev3-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends}, libyarp-conf3-dev (= ${binary:Version}), @@ -711,7 +711,7 @@ This package contains the dev development files. Package: libyarp-dev3-private-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends}, libyarp-dev3-dev (= ${binary:Version}) @@ -734,7 +734,7 @@ Use at your own risk. Package: libyarp-gsl3-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends}, libyarp-conf3-dev (= ${binary:Version}), @@ -758,7 +758,7 @@ This package contains the gsl development files. Package: libyarp-gsl3-private-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends}, libyarp-gsl3-dev (= ${binary:Version}) @@ -781,7 +781,7 @@ Use at your own risk. Package: libyarp-eigen3-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends}, libyarp-conf3-dev (= ${binary:Version}), @@ -805,7 +805,7 @@ This package contains the eigen development files. Package: libyarp-cv3-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends}, libyarp-conf3-dev (= ${binary:Version}), @@ -829,7 +829,7 @@ This package contains the cv development files. Package: libyarp-pcl3-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends}, libyarp-conf3-dev (= ${binary:Version}), @@ -853,7 +853,7 @@ This package contains the pcl development files. Package: libyarp-robotinterface3-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends}, libyarp-robotinterface3 (= ${binary:Version}), @@ -876,7 +876,7 @@ This package contains the robotinterface development files. Package: libyarp-robotinterface3-private-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends}, libyarp-robotinterface3-dev (= ${binary:Version}) @@ -899,7 +899,7 @@ Use at your own risk. Package: libyarp-robottestingframework3-dev -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: libdevel Depends: ${misc:Depends}, libyarp-robottestingframework3 (= ${binary:Version}), @@ -923,7 +923,7 @@ ##################### TOOLS Package: yarpserver -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Description: middleware for humanoid robots - yarpserver @@ -941,7 +941,7 @@ This package contains yarpserver. Package: yarprun -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Description: middleware for humanoid robots - yarprun @@ -959,7 +959,7 @@ This package contains yarprun. Package: yarp-idl-tools -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Description: middleware for humanoid robots - idl tools @@ -977,7 +977,7 @@ This package contains the idl tools. Package: yarp-tools -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, yarpserver (= ${binary:Version}), @@ -998,7 +998,7 @@ This package contains the command line tools. Package: yarpview -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, qml-module-qtquick2, @@ -1021,7 +1021,7 @@ This package contains yarpview. Package: yarpscope -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, qml-module-qtquick2, @@ -1042,7 +1042,7 @@ This package contains yarpscope. Package: yarpmotorgui -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Description: middleware for humanoid robots - yarpmotorgui @@ -1060,7 +1060,7 @@ This package contains yarpmotorgui. Package: yarpmobilebasegui -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Description: middleware for humanoid robots - yarpmobilebasegui @@ -1078,7 +1078,7 @@ This package contains yarpmobilebasegui. Package: yarpmanager -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Description: middleware for humanoid robots - yarpmanager @@ -1096,7 +1096,7 @@ This package contains yarpmanager. Package: yarplogger -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Description: middleware for humanoid robots - yarplogger @@ -1114,7 +1114,7 @@ This package contains yarplogger. Package: yarpdatadumper -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, ${python3:Depends} @@ -1133,7 +1133,7 @@ This package contains yarpdatadumper. Package: yarpdataplayer -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Description: middleware for humanoid robots - yarpdataplayer @@ -1149,7 +1149,7 @@ with hardware devices. Package: yarplaserscannergui -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Description: middleware for humanoid robots - yarplaserscannergui @@ -1167,7 +1167,7 @@ This package contains yarplaserscannergui. Package: yarpbatterygui -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Description: middleware for humanoid robots - yarpbatterygui @@ -1185,7 +1185,7 @@ This package contains yarpbatterygui. Package: yarpviz -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Description: middleware for humanoid robots - yarpviz @@ -1204,7 +1204,7 @@ ##################### CARRIERS Package: yarp-carrier-bayer -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1223,7 +1223,7 @@ This package contains the bayer carrier plugin. Package: yarp-carrier-h264 -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, gstreamer1.0-plugins-base, @@ -1246,7 +1246,7 @@ This package contains the h264 carrier plugin. Package: yarp-carrier-human -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1265,7 +1265,7 @@ This package contains the human carrier plugin. Package: yarp-carrier-mjpeg -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1284,7 +1284,7 @@ This package contains the mjpeg carrier plugin. Package: yarp-carrier-mpi -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1303,7 +1303,7 @@ This package contains the mpi and mpibcast carrier plugins. Package: yarp-carrier-portmonitor -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1322,7 +1322,7 @@ This package contains the portmonitor carrier plugin. Package: yarp-carrier-priority -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1341,7 +1341,7 @@ This package contains the priority carrier plugin. Package: yarp-carrier-shmem -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1360,7 +1360,7 @@ This package contains the shmem carrier plugin. Package: yarp-carrier-tcpros -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1379,7 +1379,7 @@ This package contains the tcpros carrier plugin. Package: yarp-carrier-xmlrpc -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1398,7 +1398,7 @@ This package contains the xmlrpc carrier plugin. Package: yarp-carrier-unixstream -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1417,7 +1417,7 @@ This package contains the unix_stream carrier plugin. Package: yarp-carrier-websocket -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1437,7 +1437,7 @@ ##################### DEVICES Package: yarp-device-analogserver -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1456,7 +1456,7 @@ This package contains the analogServer device plugin. Package: yarp-device-analogsensorclient -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1475,7 +1475,7 @@ This package contains the analogsensorclient device plugin. Package: yarp-device-audiofromfiledevice -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1494,7 +1494,7 @@ This package contains the audioFromFileDevice device plugin. Package: yarp-device-audioplayerwrapper -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1513,7 +1513,7 @@ This package contains the AudioPlayerWrapper device plugin. Package: yarp-device-audiorecorderwrapper -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1532,7 +1532,7 @@ This package contains the AudioRecorderWrapper device plugin. Package: yarp-device-audiotofiledevice -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1551,7 +1551,7 @@ This package contains the audioToFileDevice device plugin. Package: yarp-device-batteryclient -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1570,7 +1570,7 @@ This package contains the batteryClient device plugin. Package: yarp-device-batterywrapper -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1589,7 +1589,7 @@ This package contains the batteryWrapper device plugin. Package: yarp-device-controlboardremapper -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, yarp-device-controlboardwrapper2 @@ -1610,7 +1610,7 @@ devices plugin. Package: yarp-device-controlboardwrapper2 -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1629,7 +1629,7 @@ This package contains the controlboardwrapper2 device plugin. Package: yarp-device-depthcamera -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, yarp-device-rgbdsensorwrapper @@ -1649,7 +1649,7 @@ This package contains the depthCamera device plugin. Package: yarp-device-dynamixelax12ftdi -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, yarp-device-controlboardwrapper2 @@ -1669,7 +1669,7 @@ This package contains the dynamixelAX12Ftdi device plugin. Package: yarp-device-fake -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, yarp-device-grabberdual, @@ -1697,7 +1697,7 @@ This package contains all the fake/testing device plugins. Package: yarp-device-ffmpeg -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, yarp-device-grabberdual @@ -1717,7 +1717,7 @@ This package contains the ffmpeg_grabber and ffmpeg_writer devices plugin. Package: yarp-device-framegrabbercropper -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1736,7 +1736,7 @@ This package contains the frameGrabberCropper device plugin. Package: yarp-device-frametransformclient -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: yarp-device-frametransformstorage, @@ -1762,7 +1762,7 @@ This package contains the frameTransformClient device plugin. Package: yarp-device-frametransformserver -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: yarp-device-frametransformstorage, @@ -1788,7 +1788,7 @@ This package contains the frameTransformServer device plugin. Package: yarp-device-frametransformstorage -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1807,7 +1807,7 @@ This package contains the frameTransformStorage device plugin. Package: yarp-device-frametransformgetmultiplexer -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1826,7 +1826,7 @@ This package contains the frameTransformGetMultiplexer device plugin. Package: yarp-device-frametransformsetmultiplexer -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1845,7 +1845,7 @@ This package contains the frameTransformSetMultiplexer device plugin. Package: yarp-device-grabber -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1864,7 +1864,7 @@ This package contains the grabber device plugin. Package: yarp-device-grabberdual -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1883,7 +1883,7 @@ This package contains the grabberDual device plugin. Package: yarp-device-group -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1902,7 +1902,7 @@ This package contains the group device plugin. Package: yarp-device-imubosch-bno055 -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, yarp-device-inertial @@ -1922,7 +1922,7 @@ This package contains the imuBosch_BNO055 device plugin. Package: yarp-device-inertial -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1941,7 +1941,7 @@ This package contains the inertial device plugin. Package: yarp-device-joypadcontrolclient -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1960,7 +1960,7 @@ This package contains the joypadcontrolclient device plugin. Package: yarp-device-joypadcontrolserver -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1979,7 +1979,7 @@ This package contains the joypadcontrolserver device plugin. Package: yarp-device-laserfromdepth -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -1998,7 +1998,7 @@ This package contains the laserFromDepth device plugin. Package: yarp-device-laserfromexternalport -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2017,7 +2017,7 @@ This package contains the laserFromExternalPort device plugin. Package: yarp-device-laserfrompointcloud -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2036,7 +2036,7 @@ This package contains the laserFromPointCloud device plugin. Package: yarp-device-laserfromrostopic -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2055,7 +2055,7 @@ This package contains the laserFromRosTopic device plugin. Package: yarp-device-laserhokuyo -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2074,7 +2074,7 @@ This package contains the laserHokuyo device plugin. Package: yarp-device-localization2dclient -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2093,7 +2093,7 @@ This package contains the localization2DClient device plugin. Package: yarp-device-localization2dserver -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2112,7 +2112,7 @@ This package contains the localization2DServer device plugin. Package: yarp-device-map2dclient -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2131,7 +2131,7 @@ This package contains the map2DClient device plugin. Package: yarp-device-map2dserver -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2150,7 +2150,7 @@ This package contains the map2DServer device plugin. Package: yarp-device-map2dstorage -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2169,7 +2169,7 @@ This package contains the map2DStorage device plugin. Package: yarp-device-multipleanalogsensorsclient -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2188,7 +2188,7 @@ This package contains the multipleanalogsensorsclient device plugin. Package: yarp-device-multipleanalogsensorsremapper -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2207,7 +2207,7 @@ This package contains the multipleanalogsensorsremapper device plugin. Package: yarp-device-multipleanalogsensorsserver -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2226,7 +2226,7 @@ This package contains the multipleanalogsensorsserver device plugin. Package: yarp-device-multipleanalogsensorsrospublishers -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2245,7 +2245,7 @@ This package contains the multipleanalogsensorsrospublishers devices plugins. Package: yarp-device-navigation2dclient -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2264,7 +2264,7 @@ This package contains the navigation2DClient device plugin. Package: yarp-device-navigation2dserver -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2283,7 +2283,7 @@ This package contains the navigation2DServer device plugin. Package: yarp-device-opencv -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, yarp-device-grabberdual @@ -2303,7 +2303,7 @@ This package contains the opencv_grabber device plugin. Package: yarp-device-pipe -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2322,7 +2322,7 @@ This package contains the pipe device plugin. Package: yarp-device-portaudio -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, yarp-device-grabber @@ -2342,7 +2342,7 @@ This package contains the portaudio device plugin. Package: yarp-device-portaudioplayer -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, yarp-device-audioplayerwrapper @@ -2362,7 +2362,7 @@ This package contains the portaudioPlayer device plugin. Package: yarp-device-portaudiorecorder -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, yarp-device-audiorecorderwrapper @@ -2382,7 +2382,7 @@ This package contains the portaudioRecorder device plugin. Package: yarp-device-rangefinder2dclient -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2401,7 +2401,7 @@ This package contains the Rangefinder2DClient device plugin. Package: yarp-device-rangefinder2dwrapper -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2420,7 +2420,7 @@ This package contains the Rangefinder2DWrapper device plugin. Package: yarp-device-remotecontrolboard -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, yarp-device-controlboardwrapper2 @@ -2440,7 +2440,7 @@ This package contains the remote_controlboard device plugin. Package: yarp-device-remotegrabber -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, yarp-device-grabber @@ -2460,7 +2460,7 @@ This package contains the remote_grabber device plugin. Package: yarp-device-rgbdsensorclient -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2479,7 +2479,7 @@ This package contains the RGBDSendorClient device plugin. Package: yarp-device-rgbdsensorwrapper -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2498,7 +2498,7 @@ This package contains the RGBDSendorWrapper device plugin. Package: yarp-device-rgbdsensorfromrostopic -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2517,7 +2517,7 @@ This package contains the RGBDSensorFromRosTopic device plugin. Package: yarp-device-robotdescriptionclient -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2536,7 +2536,7 @@ This package contains the robotDescriptionClient device plugin. Package: yarp-device-robotdescriptionserver -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2555,7 +2555,7 @@ This package contains the robotDescriptionServer device plugin. Package: yarp-device-rplidar -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2574,7 +2574,7 @@ This package contains the rpLidar device plugin. Package: yarp-device-rplidar2 -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2593,7 +2593,7 @@ This package contains the rpLidar2 device plugin. Package: yarp-device-rplidar3 -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2612,7 +2612,7 @@ This package contains the rpLidar3 device plugin. Package: yarp-device-sdljoypad -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, yarp-device-joypadcontrolserver @@ -2632,7 +2632,7 @@ This package contains the SDLJoypad device plugin. Package: yarp-device-serial -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2651,7 +2651,7 @@ This package contains the serial device plugin. Package: yarp-device-serialport -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, yarp-device-serial @@ -2671,7 +2671,7 @@ This package contains the serialport device plugin. Package: yarp-device-serialservoboard -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2690,7 +2690,7 @@ This package contains the SerialServoBoard device plugin. Package: yarp-device-serversoundgrabber -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2709,7 +2709,7 @@ This package contains the ServerSoundGrabber device plugin. Package: yarp-device-transformclient -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2728,7 +2728,7 @@ This package contains the transformClient device plugin. Package: yarp-device-transformserver -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2747,7 +2747,7 @@ This package contains the transformServer device plugin. Package: yarp-device-upowerbattery -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, yarp-device-batterywrapper @@ -2767,7 +2767,7 @@ This package contains the upowerBattery device plugin. Package: yarp-device-usbcamera -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, yarp-device-grabberdual @@ -2787,7 +2787,7 @@ This package contains the usbCamera and usbCameraRaw devices plugin. Package: yarp-device-virtualanalogserver -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2807,7 +2807,7 @@ ##################### NWC and NWS Package: yarp-nwc-ros-frametransformget -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2826,7 +2826,7 @@ This package contains the frameTransformGet_nwc_ros device plugin. Package: yarp-nwc-yarp-frametransformget -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2845,7 +2845,7 @@ This package contains the frameTransformGet_nwc_yarp device plugin. Package: yarp-nws-yarp-frametransformget -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2864,7 +2864,7 @@ This package contains the frameTransformGet_nws_yarp device plugin. Package: yarp-nwc-ros-frametransformset -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2883,7 +2883,7 @@ This package contains the frameTransformSet_nwc_ros device plugin. Package: yarp-nwc-yarp-frametransformset -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2902,7 +2902,7 @@ This package contains the frameTransformSet_nwc_yarp device plugin. Package: yarp-nws-yarp-frametransformset -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2921,7 +2921,7 @@ This package contains the frameTransformSet_nws_yarp device plugin. Package: yarp-nws-ros-localization2d -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2940,7 +2940,7 @@ This package contains the localization2D_nws_ros device plugin. Package: yarp-nws-yarp-localization2d -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2959,7 +2959,7 @@ This package contains the localization2D_nws_yarp device plugin. Package: yarp-nwc-yarp-localization2d -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2978,7 +2978,7 @@ This package contains the localization2D_nwc_yarp device plugin. Package: yarp-nws-ros-map2d -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -2997,7 +2997,7 @@ This package contains the map2D_nws_ros device plugin. Package: yarp-nws-yarp-map2d -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -3016,7 +3016,7 @@ This package contains the map2D_nws_yarp device plugin. Package: yarp-nwc-yarp-map2d -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -3035,7 +3035,7 @@ This package contains the map2D_nwc_yarp device plugin. Package: yarp-nws-ros-mobilebasevelocitycontrol -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -3054,7 +3054,7 @@ This package contains the mobileBaseVelocityControl_nws_ros device plugin. Package: yarp-nws-yarp-mobilebasevelocitycontrol -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -3073,7 +3073,7 @@ This package contains the mobileBaseVelocityControl_nws_yarp device plugin. Package: yarp-nwc-yarp-mobilebasevelocitycontrol -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -3092,7 +3092,7 @@ This package contains the mobileBaseVelocityControl_nwc_yarp device plugin. Package: yarp-nws-yarp-navigation2d -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -3111,7 +3111,7 @@ This package contains the navigation2D_nws_yarp device plugin. Package: yarp-nwc-yarp-navigation2d -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -3130,7 +3130,7 @@ This package contains the navigation2D_nwc_yarp device plugin. Package: yarp-nws-ros-odometry2d -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -3149,7 +3149,7 @@ This package contains the odometry2D_nws_ros device plugin. Package: yarp-nws-yarp-odometry2d -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -3168,7 +3168,7 @@ This package contains the odometry2D_nws_yarp device plugin. Package: yarp-nws-ros-rangefinder2d -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -3187,7 +3187,7 @@ This package contains the rangeFinder2D_nws_ros device plugin. Package: yarp-nws-yarp-rangefinder2d -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -3206,7 +3206,7 @@ This package contains the rangeFinder2D_nws_yarp device plugin. Package: yarp-nws-ros-rgbdsensor -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -3225,7 +3225,7 @@ This package contains the rgbdSensor_nws_ros device plugin. Package: yarp-nws-yarp-rgbdsensor -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -3244,7 +3244,7 @@ This package contains the rgbdSensor_nws_yarp device plugin. Package: yarp-nws-ros-rgbdtopointcloudsensor -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -3263,7 +3263,7 @@ This package contains the rgbdToPointCloudSensor_nws_ros device plugin. Package: yarp-nws-ros-controlboard -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -3282,7 +3282,7 @@ This package contains the controlBoard_nws_ros device plugin. Package: yarp-nws-yarp-controlboard -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -3301,7 +3301,7 @@ This package contains the controlBoard_nws_yarp device plugin. Package: yarp-nws-ros-framegrabber -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -3320,7 +3320,7 @@ This package contains the frameGrabber_nws_ros device plugin. Package: yarp-nws-yarp-framegrabber -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -3339,7 +3339,7 @@ This package contains the frameGrabber_nws_yarp device plugin. Package: yarp-nwc-yarp-framegrabber -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Enhances: yarp @@ -3359,7 +3359,7 @@ ##################### PORTMONITORS Package: yarp-portmonitor-bottlecompressionzlib -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, yarp-carrier-portmonitor (= ${binary:Version}) @@ -3379,7 +3379,7 @@ This package contains the bottle_compression_zlib portmonitor plugin. Package: yarp-portmonitor-depthimagecompressionzlib -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, yarp-carrier-portmonitor (= ${binary:Version}) @@ -3399,7 +3399,7 @@ This package contains the depthimage_compression_zlib portmonitor plugin. Package: yarp-portmonitor-depthimagetomono -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, yarp-carrier-portmonitor (= ${binary:Version}) @@ -3419,7 +3419,7 @@ This package contains the depthimage_to_mono portmonitor plugin. Package: yarp-portmonitor-depthimagetorgb -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, yarp-carrier-portmonitor (= ${binary:Version}) @@ -3439,7 +3439,7 @@ This package contains the depthimage_to_rgb portmonitor plugin. Package: yarp-portmonitor-imagecompressionffmpeg -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, yarp-carrier-portmonitor (= ${binary:Version}) @@ -3459,7 +3459,7 @@ This package contains the image_compression_ffmpeg portmonitor plugin. Package: yarp-portmonitor-rpcmonitor -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, yarp-carrier-portmonitor (= ${binary:Version}) @@ -3479,7 +3479,7 @@ This package contains the rpc_monitor portmonitor plugin. Package: yarp-portmonitor-segmentationimagetorgb -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, yarp-carrier-portmonitor (= ${binary:Version}) @@ -3499,7 +3499,7 @@ This package contains the segmentationimage_to_rgb portmonitor plugin. Package: yarp-portmonitor-sensormeasurementstovector -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, yarp-carrier-portmonitor (= ${binary:Version}) @@ -3519,7 +3519,7 @@ This package contains the sensorMeasurements_to_vector portmonitor plugin. Package: yarp-portmonitor-soundcompressionmp3 -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, yarp-carrier-portmonitor (= ${binary:Version}) @@ -3539,7 +3539,7 @@ This package contains the sound_compression_mp3 portmonitor plugin. Package: yarp-portmonitor-soundfilterresample -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends}, yarp-carrier-portmonitor (= ${binary:Version}) @@ -3560,7 +3560,7 @@ ##################### ROBOTTESTINGFRAMEWORK Package: robottestingframework-plugins-yarp -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Depends: ${misc:Depends}, ${shlibs:Depends} Description: middleware for humanoid robots - Robot Testing Framework plugins @@ -3579,7 +3579,7 @@ ##################### BINDINGS Package: libyarp-perl -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Multi-Arch: same Section: perl Depends: ${misc:Depends}, @@ -3602,7 +3602,7 @@ This package contains the Perl 5 bindings. Package: python3-yarp -Architecture: any +Architecture: amd64 arm64 armel armhf i386 Section: python Depends: ${misc:Depends}, ${shlibs:Depends}, diff -Nru yarp-3.6.0+ds1/debian/libyarp-dev3.symbols yarp-3.6.0+ds1/debian/libyarp-dev3.symbols --- yarp-3.6.0+ds1/debian/libyarp-dev3.symbols 2021-12-31 18:28:16.000000000 +0000 +++ yarp-3.6.0+ds1/debian/libyarp-dev3.symbols 2022-01-04 10:48:13.000000000 +0000 @@ -422,7 +422,7 @@ (c++)"yarp::dev::Map2DPathData::nested_write_description(yarp::os::idl::WireWriter const&) const@Base" 3.6.0 (c++)"yarp::dev::Map2DLocationData::write_description(yarp::os::idl::WireWriter const&) const@Base" 3.6.0 (c++)"yarp::dev::Map2DLocationData::nested_write_description(yarp::os::idl::WireWriter const&) const@Base" 3.6.0 - (c++)"yarp::dev::IJoypadEvent::joyData >& std::vector >, std::allocator > > >::emplace_back&>(unsigned int&, yarp::sig::VectorOf&)@Base" 3.6.0 + (c++|optional)"yarp::dev::IJoypadEvent::joyData >& std::vector >, std::allocator > > >::emplace_back&>(unsigned int&, yarp::sig::VectorOf&)@Base" 3.6.0 (c++)"typeinfo for yarp::dev::IFrameGrabber@Base" 3.6.0 (c++)"typeinfo for yarp::dev::WrapperSingle@Base" 3.6.0 (c++)"typeinfo for yarp::dev::IFrameGrabberOf >@Base" 3.6.0 @@ -1125,7 +1125,7 @@ (c++|optional)"typeinfo for yarp::dev::Nav2D::Map2DLocation@Base" 3.6.0 (c++)"typeinfo for yarp::dev::Nav2D::MapGrid2DInfo@Base" 3.6.0 (c++)"typeinfo for yarp::dev::Nav2D::IMap2D@Base" 3.6.0 - (c++)"typeinfo for yarp::dev::Nav2D::Map2DArea@Base" 3.6.0 + (c++|optional)"typeinfo for yarp::dev::Nav2D::Map2DArea@Base" 3.6.0 (c++|optional)"typeinfo for yarp::dev::Nav2D::Map2DPath@Base" 3.6.0 (c++)"typeinfo for yarp::dev::Nav2D::MapGrid2D@Base" 3.6.0 (c++)"typeinfo for yarp::dev::IMotor@Base" 3.6.0 @@ -1287,7 +1287,7 @@ (c++)"vtable for yarp::dev::ImplementVirtualAnalogSensor@Base" 3.6.0 (c++|optional)"vtable for yarp::dev::Nav2D::Map2DLocation@Base" 3.6.0 (c++)"vtable for yarp::dev::Nav2D::IMap2D@Base" 3.6.0 - (c++)"vtable for yarp::dev::Nav2D::Map2DArea@Base" 3.6.0 + (c++|optional)"vtable for yarp::dev::Nav2D::Map2DArea@Base" 3.6.0 (c++|optional)"vtable for yarp::dev::Nav2D::Map2DPath@Base" 3.6.0 (c++)"vtable for yarp::dev::Nav2D::MapGrid2D@Base" 3.6.0 (c++)"vtable for yarp::dev::Drivers@Base" 3.6.0 diff -Nru yarp-3.6.0+ds1/debian/patches/Import-catch2-v2.13.8.patch yarp-3.6.0+ds1/debian/patches/Import-catch2-v2.13.8.patch --- yarp-3.6.0+ds1/debian/patches/Import-catch2-v2.13.8.patch 1970-01-01 00:00:00.000000000 +0000 +++ yarp-3.6.0+ds1/debian/patches/Import-catch2-v2.13.8.patch 2022-01-04 10:48:13.000000000 +0000 @@ -0,0 +1,1069 @@ +From: "Daniele E. Domenichelli" +Date: Tue, 4 Jan 2022 07:52:15 +0100 +Subject: Import catch2 v2.13.8 + +Forwarded: not-needed +--- + extern/catch2/README.txt | 2 +- + extern/catch2/catch.hpp | 531 +++++++++++++++++++++++++++-------------------- + 2 files changed, 309 insertions(+), 224 deletions(-) + +diff --git a/extern/catch2/README.txt b/extern/catch2/README.txt +index c52108b..4b27eaf 100644 +--- a/extern/catch2/README.txt ++++ b/extern/catch2/README.txt +@@ -15,4 +15,4 @@ Copyright: 2010-2020 Two Blue Cubes Ltd + + License: BSL-1.0 + +-Version: 2.13.4 ++Version: 2.13.8 +diff --git a/extern/catch2/catch.hpp b/extern/catch2/catch.hpp +index 0384171..db1fed3 100644 +--- a/extern/catch2/catch.hpp ++++ b/extern/catch2/catch.hpp +@@ -1,9 +1,9 @@ + /* +- * Catch v2.13.4 +- * Generated: 2020-12-29 14:48:00.116107 ++ * Catch v2.13.8 ++ * Generated: 2022-01-03 21:20:09.589503 + * ---------------------------------------------------------- + * This file has been merged from multiple headers. Please don't edit it directly +- * Copyright (c) 2020 Two Blue Cubes Ltd. All rights reserved. ++ * Copyright (c) 2022 Two Blue Cubes Ltd. All rights reserved. + * + * Distributed under the Boost Software License, Version 1.0. (See accompanying + * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) +@@ -15,7 +15,7 @@ + + #define CATCH_VERSION_MAJOR 2 + #define CATCH_VERSION_MINOR 13 +-#define CATCH_VERSION_PATCH 4 ++#define CATCH_VERSION_PATCH 8 + + #ifdef __clang__ + # pragma clang system_header +@@ -66,13 +66,16 @@ + #if !defined(CATCH_CONFIG_IMPL_ONLY) + // start catch_platform.h + ++// See e.g.: ++// https://opensource.apple.com/source/CarbonHeaders/CarbonHeaders-18.1/TargetConditionals.h.auto.html + #ifdef __APPLE__ +-# include +-# if TARGET_OS_OSX == 1 +-# define CATCH_PLATFORM_MAC +-# elif TARGET_OS_IPHONE == 1 +-# define CATCH_PLATFORM_IPHONE +-# endif ++# include ++# if (defined(TARGET_OS_OSX) && TARGET_OS_OSX == 1) || \ ++ (defined(TARGET_OS_MAC) && TARGET_OS_MAC == 1) ++# define CATCH_PLATFORM_MAC ++# elif (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE == 1) ++# define CATCH_PLATFORM_IPHONE ++# endif + + #elif defined(linux) || defined(__linux) || defined(__linux__) + # define CATCH_PLATFORM_LINUX +@@ -132,9 +135,9 @@ namespace Catch { + + #endif + +-// We have to avoid both ICC and Clang, because they try to mask themselves +-// as gcc, and we want only GCC in this block +-#if defined(__GNUC__) && !defined(__clang__) && !defined(__ICC) && !defined(__CUDACC__) ++// Only GCC compiler should be used in this block, so other compilers trying to ++// mask themselves as GCC should be ignored. ++#if defined(__GNUC__) && !defined(__clang__) && !defined(__ICC) && !defined(__CUDACC__) && !defined(__LCC__) + # define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "GCC diagnostic push" ) + # define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION _Pragma( "GCC diagnostic pop" ) + +@@ -237,9 +240,6 @@ namespace Catch { + // Visual C++ + #if defined(_MSC_VER) + +-# define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION __pragma( warning(push) ) +-# define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION __pragma( warning(pop) ) +- + // Universal Windows platform does not support SEH + // Or console colours (or console at all...) + # if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) +@@ -248,13 +248,18 @@ namespace Catch { + # define CATCH_INTERNAL_CONFIG_WINDOWS_SEH + # endif + ++# if !defined(__clang__) // Handle Clang masquerading for msvc ++ + // MSVC traditional preprocessor needs some workaround for __VA_ARGS__ + // _MSVC_TRADITIONAL == 0 means new conformant preprocessor + // _MSVC_TRADITIONAL == 1 means old traditional non-conformant preprocessor +-# if !defined(__clang__) // Handle Clang masquerading for msvc + # if !defined(_MSVC_TRADITIONAL) || (defined(_MSVC_TRADITIONAL) && _MSVC_TRADITIONAL) + # define CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR + # endif // MSVC_TRADITIONAL ++ ++// Only do this if we're not using clang on Windows, which uses `diagnostic push` & `diagnostic pop` ++# define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION __pragma( warning(push) ) ++# define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION __pragma( warning(pop) ) + # endif // __clang__ + + #endif // _MSC_VER +@@ -323,7 +328,7 @@ namespace Catch { + // Check if byte is available and usable + # if __has_include() && defined(CATCH_CPP17_OR_GREATER) + # include +- # if __cpp_lib_byte > 0 ++ # if defined(__cpp_lib_byte) && (__cpp_lib_byte > 0) + # define CATCH_INTERNAL_CONFIG_CPP17_BYTE + # endif + # endif // __has_include() && defined(CATCH_CPP17_OR_GREATER) +@@ -1007,34 +1012,34 @@ struct AutoReg : NonCopyable { + + #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR + #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \ +- INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ ) ++ INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ ) + #else + #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \ +- INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ ) ) ++ INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ ) ) + #endif + + #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR + #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \ +- INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ ) ++ INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ ) + #else + #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \ +- INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ ) ) ++ INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ ) ) + #endif + + #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR + #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \ +- INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) ++ INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) + #else + #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \ +- INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) ) ++ INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) ) + #endif + + #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR + #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \ +- INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) ++ INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) + #else + #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \ +- INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) ) ++ INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) ) + #endif + #endif + +@@ -1047,7 +1052,7 @@ struct AutoReg : NonCopyable { + CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \ + static void TestName() + #define INTERNAL_CATCH_TESTCASE( ... ) \ +- INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), __VA_ARGS__ ) ++ INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), __VA_ARGS__ ) + + /////////////////////////////////////////////////////////////////////////////// + #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, ... ) \ +@@ -1069,7 +1074,7 @@ struct AutoReg : NonCopyable { + CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \ + void TestName::test() + #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, ... ) \ +- INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), ClassName, __VA_ARGS__ ) ++ INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), ClassName, __VA_ARGS__ ) + + /////////////////////////////////////////////////////////////////////////////// + #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, ... ) \ +@@ -1110,18 +1115,18 @@ struct AutoReg : NonCopyable { + + #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR + #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \ +- INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ ) ++ INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ ) + #else + #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \ +- INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ ) ) ++ INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ ) ) + #endif + + #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR + #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \ +- INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ ) ++ INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ ) + #else + #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \ +- INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ ) ) ++ INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ ) ) + #endif + + #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(TestName, TestFuncName, Name, Tags, Signature, TmplTypes, TypesList) \ +@@ -1159,18 +1164,18 @@ struct AutoReg : NonCopyable { + + #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR + #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\ +- INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename T,__VA_ARGS__) ++ INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename T,__VA_ARGS__) + #else + #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\ +- INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename T, __VA_ARGS__ ) ) ++ INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename T, __VA_ARGS__ ) ) + #endif + + #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR + #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\ +- INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__) ++ INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__) + #else + #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\ +- INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ ) ) ++ INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ ) ) + #endif + + #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2(TestName, TestFunc, Name, Tags, TmplList)\ +@@ -1201,7 +1206,7 @@ struct AutoReg : NonCopyable { + static void TestFunc() + + #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE(Name, Tags, TmplList) \ +- INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, TmplList ) ++ INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, TmplList ) + + #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, Signature, ... ) \ + CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \ +@@ -1234,18 +1239,18 @@ struct AutoReg : NonCopyable { + + #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR + #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \ +- INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) ++ INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) + #else + #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \ +- INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) ) ++ INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) ) + #endif + + #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR + #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \ +- INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) ++ INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) + #else + #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \ +- INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) ) ++ INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) ) + #endif + + #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2(TestNameClass, TestName, ClassName, Name, Tags, Signature, TmplTypes, TypesList)\ +@@ -1286,18 +1291,18 @@ struct AutoReg : NonCopyable { + + #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR + #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\ +- INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, typename T, __VA_ARGS__ ) ++ INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, typename T, __VA_ARGS__ ) + #else + #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\ +- INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, typename T,__VA_ARGS__ ) ) ++ INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, typename T,__VA_ARGS__ ) ) + #endif + + #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR + #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\ +- INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, Signature, __VA_ARGS__ ) ++ INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, Signature, __VA_ARGS__ ) + #else + #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\ +- INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, Signature,__VA_ARGS__ ) ) ++ INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, Signature,__VA_ARGS__ ) ) + #endif + + #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, TmplList) \ +@@ -1331,7 +1336,7 @@ struct AutoReg : NonCopyable { + void TestName::test() + + #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD(ClassName, Name, Tags, TmplList) \ +- INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, TmplList ) ++ INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, TmplList ) + + // end catch_test_registry.h + // start catch_capture.hpp +@@ -3088,7 +3093,7 @@ namespace Detail { + Approx operator-() const; + + template ::value>::type> +- Approx operator()( T const& value ) { ++ Approx operator()( T const& value ) const { + Approx approx( static_cast(value) ); + approx.m_epsilon = m_epsilon; + approx.m_margin = m_margin; +@@ -4160,7 +4165,7 @@ namespace Generators { + if (!m_predicate(m_generator.get())) { + // It might happen that there are no values that pass the + // filter. In that case we throw an exception. +- auto has_initial_value = next(); ++ auto has_initial_value = nextImpl(); + if (!has_initial_value) { + Catch::throw_exception(GeneratorException("No valid value found in filtered generator")); + } +@@ -4172,6 +4177,11 @@ namespace Generators { + } + + bool next() override { ++ return nextImpl(); ++ } ++ ++ private: ++ bool nextImpl() { + bool success = m_generator.next(); + if (!success) { + return false; +@@ -5455,6 +5465,8 @@ namespace Catch { + } // namespace Catch + + // end catch_outlier_classification.hpp ++ ++#include + #endif // CATCH_CONFIG_ENABLE_BENCHMARKING + + #include +@@ -6339,9 +6351,10 @@ namespace Catch { + + void writeTestCase(TestCaseNode const& testCaseNode); + +- void writeSection(std::string const& className, +- std::string const& rootName, +- SectionNode const& sectionNode); ++ void writeSection( std::string const& className, ++ std::string const& rootName, ++ SectionNode const& sectionNode, ++ bool testOkToFail ); + + void writeAssertions(SectionNode const& sectionNode); + void writeAssertion(AssertionStats const& stats); +@@ -6876,7 +6889,7 @@ namespace Catch { + } + iters *= 2; + } +- throw optimized_away_error{}; ++ Catch::throw_exception(optimized_away_error{}); + } + } // namespace Detail + } // namespace Benchmark +@@ -6884,6 +6897,7 @@ namespace Catch { + + // end catch_run_for_at_least.hpp + #include ++#include + + namespace Catch { + namespace Benchmark { +@@ -7054,8 +7068,8 @@ namespace Catch { + double b2 = bias - z1; + double a1 = a(b1); + double a2 = a(b2); +- auto lo = std::max(cumn(a1), 0); +- auto hi = std::min(cumn(a2), n - 1); ++ auto lo = (std::max)(cumn(a1), 0); ++ auto hi = (std::min)(cumn(a2), n - 1); + + return { point, resample[lo], resample[hi], confidence_level }; + } +@@ -7124,7 +7138,9 @@ namespace Catch { + } + template + EnvironmentEstimate> estimate_clock_cost(FloatDuration resolution) { +- auto time_limit = std::min(resolution * clock_cost_estimation_tick_limit, FloatDuration(clock_cost_estimation_time_limit)); ++ auto time_limit = (std::min)( ++ resolution * clock_cost_estimation_tick_limit, ++ FloatDuration(clock_cost_estimation_time_limit)); + auto time_clock = [](int k) { + return Detail::measure([k] { + for (int i = 0; i < k; ++i) { +@@ -7771,7 +7787,7 @@ namespace Catch { + double sb = stddev.point; + double mn = mean.point / n; + double mg_min = mn / 2.; +- double sg = std::min(mg_min / 4., sb / std::sqrt(n)); ++ double sg = (std::min)(mg_min / 4., sb / std::sqrt(n)); + double sg2 = sg * sg; + double sb2 = sb * sb; + +@@ -7790,7 +7806,7 @@ namespace Catch { + return (nc / n) * (sb2 - nc * sg2); + }; + +- return std::min(var_out(1), var_out(std::min(c_max(0.), c_max(mg_min)))) / sb2; ++ return (std::min)(var_out(1), var_out((std::min)(c_max(0.), c_max(mg_min)))) / sb2; + } + + bootstrap_analysis analyse_samples(double confidence_level, int n_resamples, std::vector::iterator first, std::vector::iterator last) { +@@ -7980,86 +7996,58 @@ namespace Catch { + + // start catch_fatal_condition.h + +-// start catch_windows_h_proxy.h +- +- +-#if defined(CATCH_PLATFORM_WINDOWS) +- +-#if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX) +-# define CATCH_DEFINED_NOMINMAX +-# define NOMINMAX +-#endif +-#if !defined(WIN32_LEAN_AND_MEAN) && !defined(CATCH_CONFIG_NO_WIN32_LEAN_AND_MEAN) +-# define CATCH_DEFINED_WIN32_LEAN_AND_MEAN +-# define WIN32_LEAN_AND_MEAN +-#endif +- +-#ifdef __AFXDLL +-#include +-#else +-#include +-#endif +- +-#ifdef CATCH_DEFINED_NOMINMAX +-# undef NOMINMAX +-#endif +-#ifdef CATCH_DEFINED_WIN32_LEAN_AND_MEAN +-# undef WIN32_LEAN_AND_MEAN +-#endif +- +-#endif // defined(CATCH_PLATFORM_WINDOWS) +- +-// end catch_windows_h_proxy.h +-#if defined( CATCH_CONFIG_WINDOWS_SEH ) ++#include + + namespace Catch { + +- struct FatalConditionHandler { +- +- static LONG CALLBACK handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo); ++ // Wrapper for platform-specific fatal error (signals/SEH) handlers ++ // ++ // Tries to be cooperative with other handlers, and not step over ++ // other handlers. This means that unknown structured exceptions ++ // are passed on, previous signal handlers are called, and so on. ++ // ++ // Can only be instantiated once, and assumes that once a signal ++ // is caught, the binary will end up terminating. Thus, there ++ class FatalConditionHandler { ++ bool m_started = false; ++ ++ // Install/disengage implementation for specific platform. ++ // Should be if-defed to work on current platform, can assume ++ // engage-disengage 1:1 pairing. ++ void engage_platform(); ++ void disengage_platform(); ++ public: ++ // Should also have platform-specific implementations as needed + FatalConditionHandler(); +- static void reset(); + ~FatalConditionHandler(); + +- private: +- static bool isSet; +- static ULONG guaranteeSize; +- static PVOID exceptionHandlerHandle; +- }; +- +-} // namespace Catch +- +-#elif defined ( CATCH_CONFIG_POSIX_SIGNALS ) +- +-#include +- +-namespace Catch { +- +- struct FatalConditionHandler { +- +- static bool isSet; +- static struct sigaction oldSigActions[]; +- static stack_t oldSigStack; +- static char altStackMem[]; +- +- static void handleSignal( int sig ); ++ void engage() { ++ assert(!m_started && "Handler cannot be installed twice."); ++ m_started = true; ++ engage_platform(); ++ } + +- FatalConditionHandler(); +- ~FatalConditionHandler(); +- static void reset(); ++ void disengage() { ++ assert(m_started && "Handler cannot be uninstalled without being installed first"); ++ m_started = false; ++ disengage_platform(); ++ } + }; + +-} // namespace Catch +- +-#else +- +-namespace Catch { +- struct FatalConditionHandler { +- void reset(); ++ //! Simple RAII guard for (dis)engaging the FatalConditionHandler ++ class FatalConditionHandlerGuard { ++ FatalConditionHandler* m_handler; ++ public: ++ FatalConditionHandlerGuard(FatalConditionHandler* handler): ++ m_handler(handler) { ++ m_handler->engage(); ++ } ++ ~FatalConditionHandlerGuard() { ++ m_handler->disengage(); ++ } + }; +-} + +-#endif ++} // end namespace Catch + + // end catch_fatal_condition.h + #include +@@ -8185,6 +8173,7 @@ namespace Catch { + std::vector m_unfinishedSections; + std::vector m_activeSections; + TrackerContext m_trackerContext; ++ FatalConditionHandler m_fatalConditionhandler; + bool m_lastAssertionPassed = false; + bool m_shouldReportUnexpected = true; + bool m_includeSuccessfulResults; +@@ -10057,6 +10046,36 @@ namespace Catch { + } + + // end catch_errno_guard.h ++// start catch_windows_h_proxy.h ++ ++ ++#if defined(CATCH_PLATFORM_WINDOWS) ++ ++#if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX) ++# define CATCH_DEFINED_NOMINMAX ++# define NOMINMAX ++#endif ++#if !defined(WIN32_LEAN_AND_MEAN) && !defined(CATCH_CONFIG_NO_WIN32_LEAN_AND_MEAN) ++# define CATCH_DEFINED_WIN32_LEAN_AND_MEAN ++# define WIN32_LEAN_AND_MEAN ++#endif ++ ++#ifdef __AFXDLL ++#include ++#else ++#include ++#endif ++ ++#ifdef CATCH_DEFINED_NOMINMAX ++# undef NOMINMAX ++#endif ++#ifdef CATCH_DEFINED_WIN32_LEAN_AND_MEAN ++# undef WIN32_LEAN_AND_MEAN ++#endif ++ ++#endif // defined(CATCH_PLATFORM_WINDOWS) ++ ++// end catch_windows_h_proxy.h + #include + + namespace Catch { +@@ -10573,7 +10592,7 @@ namespace Catch { + // Extracts the actual name part of an enum instance + // In other words, it returns the Blue part of Bikeshed::Colour::Blue + StringRef extractInstanceName(StringRef enumInstance) { +- // Find last occurence of ":" ++ // Find last occurrence of ":" + size_t name_start = enumInstance.size(); + while (name_start > 0 && enumInstance[name_start - 1] != ':') { + --name_start; +@@ -10735,25 +10754,47 @@ namespace Catch { + // end catch_exception_translator_registry.cpp + // start catch_fatal_condition.cpp + +-#if defined(__GNUC__) +-# pragma GCC diagnostic push +-# pragma GCC diagnostic ignored "-Wmissing-field-initializers" +-#endif ++#include ++ ++#if !defined( CATCH_CONFIG_WINDOWS_SEH ) && !defined( CATCH_CONFIG_POSIX_SIGNALS ) ++ ++namespace Catch { ++ ++ // If neither SEH nor signal handling is required, the handler impls ++ // do not have to do anything, and can be empty. ++ void FatalConditionHandler::engage_platform() {} ++ void FatalConditionHandler::disengage_platform() {} ++ FatalConditionHandler::FatalConditionHandler() = default; ++ FatalConditionHandler::~FatalConditionHandler() = default; ++ ++} // end namespace Catch ++ ++#endif // !CATCH_CONFIG_WINDOWS_SEH && !CATCH_CONFIG_POSIX_SIGNALS ++ ++#if defined( CATCH_CONFIG_WINDOWS_SEH ) && defined( CATCH_CONFIG_POSIX_SIGNALS ) ++#error "Inconsistent configuration: Windows' SEH handling and POSIX signals cannot be enabled at the same time" ++#endif // CATCH_CONFIG_WINDOWS_SEH && CATCH_CONFIG_POSIX_SIGNALS + + #if defined( CATCH_CONFIG_WINDOWS_SEH ) || defined( CATCH_CONFIG_POSIX_SIGNALS ) + + namespace { +- // Report the error condition ++ //! Signals fatal error message to the run context + void reportFatal( char const * const message ) { + Catch::getCurrentContext().getResultCapture()->handleFatalErrorCondition( message ); + } +-} + +-#endif // signals/SEH handling ++ //! Minimal size Catch2 needs for its own fatal error handling. ++ //! Picked anecdotally, so it might not be sufficient on all ++ //! platforms, and for all configurations. ++ constexpr std::size_t minStackSizeForErrors = 32 * 1024; ++} // end unnamed namespace ++ ++#endif // CATCH_CONFIG_WINDOWS_SEH || CATCH_CONFIG_POSIX_SIGNALS + + #if defined( CATCH_CONFIG_WINDOWS_SEH ) + + namespace Catch { ++ + struct SignalDefs { DWORD id; const char* name; }; + + // There is no 1-1 mapping between signals and windows exceptions. +@@ -10766,7 +10807,7 @@ namespace Catch { + { static_cast(EXCEPTION_INT_DIVIDE_BY_ZERO), "Divide by zero error" }, + }; + +- LONG CALLBACK FatalConditionHandler::handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo) { ++ static LONG CALLBACK handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo) { + for (auto const& def : signalDefs) { + if (ExceptionInfo->ExceptionRecord->ExceptionCode == def.id) { + reportFatal(def.name); +@@ -10777,38 +10818,50 @@ namespace Catch { + return EXCEPTION_CONTINUE_SEARCH; + } + ++ // Since we do not support multiple instantiations, we put these ++ // into global variables and rely on cleaning them up in outlined ++ // constructors/destructors ++ static PVOID exceptionHandlerHandle = nullptr; ++ ++ // For MSVC, we reserve part of the stack memory for handling ++ // memory overflow structured exception. + FatalConditionHandler::FatalConditionHandler() { +- isSet = true; +- // 32k seems enough for Catch to handle stack overflow, +- // but the value was found experimentally, so there is no strong guarantee +- guaranteeSize = 32 * 1024; +- exceptionHandlerHandle = nullptr; ++ ULONG guaranteeSize = static_cast(minStackSizeForErrors); ++ if (!SetThreadStackGuarantee(&guaranteeSize)) { ++ // We do not want to fully error out, because needing ++ // the stack reserve should be rare enough anyway. ++ Catch::cerr() ++ << "Failed to reserve piece of stack." ++ << " Stack overflows will not be reported successfully."; ++ } ++ } ++ ++ // We do not attempt to unset the stack guarantee, because ++ // Windows does not support lowering the stack size guarantee. ++ FatalConditionHandler::~FatalConditionHandler() = default; ++ ++ void FatalConditionHandler::engage_platform() { + // Register as first handler in current chain + exceptionHandlerHandle = AddVectoredExceptionHandler(1, handleVectoredException); +- // Pass in guarantee size to be filled +- SetThreadStackGuarantee(&guaranteeSize); ++ if (!exceptionHandlerHandle) { ++ CATCH_RUNTIME_ERROR("Could not register vectored exception handler"); ++ } + } + +- void FatalConditionHandler::reset() { +- if (isSet) { +- RemoveVectoredExceptionHandler(exceptionHandlerHandle); +- SetThreadStackGuarantee(&guaranteeSize); +- exceptionHandlerHandle = nullptr; +- isSet = false; ++ void FatalConditionHandler::disengage_platform() { ++ if (!RemoveVectoredExceptionHandler(exceptionHandlerHandle)) { ++ CATCH_RUNTIME_ERROR("Could not unregister vectored exception handler"); + } ++ exceptionHandlerHandle = nullptr; + } + +- FatalConditionHandler::~FatalConditionHandler() { +- reset(); +- } ++} // end namespace Catch + +-bool FatalConditionHandler::isSet = false; +-ULONG FatalConditionHandler::guaranteeSize = 0; +-PVOID FatalConditionHandler::exceptionHandlerHandle = nullptr; ++#endif // CATCH_CONFIG_WINDOWS_SEH + +-} // namespace Catch ++#if defined( CATCH_CONFIG_POSIX_SIGNALS ) + +-#elif defined( CATCH_CONFIG_POSIX_SIGNALS ) ++#include + + namespace Catch { + +@@ -10817,10 +10870,6 @@ namespace Catch { + const char* name; + }; + +- // 32kb for the alternate stack seems to be sufficient. However, this value +- // is experimentally determined, so that's not guaranteed. +- static constexpr std::size_t sigStackSize = 32768 >= MINSIGSTKSZ ? 32768 : MINSIGSTKSZ; +- + static SignalDefs signalDefs[] = { + { SIGINT, "SIGINT - Terminal interrupt signal" }, + { SIGILL, "SIGILL - Illegal instruction signal" }, +@@ -10830,7 +10879,32 @@ namespace Catch { + { SIGABRT, "SIGABRT - Abort (abnormal termination) signal" } + }; + +- void FatalConditionHandler::handleSignal( int sig ) { ++// Older GCCs trigger -Wmissing-field-initializers for T foo = {} ++// which is zero initialization, but not explicit. We want to avoid ++// that. ++#if defined(__GNUC__) ++# pragma GCC diagnostic push ++# pragma GCC diagnostic ignored "-Wmissing-field-initializers" ++#endif ++ ++ static char* altStackMem = nullptr; ++ static std::size_t altStackSize = 0; ++ static stack_t oldSigStack{}; ++ static struct sigaction oldSigActions[sizeof(signalDefs) / sizeof(SignalDefs)]{}; ++ ++ static void restorePreviousSignalHandlers() { ++ // We set signal handlers back to the previous ones. Hopefully ++ // nobody overwrote them in the meantime, and doesn't expect ++ // their signal handlers to live past ours given that they ++ // installed them after ours.. ++ for (std::size_t i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) { ++ sigaction(signalDefs[i].id, &oldSigActions[i], nullptr); ++ } ++ // Return the old stack ++ sigaltstack(&oldSigStack, nullptr); ++ } ++ ++ static void handleSignal( int sig ) { + char const * name = ""; + for (auto const& def : signalDefs) { + if (sig == def.id) { +@@ -10838,16 +10912,33 @@ namespace Catch { + break; + } + } +- reset(); +- reportFatal(name); ++ // We need to restore previous signal handlers and let them do ++ // their thing, so that the users can have the debugger break ++ // when a signal is raised, and so on. ++ restorePreviousSignalHandlers(); ++ reportFatal( name ); + raise( sig ); + } + + FatalConditionHandler::FatalConditionHandler() { +- isSet = true; ++ assert(!altStackMem && "Cannot initialize POSIX signal handler when one already exists"); ++ if (altStackSize == 0) { ++ altStackSize = std::max(static_cast(SIGSTKSZ), minStackSizeForErrors); ++ } ++ altStackMem = new char[altStackSize](); ++ } ++ ++ FatalConditionHandler::~FatalConditionHandler() { ++ delete[] altStackMem; ++ // We signal that another instance can be constructed by zeroing ++ // out the pointer. ++ altStackMem = nullptr; ++ } ++ ++ void FatalConditionHandler::engage_platform() { + stack_t sigStack; + sigStack.ss_sp = altStackMem; +- sigStack.ss_size = sigStackSize; ++ sigStack.ss_size = altStackSize; + sigStack.ss_flags = 0; + sigaltstack(&sigStack, &oldSigStack); + struct sigaction sa = { }; +@@ -10859,40 +10950,17 @@ namespace Catch { + } + } + +- FatalConditionHandler::~FatalConditionHandler() { +- reset(); +- } ++#if defined(__GNUC__) ++# pragma GCC diagnostic pop ++#endif + +- void FatalConditionHandler::reset() { +- if( isSet ) { +- // Set signals back to previous values -- hopefully nobody overwrote them in the meantime +- for( std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i ) { +- sigaction(signalDefs[i].id, &oldSigActions[i], nullptr); +- } +- // Return the old stack +- sigaltstack(&oldSigStack, nullptr); +- isSet = false; +- } ++ void FatalConditionHandler::disengage_platform() { ++ restorePreviousSignalHandlers(); + } + +- bool FatalConditionHandler::isSet = false; +- struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {}; +- stack_t FatalConditionHandler::oldSigStack = {}; +- char FatalConditionHandler::altStackMem[sigStackSize] = {}; +- +-} // namespace Catch +- +-#else +- +-namespace Catch { +- void FatalConditionHandler::reset() {} +-} +- +-#endif // signals/SEH handling ++} // end namespace Catch + +-#if defined(__GNUC__) +-# pragma GCC diagnostic pop +-#endif ++#endif // CATCH_CONFIG_POSIX_SIGNALS + // end catch_fatal_condition.cpp + // start catch_generators.cpp + +@@ -11447,7 +11515,8 @@ namespace { + return lhs == rhs; + } + +- auto ulpDiff = std::abs(lc - rc); ++ // static cast as a workaround for IBM XLC ++ auto ulpDiff = std::abs(static_cast(lc - rc)); + return static_cast(ulpDiff) <= maxUlpDiff; + } + +@@ -11621,7 +11690,6 @@ Floating::WithinRelMatcher WithinRel(float target) { + + } // namespace Matchers + } // namespace Catch +- + // end catch_matchers_floating.cpp + // start catch_matchers_generic.cpp + +@@ -12955,9 +13023,8 @@ namespace Catch { + } + + void RunContext::invokeActiveTestCase() { +- FatalConditionHandler fatalConditionHandler; // Handle signals ++ FatalConditionHandlerGuard _(&m_fatalConditionhandler); + m_activeTestCase->invoke(); +- fatalConditionHandler.reset(); + } + + void RunContext::handleUnfinishedSections() { +@@ -15320,7 +15387,7 @@ namespace Catch { + } + + Version const& libraryVersion() { +- static Version version( 2, 13, 4, "", 0 ); ++ static Version version( 2, 13, 8, "", 0 ); + return version; + } + +@@ -16733,6 +16800,7 @@ CATCH_REGISTER_REPORTER("console", ConsoleReporter) + #include + #include + #include ++#include + + namespace Catch { + +@@ -16760,7 +16828,7 @@ namespace Catch { + #else + std::strftime(timeStamp, timeStampSize, fmt, timeInfo); + #endif +- return std::string(timeStamp); ++ return std::string(timeStamp, timeStampSize-1); + } + + std::string fileNameTag(const std::vector &tags) { +@@ -16771,6 +16839,17 @@ namespace Catch { + return it->substr(1); + return std::string(); + } ++ ++ // Formats the duration in seconds to 3 decimal places. ++ // This is done because some genius defined Maven Surefire schema ++ // in a way that only accepts 3 decimal places, and tools like ++ // Jenkins use that schema for validation JUnit reporter output. ++ std::string formatDuration( double seconds ) { ++ ReusableStringStream rss; ++ rss << std::fixed << std::setprecision( 3 ) << seconds; ++ return rss.str(); ++ } ++ + } // anonymous namespace + + JunitReporter::JunitReporter( ReporterConfig const& _config ) +@@ -16840,7 +16919,7 @@ namespace Catch { + if( m_config->showDurations() == ShowDurations::Never ) + xml.writeAttribute( "time", "" ); + else +- xml.writeAttribute( "time", suiteTime ); ++ xml.writeAttribute( "time", formatDuration( suiteTime ) ); + xml.writeAttribute( "timestamp", getCurrentTimestamp() ); + + // Write properties if there are any +@@ -16885,12 +16964,13 @@ namespace Catch { + if ( !m_config->name().empty() ) + className = m_config->name() + "." + className; + +- writeSection( className, "", rootSection ); ++ writeSection( className, "", rootSection, stats.testInfo.okToFail() ); + } + +- void JunitReporter::writeSection( std::string const& className, +- std::string const& rootName, +- SectionNode const& sectionNode ) { ++ void JunitReporter::writeSection( std::string const& className, ++ std::string const& rootName, ++ SectionNode const& sectionNode, ++ bool testOkToFail) { + std::string name = trim( sectionNode.stats.sectionInfo.name ); + if( !rootName.empty() ) + name = rootName + '/' + name; +@@ -16907,13 +16987,18 @@ namespace Catch { + xml.writeAttribute( "classname", className ); + xml.writeAttribute( "name", name ); + } +- xml.writeAttribute( "time", ::Catch::Detail::stringify( sectionNode.stats.durationInSeconds ) ); ++ xml.writeAttribute( "time", formatDuration( sectionNode.stats.durationInSeconds ) ); + // This is not ideal, but it should be enough to mimic gtest's + // junit output. + // Ideally the JUnit reporter would also handle `skipTest` + // events and write those out appropriately. + xml.writeAttribute( "status", "run" ); + ++ if (sectionNode.stats.assertions.failedButOk) { ++ xml.scopedElement("skipped") ++ .writeAttribute("message", "TEST_CASE tagged with !mayfail"); ++ } ++ + writeAssertions( sectionNode ); + + if( !sectionNode.stdOut.empty() ) +@@ -16923,9 +17008,9 @@ namespace Catch { + } + for( auto const& childNode : sectionNode.childSections ) + if( className.empty() ) +- writeSection( name, "", *childNode ); ++ writeSection( name, "", *childNode, testOkToFail ); + else +- writeSection( className, name, *childNode ); ++ writeSection( className, name, *childNode, testOkToFail ); + } + + void JunitReporter::writeAssertions( SectionNode const& sectionNode ) { +@@ -17570,9 +17655,9 @@ int main (int argc, char * const argv[]) { + + #if defined(CATCH_CONFIG_ENABLE_BENCHMARKING) + #define CATCH_BENCHMARK(...) \ +- INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,)) ++ INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,)) + #define CATCH_BENCHMARK_ADVANCED(name) \ +- INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), name) ++ INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), name) + #endif // CATCH_CONFIG_ENABLE_BENCHMARKING + + // If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required +@@ -17674,9 +17759,9 @@ int main (int argc, char * const argv[]) { + + #if defined(CATCH_CONFIG_ENABLE_BENCHMARKING) + #define BENCHMARK(...) \ +- INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,)) ++ INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,)) + #define BENCHMARK_ADVANCED(name) \ +- INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), name) ++ INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), name) + #endif // CATCH_CONFIG_ENABLE_BENCHMARKING + + using Catch::Detail::Approx; +@@ -17723,8 +17808,8 @@ using Catch::Detail::Approx; + #define CATCH_WARN( msg ) (void)(0) + #define CATCH_CAPTURE( msg ) (void)(0) + +-#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ )) +-#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ )) ++#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ )) ++#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ )) + #define CATCH_METHOD_AS_TEST_CASE( method, ... ) + #define CATCH_REGISTER_TEST_CASE( Function, ... ) (void)(0) + #define CATCH_SECTION( ... ) +@@ -17733,7 +17818,7 @@ using Catch::Detail::Approx; + #define CATCH_FAIL_CHECK( ... ) (void)(0) + #define CATCH_SUCCEED( ... ) (void)(0) + +-#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ )) ++#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ )) + + #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR + #define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__) +@@ -17756,8 +17841,8 @@ using Catch::Detail::Approx; + #endif + + // "BDD-style" convenience wrappers +-#define CATCH_SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ )) +-#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), className ) ++#define CATCH_SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ )) ++#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), className ) + #define CATCH_GIVEN( desc ) + #define CATCH_AND_GIVEN( desc ) + #define CATCH_WHEN( desc ) +@@ -17807,8 +17892,8 @@ using Catch::Detail::Approx; + #define WARN( msg ) (void)(0) + #define CAPTURE( msg ) (void)(0) + +-#define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ )) +-#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ )) ++#define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ )) ++#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ )) + #define METHOD_AS_TEST_CASE( method, ... ) + #define REGISTER_TEST_CASE( Function, ... ) (void)(0) + #define SECTION( ... ) +@@ -17816,7 +17901,7 @@ using Catch::Detail::Approx; + #define FAIL( ... ) (void)(0) + #define FAIL_CHECK( ... ) (void)(0) + #define SUCCEED( ... ) (void)(0) +-#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ )) ++#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ )) + + #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR + #define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__) +@@ -17846,8 +17931,8 @@ using Catch::Detail::Approx; + #define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature ) + + // "BDD-style" convenience wrappers +-#define SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ) ) +-#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), className ) ++#define SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ) ) ++#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), className ) + + #define GIVEN( desc ) + #define AND_GIVEN( desc ) diff -Nru yarp-3.6.0+ds1/debian/patches/series yarp-3.6.0+ds1/debian/patches/series --- yarp-3.6.0+ds1/debian/patches/series 2021-12-31 18:28:16.000000000 +0000 +++ yarp-3.6.0+ds1/debian/patches/series 2022-01-04 10:48:13.000000000 +0000 @@ -3,3 +3,4 @@ Remove-cookie-consent-from-documentation.patch Fix-YARP_VERSION-number.patch Change-private-STATIC-external-libraries-into-OBJECT-libr.patch +Import-catch2-v2.13.8.patch