January 2022 - openSUSE Commits - openSUSE Mailing Lists

commit vpcs for openSUSE:Factory
by Source-Sync 31 Jan '22

31 Jan '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vpcs for openSUSE:Factory checked in at 2022-01-31 22:57:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vpcs (Old) and /work/SRC/openSUSE:Factory/.vpcs.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vpcs" Mon Jan 31 22:57:04 2022 rev:13 rq:950003 version:0.8.2 Changes: -------- --- /work/SRC/openSUSE:Factory/vpcs/vpcs.changes 2021-04-08 21:32:30.575829781 +0200 +++ /work/SRC/openSUSE:Factory/.vpcs.new.1898/vpcs.changes 2022-01-31 22:57:42.653424433 +0100 @@ -1,0 +2,8 @@ +Fri Jan 28 04:55:38 UTC 2022 - Avinesh Kumar <avinesh.kumar(a)suse.com> + +- update to 0.8.2: + * Fix IPv6 router advertisement parsing to accept options out-of-order + * fix failure to receive DHCP offer + * Remove possibility to run commands on host + +------------------------------------------------------------------- Old: ---- v0.8.1.tar.gz New: ---- v0.8.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vpcs.spec ++++++ --- /var/tmp/diff_new_pack.in1s3m/_old 2022-01-31 22:57:43.109421362 +0100 +++ /var/tmp/diff_new_pack.in1s3m/_new 2022-01-31 22:57:43.113421336 +0100 @@ -1,7 +1,7 @@ # # spec file for package vpcs # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: vpcs -Version: 0.8.1 +Version: 0.8.2 Release: 0 Summary: Virtual PC Simulator License: BSD-2-Clause ++++++ v0.8.1.tar.gz -> v0.8.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vpcs-0.8.1/.circleci/config.yml new/vpcs-0.8.2/.circleci/config.yml --- old/vpcs-0.8.1/.circleci/config.yml 2020-11-29 09:39:18.000000000 +0100 +++ new/vpcs-0.8.2/.circleci/config.yml 2021-08-23 03:16:07.000000000 +0200 @@ -3,7 +3,7 @@ jobs: build: macos: - xcode: "10.1.0" + xcode: "11.1.0" steps: - checkout diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vpcs-0.8.1/README.md new/vpcs-0.8.2/README.md --- old/vpcs-0.8.1/README.md 2020-11-29 09:39:18.000000000 +0100 +++ new/vpcs-0.8.2/README.md 2021-08-23 03:16:07.000000000 +0200 @@ -1,8 +1,5 @@ # VPCS -This is not the official VPCS repository and used only by GNS3 team to develop patch before sending them -to the VPCS team. -The latest VPCS release can be downloaded from http://sourceforge.net/projects/vpcs/files/ -##��Update git from offical SVN -git svn fetch -git svn rebase +This is a continuation of VPCS, based on the last development version and improved with patches wrote by various +people from the community. The original VPCS code, which is unfortunately not maintained anymore, can be viewed on +https://sourceforge.net/p/vpcs/code/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vpcs-0.8.1/man/vpcs.1 new/vpcs-0.8.2/man/vpcs.1 --- old/vpcs-0.8.1/man/vpcs.1 2020-11-29 09:39:18.000000000 +0100 +++ new/vpcs-0.8.2/man/vpcs.1 2021-08-23 03:16:07.000000000 +0200 @@ -115,9 +115,6 @@ \fB?\fR Print help .TP -\fB!\fR \fICOMMAND\fR [\fIARG\fR ...] -Invoke an OS \fiCOMMAND\fR with optional \fIARG(S)\fR as its arguments -.TP \fIdigit\fR Switch to the VPC\fIdigit\fR. \fIdigit\fR range 1 to 9 .TP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vpcs-0.8.1/src/command.c new/vpcs-0.8.2/src/command.c --- old/vpcs-0.8.1/src/command.c 2020-11-29 09:39:18.000000000 +0100 +++ new/vpcs-0.8.2/src/command.c 2021-08-23 03:16:07.000000000 +0200 @@ -2046,8 +2046,8 @@ if (num_pths > 1) fprintf(fp, "%d\n", i + 1); sprintf(buf, "VPCS[%d]", i + 1); - if (strncmp(vpc[i].xname, buf, MAX_NAMES_LEN)) - fprintf(fp, "set pcname %s\n", vpc[i].xname); + //if (strncmp(vpc[i].xname, buf, 6)) + fprintf(fp, "set pcname %s\n", vpc[i].xname); if (num_pths > 1) { if (vpc[i].lport != (20000 + i)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vpcs-0.8.1/src/help.c new/vpcs-0.8.2/src/help.c --- old/vpcs-0.8.1/src/help.c 2020-11-29 09:39:18.000000000 +0100 +++ new/vpcs-0.8.2/src/help.c 2021-08-23 03:16:07.000000000 +0200 @@ -298,14 +298,6 @@ return 1; } -int help_shell(int argc, char **argv) -{ - esc_prn("\n{H!} {UCOMMAND} [{UARG} ...]\n" - " Invoke an OS command {UCOMMAND} with optional [{UARG} ...] as arguments\n"); - - return 1; -} - int help_show(int argc, char **argv) { char *harp[2] = { @@ -457,9 +449,8 @@ int run_help(int argc, char **argv) { esc_prn("\n" - "{H?} Print help\n" - "{H!} {UCOMMAND} [{UARG} ...] Invoke an OS {UCOMMAND} with optional {UARG(s)}\n"); - + "{H?} Print help\n"); + if (num_pths > 1) { esc_prn("{Udigit} Switch to the VPC{Udigit}. " "{Udigit} range 1 to %d\n", num_pths); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vpcs-0.8.1/src/help.h new/vpcs-0.8.2/src/help.h --- old/vpcs-0.8.1/src/help.h 2020-11-29 09:39:18.000000000 +0100 +++ new/vpcs-0.8.2/src/help.h 2021-08-23 03:16:07.000000000 +0200 @@ -42,7 +42,6 @@ int help_rlogin(int argc, char **argv); int help_save(int argc, char **argv); int help_set(int argc, char **argv); -int help_shell(int argc, char **argv); int help_show(int argc, char **argv); int help_shut(int argc, char **argv); int help_sleep(int argc, char **argv); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vpcs-0.8.1/src/packets.c new/vpcs-0.8.2/src/packets.c --- old/vpcs-0.8.1/src/packets.c 2020-11-29 09:39:18.000000000 +0100 +++ new/vpcs-0.8.2/src/packets.c 2021-08-23 03:16:07.000000000 +0200 @@ -133,7 +133,7 @@ char *data = NULL; ui = (udpiphdr *)ip; - if (IN_MULTICAST(ip->dip)) + if (IN_MULTICAST(ntohl(ip->dip))) return PKT_DROP; /* dhcp packet */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vpcs-0.8.1/src/packets6.c new/vpcs-0.8.2/src/packets6.c --- old/vpcs-0.8.1/src/packets6.c 2020-11-29 09:39:18.000000000 +0100 +++ new/vpcs-0.8.2/src/packets6.c 2021-08-23 03:16:07.000000000 +0200 @@ -262,6 +262,7 @@ ethdr *eh; ip6hdr *ip; icmp6hdr *icmp; + int setMtu = 0, setMac = 0; u_int32_t mtu = 0; char *p = NULL, *mac = NULL; ndrahdr *ndr = NULL; @@ -312,45 +313,45 @@ * 32-bits mtu */ - p = (char *)(ndr + 1); - - /* link-layer address */ - if (*p == 1 && *(p + 1) == 1) { - mac = p + 2; - p += 8; - } - /* mtu, skip it*/ - if (*p == 5 && *(p + 1) == 1) { - mtu = ntohl(*(u_int32_t *)(p + 4)); - p += 8; - } - /* prefix */ - if (*p == 3 && *(p + 1) == 4) { - int cidr; - cidr = *(p + 2); - if (pc->ip6.cidr == 0) { - memcpy(pc->ip6.ip.addr8, p + 16, 16); - pc->ip6.cidr = cidr; - - pc->ip6.ip.addr8[15] = pc->ip4.mac[5]; - pc->ip6.ip.addr8[14] = pc->ip4.mac[4]; - pc->ip6.ip.addr8[13] = pc->ip4.mac[3]; - pc->ip6.ip.addr8[12] = 0xfe; - pc->ip6.ip.addr8[11] = 0xff; - pc->ip6.ip.addr8[10] = pc->ip4.mac[2]; - pc->ip6.ip.addr8[9] = pc->ip4.mac[1]; - pc->ip6.ip.addr8[8] = (pc->ip4.mac[0] &0x20) ? - pc->ip4.mac[0] & 0xef : (pc->ip4.mac[0] | 0x20); - - pc->ip6.type = IP6TYPE_EUI64; - if (mtu != 0) - pc->mtu = mtu; - mtu = 0; - } - if (sameNet6((char *)pc->ip6.ip.addr8, p + 16, pc->ip6.cidr)) { - memcpy(pc->ip6.gmac, mac, 6); + for (p = (char *)(ndr + 1); + p < ((char*)icmp + ntohs(ip->ip6_plen)); + p += *(p + 1) * 8) + { + /* link-layer address */ + if (*p == 1 && *(p + 1) == 1) + mac = p + 2; + /* mtu */ + else if (*p == 5 && *(p + 1) == 1) + mtu = ntohl(*(u_int32_t *)(p + 4)); + /* prefix */ + else if (*p == 3 && *(p + 1) == 4) { + if (pc->ip6.cidr == 0) { + memcpy(pc->ip6.ip.addr8, p + 16, 16); + pc->ip6.cidr = *(p + 2); + + pc->ip6.ip.addr8[15] = pc->ip4.mac[5]; + pc->ip6.ip.addr8[14] = pc->ip4.mac[4]; + pc->ip6.ip.addr8[13] = pc->ip4.mac[3]; + pc->ip6.ip.addr8[12] = 0xfe; + pc->ip6.ip.addr8[11] = 0xff; + pc->ip6.ip.addr8[10] = pc->ip4.mac[2]; + pc->ip6.ip.addr8[9] = pc->ip4.mac[1]; + pc->ip6.ip.addr8[8] = (pc->ip4.mac[0] &0x20) ? + pc->ip4.mac[0] & 0xef : (pc->ip4.mac[0] | 0x20); + + pc->ip6.type = IP6TYPE_EUI64; + setMtu = 1; + } + if (sameNet6((char *)pc->ip6.ip.addr8, p + 16, pc->ip6.cidr)) + setMac = 1; } } + + if (setMtu != 0 && mtu != 0) + pc->mtu = mtu; + if (setMac != 0 && mac != NULL) + memcpy(pc->ip6.gmac, mac, 6); + return PKT_DROP; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vpcs-0.8.1/src/vpcs.c new/vpcs-0.8.2/src/vpcs.c --- old/vpcs-0.8.1/src/vpcs.c 2020-11-29 09:39:18.000000000 +0100 +++ new/vpcs-0.8.2/src/vpcs.c 2021-08-23 03:16:07.000000000 +0200 @@ -53,7 +53,7 @@ #include "dhcp.h" #include "frag6.h" -const char *ver = "0.8.1"; +const char *ver = "0.8.2"; /* track the binary */ static const char *ident = "$Id$"; @@ -99,7 +99,6 @@ static void sig_int(int sig); static void sig_clean(int sig); void clear_hist(void); -static int invoke_cmd(const char *); static void welcome(void); void usage(); @@ -358,22 +357,7 @@ fflush(stdout); return; } - - if (*cmdstr == '!') { - char *p = NULL; - if (strlen(cmdstr) > 1) { - p = cmdstr + 1; - while (*p== ' ' || *p == '\t') - p++; - - if (*p && strcmp(p, "?")) { - invoke_cmd(p); - return; - } - } - help_shell(0, NULL); - return; - } + pcmd = argv[0]; if (*pcmd == '@') { at = 1; @@ -719,20 +703,6 @@ return; } -static int -invoke_cmd(const char *cmd) -{ - int rc = 0; - -#ifdef cygwin - char str[1024]; - snprintf(str, sizeof(str), "%s /c %s", getenv("COMSPEC"), cmd); - rc = WinExec(str, SW_SHOW); -#else - rc = system(cmd); -#endif - return rc; -} void usage() {

1 0

commit hexchat for openSUSE:Factory
by Source-Sync 31 Jan '22

31 Jan '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package hexchat for openSUSE:Factory checked in at 2022-01-31 22:57:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hexchat (Old) and /work/SRC/openSUSE:Factory/.hexchat.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hexchat" Mon Jan 31 22:57:03 2022 rev:31 rq:949983 version:2.16.0 Changes: -------- --- /work/SRC/openSUSE:Factory/hexchat/hexchat.changes 2021-05-21 21:50:42.422061752 +0200 +++ /work/SRC/openSUSE:Factory/.hexchat.new.1898/hexchat.changes 2022-01-31 22:57:41.277433697 +0100 @@ -1,0 +2,24 @@ +Thu Oct 14 16:00:57 UTC 2021 - Predrag Ivanovi�� <predivan(a)mts.rs> + +- Update to 2.16.0 + * add support for IRCv3 SETNAME, invite-notify, account-tag, standard replies, and UTF8ONLY + * add support for strikethrough formatting + * update network list (including Libera.Chat as the default) + * fix text clipping issues by respecting font line height + * fix URLs not being escaped when opened + * fix misc IRC message parsing issues + * remove libnotify dependency on Linux, fixing hangs when notifications are shown + * remove libproxy dependency on Linux + * print ChanServ notices in the front tab by default + * fishlim: add support for CBC mode + * python: rewrite plugin in python with CFFI + This lowers memory usage and fixed conflicts with many C Python modules including pygobject +- Package changes: + - Update meson configuraion options + - Add python3-cffi as BuildRequires and Requires for python3 plugin package + - Drop 2559.patch and feature-add-libera-chat.patch (merged upstream) + - Drop libnotify and libproxy BuildRequires, as per upstream changes + - Drop hexchat.keyring, upstream no longer provides detached tarball signatures + (gh#hexchat/hexchat#2635) + +------------------------------------------------------------------- Old: ---- 2559.patch feature-add-libera-chat.patch hexchat-2.14.3.tar.xz hexchat-2.14.3.tar.xz.asc hexchat.keyring New: ---- hexchat-2.16.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hexchat.spec ++++++ --- /var/tmp/diff_new_pack.KOjHdt/_old 2022-01-31 22:57:41.849429846 +0100 +++ /var/tmp/diff_new_pack.KOjHdt/_new 2022-01-31 22:57:41.853429819 +0100 @@ -1,7 +1,7 @@ # # spec file for package hexchat # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: hexchat -Version: 2.14.3 +Version: 2.16.0 Release: 0 Summary: A graphical IRC (chat) client License: GPL-2.0-or-later @@ -25,20 +25,15 @@ URL: https://hexchat.github.io/ Source0: https://dl.%{name}.net/%{name}/%{name}-%{version}.tar.xz Source1: hexchat-migrate-sh -Source2: https://dl.%{name}.net/%{name}/%{name}-%{version}.tar.xz.asc -Source3: hexchat.keyring # PATCH-FEATURE-SLE migrate-configuration-from-xchat.patch tyang(a)suse.com fate#318480 -- replace xchat with hexchat Patch1: migrate-configuration-from-xchat.patch -# PATCH-FIX-UPSTREAM 2559.patch dimstar(a)opensuse.org -- fix segfault on lua_pop with Lua 5.4.3 -Patch2: https://patch-diff.githubusercontent.com/raw/hexchat/hexchat/pull/2559.patch -# https://github.com/hexchat/hexchat/commit/a25f2381689d2c2279a0e43b33f6c0ec8… -Patch3: feature-add-libera-chat.patch BuildRequires: hicolor-icon-theme BuildRequires: intltool BuildRequires: lua-devel BuildRequires: meson BuildRequires: pkgconfig -BuildRequires: python3-devel >= 3.8 +BuildRequires: python3-cffi +BuildRequires: python3-devel BuildRequires: perl(ExtUtils::Embed) BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gio-2.0) >= 2.34.0 @@ -46,9 +41,7 @@ BuildRequires: pkgconfig(gtk+-2.0) >= 2.24.0 BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(libcanberra) >= 0.22 -BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(libpci) -BuildRequires: pkgconfig(libproxy-1.0) BuildRequires: pkgconfig(openssl) >= 0.9.8 BuildRequires: pkgconfig(x11) Recommends: %{name}-lang @@ -93,6 +86,7 @@ %package plugins-python3 Summary: Plugin for HexChat adds support for Python3 scripts Group: System/Libraries +Requires: python3-cffi Provides: plugins-python = %{version} Obsoletes: plugins-python < %{version} @@ -106,18 +100,20 @@ %build %meson \ - -Dwith-gtk=true \ - -Dwith-ssl=true \ - -Dwith-dbus=true \ - -Dwith-libproxy=true \ - -Dwith-libnotify=true \ - -Dwith-libcanberra=true \ - -Dwith-plugin=true \ + -Dgtk-frontend=true \ + -Dtls=enabled \ + -Ddbus=enabled \ + -Dlibcanberra=enabled \ + -Dplugin=true \ -Dwith-checksum=true \ -Dwith-fishlim=true \ -Dwith-lua=lua \ -Dwith-perl=perl \ +%if 0%{?suse_version} >= 1599 -Dwith-python=python3-embed \ +%else + -Dwith-python=python3 \ +%endif -Dwith-sysinfo=true %meson_build @@ -132,6 +128,7 @@ %{_bindir}/%{name} %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/plugins +%dir %{_libdir}/%{name}/python %{_libdir}/hexchat/hexchat-migrate-sh %{_libdir}/%{name}/plugins/checksum.so %{_libdir}/%{name}/plugins/fishlim.so @@ -142,7 +139,7 @@ %dir %{_datadir}/metainfo/ %{_datadir}/metainfo/io.github.Hexchat.appdata.xml %{_datadir}/dbus-1/services/org.%{name}.service.service -%{_mandir}/man1/%{name}.1%{ext_man} +%{_mandir}/man1/%{name}.1%{?ext_man} %files devel %{_includedir}/%{name}-plugin.h @@ -156,6 +153,7 @@ %files plugins-python3 %{_libdir}/%{name}/plugins/python.so +%{_libdir}/%{name}/python/*.py %files lang -f %{name}.lang ++++++ hexchat-2.14.3.tar.xz -> hexchat-2.16.0.tar.xz ++++++ ++++ 72448 lines of diff (skipped)

1 0

commit primesieve for openSUSE:Factory
by Source-Sync 31 Jan '22

31 Jan '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package primesieve for openSUSE:Factory checked in at 2022-01-31 22:57:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/primesieve (Old) and /work/SRC/openSUSE:Factory/.primesieve.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "primesieve" Mon Jan 31 22:57:03 2022 rev:5 rq:949982 version:7.8 Changes: -------- --- /work/SRC/openSUSE:Factory/primesieve/primesieve.changes 2021-12-08 00:00:40.239550860 +0100 +++ /work/SRC/openSUSE:Factory/.primesieve.new.1898/primesieve.changes 2022-01-31 22:57:40.593438303 +0100 @@ -1,0 +2,8 @@ +Sun Jan 30 12:08:00 UTC 2022 - Kim Walisch <kim.walisch(a)gmail.com> + +- Update to primesieve-7.8 +- Improved pre-sieving, up to 10% speedup +- Improved primesieve::iterator, up to 15% speedup +- C++ refactoring: get rid of using namespace std + +------------------------------------------------------------------- Old: ---- primesieve-7.7.tar.gz New: ---- primesieve-7.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ primesieve.spec ++++++ --- /var/tmp/diff_new_pack.lAl4RU/_old 2022-01-31 22:57:41.057435179 +0100 +++ /var/tmp/diff_new_pack.lAl4RU/_new 2022-01-31 22:57:41.061435151 +0100 @@ -17,7 +17,7 @@ Name: primesieve -Version: 7.7 +Version: 7.8 Release: 0 Summary: A prime number generator License: BSD-2-Clause ++++++ primesieve-7.7.tar.gz -> primesieve-7.8.tar.gz ++++++ ++++ 5620 lines of diff (skipped)

1 0

commit python-sentry-sdk for openSUSE:Factory
by Source-Sync 31 Jan '22

31 Jan '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-sentry-sdk for openSUSE:Factory checked in at 2022-01-31 22:57:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-sentry-sdk (Old) and /work/SRC/openSUSE:Factory/.python-sentry-sdk.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-sentry-sdk" Mon Jan 31 22:57:02 2022 rev:19 rq:949979 version:1.5.4 Changes: -------- --- /work/SRC/openSUSE:Factory/python-sentry-sdk/python-sentry-sdk.changes 2021-11-20 02:40:28.592515576 +0100 +++ /work/SRC/openSUSE:Factory/.python-sentry-sdk.new.1898/python-sentry-sdk.changes 2022-01-31 22:57:39.937442719 +0100 @@ -1,0 +2,24 @@ +Sun Jan 30 11:20:25 UTC 2022 - ecsos <ecsos(a)opensuse.org> + +- Update to 1.5.4 + - Add Python 3.10 to test suite (#1309) + - Capture only 5xx HTTP errors in Falcon Integration (#1314) + - Attempt custom urlconf resolve in got_request_exception + as well (#1317) +- Update to 1.5.3 + - Pick up custom urlconf set by Django middlewares from request + if any (#1308) +- Update to 1.5.2 + - Record event_processor client reports #1281 + - Add a Quart integration #1248 + - Sanic v21.12 support #1292 + - Support Celery abstract tasks #1287 +- Update to 1.5.1 + - Fix django legacy url resolver regex substitution due to + upstream CVE-2021-44420 fix #1272 + - Record lost sample_rate events only if tracing is enabled #1268 + - Fix gevent version parsing for non-numeric parts #1243 + - Record span and breadcrumb when Django opens db connection #1250 +- Disable check test_leaks to build Leap. + +------------------------------------------------------------------- Old: ---- sentry-python-1.5.0.tar.gz New: ---- sentry-python-1.5.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-sentry-sdk.spec ++++++ --- /var/tmp/diff_new_pack.XnML4E/_old 2022-01-31 22:57:40.381439730 +0100 +++ /var/tmp/diff_new_pack.XnML4E/_new 2022-01-31 22:57:40.385439703 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-sentry-sdk # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ %define skip_python2 1 %define skip_python36 1 Name: python-sentry-sdk -Version: 1.5.0 +Version: 1.5.4 Release: 0 Summary: Python SDK for Sentry.io License: BSD-2-Clause @@ -112,10 +112,8 @@ export PYTEST_ADDOPTS="-W ignore::DeprecationWarning" # do not test integration: rm -r tests/integrations -# test_transport_works / test_transport_infinite_loop / test_simple_rate_limits/ test_data_category_limits / test_complex_limits_without_data_category stucks - # test_auto_enabling_integrations_catches_import_error asert False where False = ..., not sure -%pytest -k 'not (test_transport_works or test_auto_enabling_integrations_catches_import_error or test_filename or test_transport_infinite_loop or test_simple_rate_limits or test_data_category_limits or test_complex_limits_without_data_category)' +%pytest -k 'not (test_transport_works or test_auto_enabling_integrations_catches_import_error or test_filename or test_transport_infinite_loop or test_simple_rate_limits or test_data_category_limits or test_complex_limits_without_data_category or test_leaks)' %files %{python_files} %doc README.md CHANGELOG.md ++++++ sentry-python-1.5.0.tar.gz -> sentry-python-1.5.4.tar.gz ++++++ ++++ 2020 lines of diff (skipped)

1 0

commit iredis for openSUSE:Factory
by Source-Sync 31 Jan '22

31 Jan '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package iredis for openSUSE:Factory checked in at 2022-01-31 22:57:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iredis (Old) and /work/SRC/openSUSE:Factory/.iredis.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "iredis" Mon Jan 31 22:57:02 2022 rev:2 rq:949957 version:1.11.0 Changes: -------- --- /work/SRC/openSUSE:Factory/iredis/iredis.changes 2022-01-29 21:00:02.839494809 +0100 +++ /work/SRC/openSUSE:Factory/.iredis.new.1898/iredis.changes 2022-01-31 22:57:39.421446194 +0100 @@ -1,0 +2,5 @@ +Fri Jan 28 16:08:08 UTC 2022 - Sebastian Wagner <sebix+novell.com(a)sebix.at> + +- Skip a few failings tests (bugs upstream). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iredis.spec ++++++ --- /var/tmp/diff_new_pack.OWOGTH/_old 2022-01-31 22:57:39.825443474 +0100 +++ /var/tmp/diff_new_pack.OWOGTH/_new 2022-01-31 22:57:39.833443420 +0100 @@ -87,8 +87,8 @@ # the tests are extremely flaky on i586 (hitting timeouts)long as x86_64 succeeds, we don't care as this is noarch %ifnarch %ix86 %{_sbindir}/redis-server --port 6379 & -# skip test_abort_reading_connection as it fails frequently (timeout) on OBS for no apparent reason -REDIS_VERSION=$(%{_sbindir}/redis-server --version | grep -o '[0-9]' | head -n 1) PATH=${PATH:+$PATH:}%{buildroot}%{_bindir} PYTHONPATH=${PYTHONPATH:+$PYTHONPATH:}%{buildroot}%{python3_sitelib} PYTHONDONTWRITEBYTECODE=1 pytest --ignore=_build.python3 -vv -k 'not test_abort_reading_connection' +# skip test_abort_reading_connection as it fails frequently (timeout) on OBS for no apparent reason, others are bugs upstream: https://github.com/laixintao/iredis/issues/417 +REDIS_VERSION=$(%{_sbindir}/redis-server --version | grep -o '[0-9]' | head -n 1) PATH=${PATH:+$PATH:}%{buildroot}%{_bindir} PYTHONPATH=${PYTHONPATH:+$PYTHONPATH:}%{buildroot}%{python3_sitelib} PYTHONDONTWRITEBYTECODE=1 pytest --ignore=_build.python3 -vv -k 'not (test_abort_reading_connection or test_peek_set_fetch_part or test_peek_stream or test_timestamp_completer_humanize_time_completion)' killall redis-server %endif

1 0

commit skaffold for openSUSE:Factory
by Source-Sync 31 Jan '22

31 Jan '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package skaffold for openSUSE:Factory checked in at 2022-01-31 22:57:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/skaffold (Old) and /work/SRC/openSUSE:Factory/.skaffold.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "skaffold" Mon Jan 31 22:57:01 2022 rev:2 rq:949954 version:1.35.2 Changes: -------- --- /work/SRC/openSUSE:Factory/skaffold/skaffold.changes 2022-01-26 21:28:34.165336733 +0100 +++ /work/SRC/openSUSE:Factory/.skaffold.new.1898/skaffold.changes 2022-01-31 22:57:38.681451176 +0100 @@ -1,0 +2,5 @@ +Sat Jan 29 15:28:25 UTC 2022 - Bernhard Wiedemann <bwiedemann(a)suse.com> + +- Use fixed build date for reproducible builds (boo#1047218) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skaffold.spec ++++++ --- /var/tmp/diff_new_pack.5V76IS/_old 2022-01-31 22:57:39.265447244 +0100 +++ /var/tmp/diff_new_pack.5V76IS/_new 2022-01-31 22:57:39.273447190 +0100 @@ -36,10 +36,12 @@ %setup -q -T -D -a 1 %build +DATE_FMT="+%%Y-%%m-%%dT%%H:%%M:%%SZ" +BUILD_DATE=$(date -u -d "@${SOURCE_DATE_EPOCH}" "${DATE_FMT}" 2>/dev/null || date -u -r "${SOURCE_DATE_EPOCH}" "${DATE_FMT}" 2>/dev/null || date -u "${DATE_FMT}") go build \ -mod=vendor \ -buildmode=pie \ - -ldflags="-X github.com/GoogleContainerTools/skaffold/pkg/skaffold/version.version=%{ver… -X github.com/GoogleContainerTools/skaffold/pkg/skaffold/version.buildDate=$(d… --iso-8601)" \ + -ldflags="-X github.com/GoogleContainerTools/skaffold/pkg/skaffold/version.version=%{ver… -X github.com/GoogleContainerTools/skaffold/pkg/skaffold/version.buildDate=$BU…" \ -o bin/skaffold ./cmd/skaffold %install

1 0

commit os-autoinst for openSUSE:Factory
by Source-Sync 31 Jan '22

31 Jan '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package os-autoinst for openSUSE:Factory checked in at 2022-01-31 22:57:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/os-autoinst (Old) and /work/SRC/openSUSE:Factory/.os-autoinst.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "os-autoinst" Mon Jan 31 22:57:01 2022 rev:259 rq:949952 version:4.6.1643373757.e32e527c Changes: -------- --- /work/SRC/openSUSE:Factory/os-autoinst/os-autoinst.changes 2022-01-27 23:18:53.442180699 +0100 +++ /work/SRC/openSUSE:Factory/.os-autoinst.new.1898/os-autoinst.changes 2022-01-31 22:57:37.377459956 +0100 @@ -1,0 +2,11 @@ +Sun Jan 30 07:35:25 UTC 2022 - okurz(a)suse.com + +- Update to version 4.6.1643373757.e32e527c: + * Revert "svirt: Implement do_extract_assets" + * Revert "svirt: Store vmname early for use after test run" + * svirt: Store vmname early for use after test run + * Run openQA full-stack test as part of os-autoinst CI tests + * Add new variables in backend/generalhw.pm + * svirt: Implement do_extract_assets + +------------------------------------------------------------------- Old: ---- os-autoinst-4.6.1643273407.65ca16b7.obscpio New: ---- os-autoinst-4.6.1643373757.e32e527c.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ os-autoinst-test.spec ++++++ --- /var/tmp/diff_new_pack.5rMjU0/_old 2022-01-31 22:57:38.469452604 +0100 +++ /var/tmp/diff_new_pack.5rMjU0/_new 2022-01-31 22:57:38.473452577 +0100 @@ -19,7 +19,7 @@ %define name_ext -test %define short_name os-autoinst Name: %{short_name}%{?name_ext} -Version: 4.6.1643273407.65ca16b7 +Version: 4.6.1643373757.e32e527c Release: 0 Summary: test package for os-autoinst License: GPL-2.0-or-later ++++++ os-autoinst.spec ++++++ --- /var/tmp/diff_new_pack.5rMjU0/_old 2022-01-31 22:57:38.493452442 +0100 +++ /var/tmp/diff_new_pack.5rMjU0/_new 2022-01-31 22:57:38.497452415 +0100 @@ -17,7 +17,7 @@ Name: os-autoinst -Version: 4.6.1643273407.65ca16b7 +Version: 4.6.1643373757.e32e527c Release: 0 Summary: OS-level test automation License: GPL-2.0-or-later ++++++ os-autoinst-4.6.1643273407.65ca16b7.obscpio -> os-autoinst-4.6.1643373757.e32e527c.obscpio ++++++ /work/SRC/openSUSE:Factory/os-autoinst/os-autoinst-4.6.1643273407.65ca16b7.obscpio /work/SRC/openSUSE:Factory/.os-autoinst.new.1898/os-autoinst-4.6.1643373757.e32e527c.obscpio differ: char 50, line 1 ++++++ os-autoinst.obsinfo ++++++ --- /var/tmp/diff_new_pack.5rMjU0/_old 2022-01-31 22:57:38.553452038 +0100 +++ /var/tmp/diff_new_pack.5rMjU0/_new 2022-01-31 22:57:38.557452011 +0100 @@ -1,5 +1,5 @@ name: os-autoinst -version: 4.6.1643273407.65ca16b7 -mtime: 1643273407 -commit: 65ca16b7b3ddcbb74487e95d498454ff1b334b1b +version: 4.6.1643373757.e32e527c +mtime: 1643373757 +commit: e32e527c7da858dcfbbb90cdafa54c7a1037a1ff

1 0

commit openQA for openSUSE:Factory
by Source-Sync 31 Jan '22

31 Jan '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openQA for openSUSE:Factory checked in at 2022-01-31 22:57:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openQA (Old) and /work/SRC/openSUSE:Factory/.openQA.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openQA" Mon Jan 31 22:57:00 2022 rev:325 rq:949950 version:4.6.1643469400.853734877 Changes: -------- openQA-devel-test.changes: same change openQA-test.changes: same change openQA-worker-test.changes: same change --- /work/SRC/openSUSE:Factory/openQA/openQA.changes 2022-01-27 23:18:48.086217701 +0100 +++ /work/SRC/openSUSE:Factory/.openQA.new.1898/openQA.changes 2022-01-31 22:57:34.585478754 +0100 @@ -1,0 +2,13 @@ +Sun Jan 30 02:08:46 UTC 2022 - okurz(a)suse.com + +- Update to version 4.6.1643469400.853734877: + * Dependency cron 2022-01-29 + * Add more perl signatures + * Add more perl signatures + * Simplify code for assigning job settings in `create_from_settings` + * Use constant for referring to a job's main settings + * Allow changing job settings via restart API + * Check whether clones created by the restart API take over the group + * Use tidyall instead of custom implementation + +------------------------------------------------------------------- Old: ---- openQA-4.6.1643299616.01abba344.obscpio New: ---- openQA-4.6.1643469400.853734877.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openQA-client-test.spec ++++++ --- /var/tmp/diff_new_pack.xaevv5/_old 2022-01-31 22:57:35.761470837 +0100 +++ /var/tmp/diff_new_pack.xaevv5/_new 2022-01-31 22:57:35.769470783 +0100 @@ -18,7 +18,7 @@ %define short_name openQA-client Name: %{short_name}-test -Version: 4.6.1643299616.01abba344 +Version: 4.6.1643469400.853734877 Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later ++++++ openQA-devel-test.spec ++++++ --- /var/tmp/diff_new_pack.xaevv5/_old 2022-01-31 22:57:35.789470648 +0100 +++ /var/tmp/diff_new_pack.xaevv5/_new 2022-01-31 22:57:35.789470648 +0100 @@ -18,7 +18,7 @@ %define short_name openQA-devel Name: %{short_name}-test -Version: 4.6.1643299616.01abba344 +Version: 4.6.1643469400.853734877 Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later ++++++ openQA-test.spec ++++++ --- /var/tmp/diff_new_pack.xaevv5/_old 2022-01-31 22:57:35.809470513 +0100 +++ /var/tmp/diff_new_pack.xaevv5/_new 2022-01-31 22:57:35.813470486 +0100 @@ -18,7 +18,7 @@ %define short_name openQA Name: %{short_name}-test -Version: 4.6.1643299616.01abba344 +Version: 4.6.1643469400.853734877 Release: 0 Summary: Test package for openQA License: GPL-2.0-or-later ++++++ openQA-worker-test.spec ++++++ --- /var/tmp/diff_new_pack.xaevv5/_old 2022-01-31 22:57:35.833470352 +0100 +++ /var/tmp/diff_new_pack.xaevv5/_new 2022-01-31 22:57:35.837470325 +0100 @@ -18,7 +18,7 @@ %define short_name openQA-worker Name: %{short_name}-test -Version: 4.6.1643299616.01abba344 +Version: 4.6.1643469400.853734877 Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later ++++++ openQA.spec ++++++ --- /var/tmp/diff_new_pack.xaevv5/_old 2022-01-31 22:57:35.857470190 +0100 +++ /var/tmp/diff_new_pack.xaevv5/_new 2022-01-31 22:57:35.861470163 +0100 @@ -76,7 +76,7 @@ %define devel_requires %devel_no_selenium_requires chromedriver Name: openQA -Version: 4.6.1643299616.01abba344 +Version: 4.6.1643469400.853734877 Release: 0 Summary: The openQA web-frontend, scheduler and tools License: GPL-2.0-or-later ++++++ openQA-4.6.1643299616.01abba344.obscpio -> openQA-4.6.1643469400.853734877.obscpio ++++++ /work/SRC/openSUSE:Factory/openQA/openQA-4.6.1643299616.01abba344.obscpio /work/SRC/openSUSE:Factory/.openQA.new.1898/openQA-4.6.1643469400.853734877.obscpio differ: char 50, line 1 ++++++ openQA.obsinfo ++++++ --- /var/tmp/diff_new_pack.xaevv5/_old 2022-01-31 22:57:35.929469705 +0100 +++ /var/tmp/diff_new_pack.xaevv5/_new 2022-01-31 22:57:35.933469678 +0100 @@ -1,5 +1,5 @@ name: openQA -version: 4.6.1643299616.01abba344 -mtime: 1643299616 -commit: 01abba344ad5f8b534c5600cf78a7dca062a27d6 +version: 4.6.1643469400.853734877 +mtime: 1643469400 +commit: 853734877a942252222461618bbbcbb4891334c5

1 0

commit xplayer for openSUSE:Factory
by Source-Sync 31 Jan '22

31 Jan '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xplayer for openSUSE:Factory checked in at 2022-01-31 22:56:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xplayer (Old) and /work/SRC/openSUSE:Factory/.xplayer.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xplayer" Mon Jan 31 22:56:59 2022 rev:27 rq:949922 version:2.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/xplayer/xplayer.changes 2021-09-25 00:36:35.211204066 +0200 +++ /work/SRC/openSUSE:Factory/.xplayer.new.1898/xplayer.changes 2022-01-31 22:57:31.713498092 +0100 @@ -1,0 +2,6 @@ +Tue Jan 25 16:05:43 UTC 2022 - Avinesh Kumar <avinesh.kumar(a)suse.com> + +- Update to version 2.4.2. + * l10n: Update translations + +------------------------------------------------------------------- Old: ---- xplayer-2.4.0.tar.gz New: ---- xplayer-2.4.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xplayer.spec ++++++ --- /var/tmp/diff_new_pack.ZiEcjD/_old 2022-01-31 22:57:32.269494348 +0100 +++ /var/tmp/diff_new_pack.ZiEcjD/_new 2022-01-31 22:57:32.277494294 +0100 @@ -1,7 +1,7 @@ # # spec file for package xplayer # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %bcond_with zeitgeist Name: xplayer -Version: 2.4.0 +Version: 2.4.2 Release: 0 Summary: Generic media player License: GPL-2.0-or-later AND LGPL-2.1-or-later ++++++ xplayer-2.4.0.tar.gz -> xplayer-2.4.2.tar.gz ++++++ ++++ 6302 lines of diff (skipped)

1 0

commit armadillo for openSUSE:Factory
by Source-Sync 31 Jan '22

31 Jan '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package armadillo for openSUSE:Factory checked in at 2022-01-31 22:56:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/armadillo (Old) and /work/SRC/openSUSE:Factory/.armadillo.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "armadillo" Mon Jan 31 22:56:58 2022 rev:159 rq:949921 version:10.8.1 Changes: -------- --- /work/SRC/openSUSE:Factory/armadillo/armadillo.changes 2022-01-14 23:14:44.758690016 +0100 +++ /work/SRC/openSUSE:Factory/.armadillo.new.1898/armadillo.changes 2022-01-31 22:57:29.081515813 +0100 @@ -1,0 +2,6 @@ +Sat Jan 29 19:42:13 UTC 2022 - Atri Bhattacharya <badshah400(a)gmail.com> + +- Update to version 10.8.1: + * Bug fix release. + +------------------------------------------------------------------- Old: ---- armadillo-10.8.0.tar.xz New: ---- armadillo-10.8.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ armadillo.spec ++++++ --- /var/tmp/diff_new_pack.cQwcZH/_old 2022-01-31 22:57:29.777511126 +0100 +++ /var/tmp/diff_new_pack.cQwcZH/_new 2022-01-31 22:57:29.781511100 +0100 @@ -18,7 +18,7 @@ %define soname libarmadillo10 Name: armadillo -Version: 10.8.0 +Version: 10.8.1 Release: 0 Summary: C++ matrix library with interfaces to LAPACK and ATLAS License: Apache-2.0 ++++++ armadillo-10.8.0.tar.xz -> armadillo-10.8.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-10.8.0/CMakeLists.txt new/armadillo-10.8.1/CMakeLists.txt --- old/armadillo-10.8.0/CMakeLists.txt 2016-06-16 18:24:20.000000000 +0200 +++ new/armadillo-10.8.1/CMakeLists.txt 2016-06-16 18:24:21.000000000 +0200 @@ -381,12 +381,12 @@ if(OpenBLAS_FOUND AND ATLAS_FOUND) message(STATUS "") - message(STATUS "*** WARNING: found both OpenBLAS and ATLAS; ATLAS will not be used") + message(STATUS "*** NOTE: found both OpenBLAS and ATLAS; ATLAS will not be used") endif() if(OpenBLAS_FOUND AND BLAS_FOUND) message(STATUS "") - message(STATUS "*** WARNING: found both OpenBLAS and BLAS; BLAS will not be used") + message(STATUS "*** NOTE: found both OpenBLAS and BLAS; BLAS will not be used") endif() if(OpenBLAS_FOUND) @@ -396,6 +396,11 @@ if(OPENBLAS_PROVIDES_LAPACK) set(ARMA_USE_LAPACK true) + else() + message(STATUS "") + message(STATUS "*** NOTE: if OpenBLAS is known to provide LAPACK functions, recommend to") + message(STATUS "*** NOTE: rerun cmake with the OPENBLAS_PROVIDES_LAPACK option enabled:") + message(STATUS "*** NOTE: cmake -D OPENBLAS_PROVIDES_LAPACK=true .") endif() message(STATUS "") @@ -424,10 +429,17 @@ endif() if(LAPACK_FOUND) - set(ARMA_USE_LAPACK true) - set(ARMA_LIBS ${ARMA_LIBS} ${LAPACK_LIBRARIES}) + if(OpenBLAS_FOUND AND OPENBLAS_PROVIDES_LAPACK) + message(STATUS "*** NOTE: found both OpenBLAS and LAPACK;") + message(STATUS "*** NOTE: option OPENBLAS_PROVIDES_LAPACK is enabled,") + message(STATUS "*** NOTE: so will not link with plain LAPACK.") + message(STATUS "") + else() + set(ARMA_USE_LAPACK true) + set(ARMA_LIBS ${ARMA_LIBS} ${LAPACK_LIBRARIES}) + endif() endif() - + endif() endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-10.8.0/NOTICE.txt new/armadillo-10.8.1/NOTICE.txt --- old/armadillo-10.8.0/NOTICE.txt 2016-06-16 18:24:20.000000000 +0200 +++ new/armadillo-10.8.1/NOTICE.txt 2016-06-16 18:24:21.000000000 +0200 @@ -1,7 +1,7 @@ Armadillo C++ Linear Algebra Library -Copyright 2008-2021 Conrad Sanderson (http://conradsanderson.id.au) +Copyright 2008-2022 Conrad Sanderson (http://conradsanderson.id.au) Copyright 2008-2016 National ICT Australia (NICTA) -Copyright 2017-2021 Data61 / CSIRO +Copyright 2017-2022 Data61 / CSIRO This product includes software developed by Conrad Sanderson (http://conradsanderson.id.au) This product includes software developed at National ICT Australia (NICTA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-10.8.0/README.md new/armadillo-10.8.1/README.md --- old/armadillo-10.8.0/README.md 2016-06-16 18:24:20.000000000 +0200 +++ new/armadillo-10.8.1/README.md 2016-06-16 18:24:21.000000000 +0200 @@ -1,9 +1,9 @@ ### Armadillo: C++ Library for Linear Algebra & Scientific Computing http://arma.sourceforge.net -Copyright 2008-2021 Conrad Sanderson (http://conradsanderson.id.au) +Copyright 2008-2022 Conrad Sanderson (http://conradsanderson.id.au) Copyright 2008-2016 National ICT Australia (NICTA) -Copyright 2017-2021 Data61 / CSIRO +Copyright 2017-2022 Data61 / CSIRO --- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-10.8.0/docs.html new/armadillo-10.8.1/docs.html --- old/armadillo-10.8.0/docs.html 2016-06-16 18:24:20.000000000 +0200 +++ new/armadillo-10.8.1/docs.html 2016-06-16 18:24:21.000000000 +0200 @@ -12832,7 +12832,7 @@ pinv( B, A, tolerance ) pinv( B, A, tolerance, method ) <ul> -<li>Moore-Penrose pseudo-inverse of matrix A</li> +<li>Moore-Penrose pseudo-inverse (generalised inverse) of matrix A</li> <li> The computation is based on singular value decomposition @@ -12900,7 +12900,7 @@ <li><a href="#constants">datum::eps</a></li> <li><a href="http://mathworld.wolfram.com/Pseudoinverse.html">Pseudoinverse in MathWorld</a></li> <li><a href="http://mathworld.wolfram.com/Moore-PenroseMatrixInverse.html">Moore-Penrose Matrix Inverse in MathWorld</a></li> -<li><a href="http://en.wikipedia.org/wiki/Moore-Penrose_pseudoinverse">Moore-Penrose pseudoinverse in Wikipedia</a></li> +<li><a href="https://en.wikipedia.org/wiki/Moore-Penrose_inverse">Moore-Penrose inverse in Wikipedia</a></li> </ul> </li> @@ -17161,8 +17161,6 @@ Examples: <ul> <pre> -cout << "2.0 * pi = " << 2.0 * datum::pi << endl; - cout << "speed of light = " << datum::c_0 << endl; cout << "log_max for floats = "; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-10.8.0/include/armadillo_bits/arma_version.hpp new/armadillo-10.8.1/include/armadillo_bits/arma_version.hpp --- old/armadillo-10.8.0/include/armadillo_bits/arma_version.hpp 2016-06-16 18:24:20.000000000 +0200 +++ new/armadillo-10.8.1/include/armadillo_bits/arma_version.hpp 2016-06-16 18:24:21.000000000 +0200 @@ -23,7 +23,7 @@ #define ARMA_VERSION_MAJOR 10 #define ARMA_VERSION_MINOR 8 -#define ARMA_VERSION_PATCH 0 +#define ARMA_VERSION_PATCH 1 #define ARMA_VERSION_NAME "Realm Raider" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-10.8.0/include/armadillo_bits/op_find_meat.hpp new/armadillo-10.8.1/include/armadillo_bits/op_find_meat.hpp --- old/armadillo-10.8.0/include/armadillo_bits/op_find_meat.hpp 2016-06-16 18:24:20.000000000 +0200 +++ new/armadillo-10.8.1/include/armadillo_bits/op_find_meat.hpp 2016-06-16 18:24:21.000000000 +0200 @@ -93,6 +93,11 @@ const eT val = X.aux; + if((is_same_type<op_type, op_rel_eq>::yes || is_same_type<op_type, op_rel_noteq>::yes) && arma_config::debug && arma_isnan(val)) + { + arma_debug_warn_level(1, "find(): NaN is not equal to anything; suggest to use find_nonfinite() instead"); + } + const Proxy<T1> A(X.m); const uword n_elem = A.get_n_elem(); @@ -221,9 +226,13 @@ const eT val = X.aux; + if((is_same_type<op_type, op_rel_eq>::yes || is_same_type<op_type, op_rel_noteq>::yes) && arma_config::debug && arma_isnan(val)) + { + arma_debug_warn_level(1, "find(): NaN is not equal to anything; suggest to use find_nonfinite() instead"); + } + const Proxy<T1> A(X.m); - ea_type PA = A.get_ea(); const uword n_elem = A.get_n_elem(); indices.set_size(n_elem, 1); @@ -234,6 +243,8 @@ if(Proxy<T1>::use_at == false) { + ea_type PA = A.get_ea(); + for(uword i=0; i<n_elem; ++i) { const eT tmp = PA[i]; @@ -304,34 +315,67 @@ arma_debug_assert_same_size(A, B, "relational operator"); - ea_type1 PA = A.get_ea(); - ea_type2 PB = B.get_ea(); - - const uword n_elem = B.get_n_elem(); + const uword n_elem = A.get_n_elem(); indices.set_size(n_elem, 1); uword* indices_mem = indices.memptr(); uword n_nz = 0; - for(uword i=0; i<n_elem; ++i) + if((Proxy<T1>::use_at == false) && (Proxy<T2>::use_at == false)) { - const eT1 tmp1 = PA[i]; - const eT2 tmp2 = PB[i]; + ea_type1 PA = A.get_ea(); + ea_type2 PB = B.get_ea(); - bool not_zero; + for(uword i=0; i<n_elem; ++i) + { + const eT1 tmp1 = PA[i]; + const eT2 tmp2 = PB[i]; + + bool not_zero; + + if(is_same_type<glue_type, glue_rel_lt >::yes) { not_zero = (tmp1 < tmp2); } + else if(is_same_type<glue_type, glue_rel_gt >::yes) { not_zero = (tmp1 > tmp2); } + else if(is_same_type<glue_type, glue_rel_lteq >::yes) { not_zero = (tmp1 <= tmp2); } + else if(is_same_type<glue_type, glue_rel_gteq >::yes) { not_zero = (tmp1 >= tmp2); } + else if(is_same_type<glue_type, glue_rel_eq >::yes) { not_zero = (tmp1 == tmp2); } + else if(is_same_type<glue_type, glue_rel_noteq >::yes) { not_zero = (tmp1 != tmp2); } + else if(is_same_type<glue_type, glue_rel_and >::yes) { not_zero = (tmp1 && tmp2); } + else if(is_same_type<glue_type, glue_rel_or >::yes) { not_zero = (tmp1 || tmp2); } + else { not_zero = false; } + + if(not_zero) { indices_mem[n_nz] = i; ++n_nz; } + } + } + else + { + const uword n_rows = A.get_n_rows(); + const uword n_cols = A.get_n_cols(); - if(is_same_type<glue_type, glue_rel_lt >::yes) { not_zero = (tmp1 < tmp2); } - else if(is_same_type<glue_type, glue_rel_gt >::yes) { not_zero = (tmp1 > tmp2); } - else if(is_same_type<glue_type, glue_rel_lteq >::yes) { not_zero = (tmp1 <= tmp2); } - else if(is_same_type<glue_type, glue_rel_gteq >::yes) { not_zero = (tmp1 >= tmp2); } - else if(is_same_type<glue_type, glue_rel_eq >::yes) { not_zero = (tmp1 == tmp2); } - else if(is_same_type<glue_type, glue_rel_noteq >::yes) { not_zero = (tmp1 != tmp2); } - else if(is_same_type<glue_type, glue_rel_and >::yes) { not_zero = (tmp1 && tmp2); } - else if(is_same_type<glue_type, glue_rel_or >::yes) { not_zero = (tmp1 || tmp2); } - else { not_zero = false; } + uword i = 0; - if(not_zero) { indices_mem[n_nz] = i; ++n_nz; } + for(uword col=0; col < n_cols; ++col) + for(uword row=0; row < n_rows; ++row) + { + const eT1 tmp1 = A.at(row,col); + const eT2 tmp2 = B.at(row,col); + + bool not_zero; + + if(is_same_type<glue_type, glue_rel_lt >::yes) { not_zero = (tmp1 < tmp2); } + else if(is_same_type<glue_type, glue_rel_gt >::yes) { not_zero = (tmp1 > tmp2); } + else if(is_same_type<glue_type, glue_rel_lteq >::yes) { not_zero = (tmp1 <= tmp2); } + else if(is_same_type<glue_type, glue_rel_gteq >::yes) { not_zero = (tmp1 >= tmp2); } + else if(is_same_type<glue_type, glue_rel_eq >::yes) { not_zero = (tmp1 == tmp2); } + else if(is_same_type<glue_type, glue_rel_noteq >::yes) { not_zero = (tmp1 != tmp2); } + else if(is_same_type<glue_type, glue_rel_and >::yes) { not_zero = (tmp1 && tmp2); } + else if(is_same_type<glue_type, glue_rel_or >::yes) { not_zero = (tmp1 || tmp2); } + else { not_zero = false; } + + if(not_zero) { indices_mem[n_nz] = i; ++n_nz; } + + i++; + } } return n_nz; @@ -364,19 +408,18 @@ arma_debug_assert_same_size(A, B, "relational operator"); - ea_type1 PA = A.get_ea(); - ea_type2 PB = B.get_ea(); - - const uword n_elem = B.get_n_elem(); + const uword n_elem = A.get_n_elem(); indices.set_size(n_elem, 1); uword* indices_mem = indices.memptr(); uword n_nz = 0; - - if(Proxy<T1>::use_at == false) + if((Proxy<T1>::use_at == false) && (Proxy<T2>::use_at == false)) { + ea_type1 PA = A.get_ea(); + ea_type2 PB = B.get_ea(); + for(uword i=0; i<n_elem; ++i) { bool not_zero; @@ -408,7 +451,7 @@ i++; } - } + } return n_nz; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-10.8.0/include/armadillo_bits/op_powmat_meat.hpp new/armadillo-10.8.1/include/armadillo_bits/op_powmat_meat.hpp --- old/armadillo-10.8.0/include/armadillo_bits/op_powmat_meat.hpp 2016-06-16 18:24:20.000000000 +0200 +++ new/armadillo-10.8.1/include/armadillo_bits/op_powmat_meat.hpp 2016-06-16 18:24:21.000000000 +0200 @@ -215,6 +215,8 @@ if(try_sympd) { + arma_extra_debug_print("op_powmat_cx: attempting sympd optimisation"); + Col<in_T> eigval; Mat<in_eT> eigvec; @@ -231,7 +233,9 @@ return true; } - // fallthrough + arma_extra_debug_print("op_powmat_cx: sympd optimisation failed"); + + // fallthrough if optimisation failed } bool powmat_status = false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-10.8.0/tests2/catch.hpp new/armadillo-10.8.1/tests2/catch.hpp --- old/armadillo-10.8.0/tests2/catch.hpp 2016-06-16 18:24:20.000000000 +0200 +++ new/armadillo-10.8.1/tests2/catch.hpp 2016-06-16 18:24:21.000000000 +0200 @@ -1,10 +1,9 @@ -// SPDX-License-Identifier: BSL-1.0 /* - * Catch v2.13.7 - * Generated: 2021-07-28 20:29:27.753164 + * 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) 2021 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) @@ -16,7 +15,7 @@ #define CATCH_VERSION_MAJOR 2 #define CATCH_VERSION_MINOR 13 -#define CATCH_VERSION_PATCH 7 +#define CATCH_VERSION_PATCH 8 #ifdef __clang__ # pragma clang system_header @@ -241,9 +240,6 @@ // 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) @@ -252,13 +248,18 @@ # 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 @@ -1011,34 +1012,34 @@ #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 @@ -1051,7 +1052,7 @@ 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, ... ) \ @@ -1073,7 +1074,7 @@ 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, ... ) \ @@ -1114,18 +1115,18 @@ #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) \ @@ -1163,18 +1164,18 @@ #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)\ @@ -1205,7 +1206,7 @@ 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 \ @@ -1238,18 +1239,18 @@ #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)\ @@ -1290,18 +1291,18 @@ #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) \ @@ -1335,7 +1336,7 @@ void TestName<TestType>::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 @@ -3092,7 +3093,7 @@ Approx operator-() const; template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type> - Approx operator()( T const& value ) { + Approx operator()( T const& value ) const { Approx approx( static_cast<double>(value) ); approx.m_epsilon = m_epsilon; approx.m_margin = m_margin; @@ -4164,7 +4165,7 @@ 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")); } @@ -4176,6 +4177,11 @@ } bool next() override { + return nextImpl(); + } + + private: + bool nextImpl() { bool success = m_generator.next(); if (!success) { return false; @@ -15381,7 +15387,7 @@ } Version const& libraryVersion() { - static Version version( 2, 13, 7, "", 0 ); + static Version version( 2, 13, 8, "", 0 ); return version; } @@ -17649,9 +17655,9 @@ #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 @@ -17753,9 +17759,9 @@ #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; @@ -17802,8 +17808,8 @@ #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( ... ) @@ -17812,7 +17818,7 @@ #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__) @@ -17835,8 +17841,8 @@ #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 ) @@ -17886,8 +17892,8 @@ #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( ... ) @@ -17895,7 +17901,7 @@ #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__) @@ -17925,8 +17931,8 @@ #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 )

1 0