Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package e-antic for openSUSE:Factory checked in at 2022-05-20 17:51:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/e-antic (Old) and /work/SRC/openSUSE:Factory/.e-antic.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "e-antic" Fri May 20 17:51:12 2022 rev:7 rq:978278 version:1.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/e-antic/e-antic.changes 2022-04-11 23:50:11.062426451 +0200 +++ /work/SRC/openSUSE:Factory/.e-antic.new.1538/e-antic.changes 2022-05-20 17:52:12.011306520 +0200 @@ -1,0 +2,8 @@ +Fri May 20 12:25:48 UTC 2022 - Jan Engelhardt <jeng...@inai.de> + +- Update to release 1.2.1 + * Fixed serialization of renf_class with cereal>=1.3.2 + * Fixed deserialization of objects serialized with e-antic + prior to 1.0.0 + +------------------------------------------------------------------- Old: ---- e-antic-1.2.0.tar.gz New: ---- e-antic-1.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ e-antic.spec ++++++ --- /var/tmp/diff_new_pack.zKJwQ3/_old 2022-05-20 17:52:12.615307070 +0200 +++ /var/tmp/diff_new_pack.zKJwQ3/_new 2022-05-20 17:52:12.623307077 +0200 @@ -19,7 +19,7 @@ %define skip_python2 1 %define lname libeantic1 Name: e-antic -Version: 1.2.0 +Version: 1.2.1 Release: 0 Summary: Real Embedded Algebraic Number Theory in C License: LGPL-2.1-or-later AND LGPL-3.0-or-later ++++++ e-antic-1.2.0.tar.gz -> e-antic-1.2.1.tar.gz ++++++ ++++ 1945 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/ChangeLog new/e-antic-1.2.1/ChangeLog --- old/e-antic-1.2.0/ChangeLog 2022-04-10 14:08:32.520765989 +0200 +++ new/e-antic-1.2.1/ChangeLog 2022-05-20 13:05:22.168758567 +0200 @@ -4,6 +4,17 @@ .. current developments +v1.2.1 +==================== + +**Fixed:** + +* Fixed serialization of `renf_class` with cereal>=1.3.2 (#224) + +* Fixed deserialization of objects serialized with e-antic prior to 1.0.0 + + + v1.2.0 ==================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/README.md new/e-antic-1.2.1/README.md --- old/e-antic-1.2.0/README.md 2022-04-10 14:08:32.435766492 +0200 +++ new/e-antic-1.2.1/README.md 2022-05-20 13:05:22.072088855 +0200 @@ -89,8 +89,8 @@ You can try out the projects in this repository in a very limited environment online by clicking the following links: -* **libeantic** [](https://mybinder.org/v2/gh/flatsurf/e-antic/1.2.0?filepath=binder%2FSample.libeantic.ipynb) -* **pyeantic** [](https://mybinder.org/v2/gh/flatsurf/e-antic/1.2.0?filepath=binder%2FSample.pyeantic.ipynb) +* **libeantic** [](https://mybinder.org/v2/gh/flatsurf/e-antic/1.2.1?filepath=binder%2FSample.libeantic.ipynb) +* **pyeantic** [](https://mybinder.org/v2/gh/flatsurf/e-antic/1.2.1?filepath=binder%2FSample.pyeantic.ipynb) ## Build with conda-forge Dependencies diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/configure.ac new/e-antic-1.2.1/configure.ac --- old/e-antic-1.2.0/configure.ac 2022-04-10 14:08:32.431766516 +0200 +++ new/e-antic-1.2.1/configure.ac 2022-05-20 13:05:22.065421978 +0200 @@ -2,7 +2,7 @@ dnl We need at least autoconf 2.69 for this configure.ac to work. AC_PREREQ([2.69]) -AC_INIT([e-antic], [1.2.0], [vincent.delecr...@math.cnrs.fr]) +AC_INIT([e-antic], [1.2.1], [vincent.delecr...@math.cnrs.fr]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([1.14.1 subdir-objects tar-pax foreign]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/doc/configure.ac new/e-antic-1.2.1/doc/configure.ac --- old/e-antic-1.2.0/doc/configure.ac 2022-04-10 14:08:32.434766498 +0200 +++ new/e-antic-1.2.1/doc/configure.ac 2022-05-20 13:05:22.068755417 +0200 @@ -2,7 +2,7 @@ dnl We need at least autoconf 2.69 for this configure.ac to work. AC_PREREQ([2.69]) -AC_INIT([e-antic-doc], [1.2.0], [vincent.delecr...@math.cnrs.fr]) +AC_INIT([e-antic-doc], [1.2.1], [vincent.delecr...@math.cnrs.fr]) AC_CONFIG_AUX_DIR([.]) AM_INIT_AUTOMAKE([1.14.1 subdir-objects tar-pax foreign]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/doc/manual/pyeantic/conf.py new/e-antic-1.2.1/doc/manual/pyeantic/conf.py --- old/e-antic-1.2.0/doc/manual/pyeantic/conf.py 2022-04-10 14:08:32.434766498 +0200 +++ new/e-antic-1.2.1/doc/manual/pyeantic/conf.py 2022-05-20 13:05:22.068755417 +0200 @@ -18,7 +18,7 @@ author = 'the e-antic authors' # The full version, including alpha/beta/rc tags -release = '1.2.0' +release = '1.2.1' # -- General configuration --------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/configure.ac new/e-antic-1.2.1/libeantic/configure.ac --- old/e-antic-1.2.0/libeantic/configure.ac 2022-04-10 14:08:32.431766516 +0200 +++ new/e-antic-1.2.1/libeantic/configure.ac 2022-05-20 13:05:22.065421978 +0200 @@ -2,7 +2,7 @@ dnl We need at least autoconf 2.69 for this configure.ac to work. AC_PREREQ([2.69]) -AC_INIT([libeantic], [1.2.0], [vincent.delecr...@math.cnrs.fr]) +AC_INIT([libeantic], [1.2.1], [vincent.delecr...@math.cnrs.fr]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([.]) @@ -12,8 +12,8 @@ dnl Set to c+1:0:0 on a non-backwards-compatible change. dnl Set to c+1:0:a+1 on a backwards-compatible change. dnl Set to c:r+1:a if the interface is unchanged. -AC_SUBST([libeantic_version_info], [1:4:0]) -AC_SUBST([libeanticxx_version_info], [1:4:0]) +AC_SUBST([libeantic_version_info], [1:5:0]) +AC_SUBST([libeanticxx_version_info], [1:5:0]) AM_SILENT_RULES([yes]) # non-verbose make; override with ./configure --disable-silent-rules @@ -22,6 +22,9 @@ dnl We build our library with libtool. LT_INIT +dnl Find a C99 compiler +AC_PROG_CC_C99 + dnl Find C++ Compiler AC_PROG_CXX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/e-antic/cereal.hpp new/e-antic-1.2.1/libeantic/e-antic/cereal.hpp --- old/e-antic-1.2.0/libeantic/e-antic/cereal.hpp 2021-11-23 02:10:32.037586676 +0100 +++ new/e-antic-1.2.1/libeantic/e-antic/cereal.hpp 2022-05-20 01:48:46.564187834 +0200 @@ -1,6 +1,6 @@ /* This is a -*- C++ -*- header file. - Copyright (C) 2019-2021 Julian R??th + Copyright (C) 2019-2022 Julian R??th This file is part of e-antic @@ -19,6 +19,7 @@ #include <sstream> #include <cereal/cereal.hpp> +#include <cereal/version.hpp> #include <cereal/types/memory.hpp> #include "renf_class.hpp" @@ -28,12 +29,16 @@ template <class Archive> void save(Archive & archive, const boost::intrusive_ptr<const renf_class> & self) { - uint32_t id = archive.registerSharedPointer(self.get()); +#if CEREAL_VERSION >= 10301 + uint32_t id = archive.registerSharedPointer(std::shared_ptr<const renf_class>(self.get(), [](auto) {})); +#else + uint32_t id = archive.registerSharedPointer(self.get()); +#endif - archive(cereal::make_nvp("id", id)); + archive(cereal::make_nvp("id", id)); - if ( id & static_cast<unsigned int>(cereal::detail::msb_32bit) ) - { + if ( id & static_cast<unsigned int>(cereal::detail::msb_32bit) ) + { // This is the first time cereal sees this renf_class, so we actually // store it. Future copies only need the id to resolve to a pointer to // the same renf_class. @@ -44,14 +49,22 @@ cereal::make_nvp("embedding", std::get<2>(construction)), cereal::make_nvp("minpoly", std::get<0>(construction)), cereal::make_nvp("precision", std::get<3>(construction))); - } + } } template <class Archive> void load(Archive & archive, boost::intrusive_ptr<const renf_class> & self) { uint32_t id; - archive(cereal::make_nvp("id", id)); + try { + archive(cereal::make_nvp("id", id)); + } + catch(const cereal::Exception&) + { + // If this object has been serialized with e-antic <1.0.0, the field is + // called "shared" instead. + archive(cereal::make_nvp("shared", id)); + } if ( id & static_cast<unsigned int>(cereal::detail::msb_32bit) ) { @@ -95,7 +108,8 @@ boost::intrusive_ptr<const renf_class> nf; std::string serialized_element; - archive(nf, serialized_element); + archive(cereal::make_nvp("parent", nf)); + archive(cereal::make_nvp("value", serialized_element)); self = renf_elem_class(*nf, serialized_element); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/e-antic/local.h.in new/e-antic-1.2.1/libeantic/e-antic/local.h.in --- old/e-antic-1.2.0/libeantic/e-antic/local.h.in 2022-04-10 14:08:32.432766510 +0200 +++ new/e-antic-1.2.1/libeantic/e-antic/local.h.in 2022-05-20 13:05:22.065421978 +0200 @@ -17,8 +17,8 @@ #define E_ANTIC_VERSION_MAJOR 1 #define E_ANTIC_VERSION_MINOR 2 -#define E_ANTIC_VERSION_PATCHLEVEL 0 -#define E_ANTIC_VERSION "1.2.0" +#define E_ANTIC_VERSION_PATCHLEVEL 1 +#define E_ANTIC_VERSION "1.2.1" #define E_ANTIC_RELEASE (E_ANTIC_VERSION_MAJOR * 10000 + \ E_ANTIC_VERSION_MINOR * 100 + \ E_ANTIC_VERSION_PATCHLEVEL) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/access.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/access.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/access.hpp 2021-11-23 02:16:43.649589206 +0100 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/access.hpp 2022-05-20 01:47:18.941212813 +0200 @@ -11,14 +11,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/archives/adapters.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/archives/adapters.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/archives/adapters.hpp 2019-05-01 14:17:34.405005217 +0200 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/archives/adapters.hpp 2022-05-20 01:47:18.941212813 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/archives/binary.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/archives/binary.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/archives/binary.hpp 2021-11-23 02:16:43.649589206 +0100 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/archives/binary.hpp 2022-05-20 01:47:18.941212813 +0200 @@ -11,14 +11,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/archives/json.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/archives/json.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/archives/json.hpp 2021-11-23 02:16:43.649589206 +0100 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/archives/json.hpp 2022-05-20 01:47:18.941212813 +0200 @@ -11,14 +11,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND @@ -286,19 +286,19 @@ void saveLong(T lu){ saveValue( static_cast<std::uint64_t>( lu ) ); } public: -#ifdef _MSC_VER +#if defined(_MSC_VER) && _MSC_VER < 1916 //! MSVC only long overload to current node void saveValue( unsigned long lu ){ saveLong( lu ); }; #else // _MSC_VER //! Serialize a long if it would not be caught otherwise template <class T, traits::EnableIf<std::is_same<T, long>::value, - !std::is_same<T, std::int32_t>::value, + !std::is_same<T, int>::value, !std::is_same<T, std::int64_t>::value> = traits::sfinae> inline void saveValue( T t ){ saveLong( t ); } //! Serialize an unsigned long if it would not be caught otherwise template <class T, traits::EnableIf<std::is_same<T, unsigned long>::value, - !std::is_same<T, std::uint32_t>::value, + !std::is_same<T, unsigned>::value, !std::is_same<T, std::uint64_t>::value> = traits::sfinae> inline void saveValue( T t ){ saveLong( t ); } #endif // _MSC_VER @@ -483,16 +483,16 @@ Iterator() : itsIndex( 0 ), itsType(Null_) {} Iterator(MemberIterator begin, MemberIterator end) : - itsMemberItBegin(begin), itsMemberItEnd(end), itsIndex(0), itsType(Member) + itsMemberItBegin(begin), itsMemberItEnd(end), itsIndex(0), itsSize(std::distance(begin, end)), itsType(Member) { - if( std::distance( begin, end ) == 0 ) + if( itsSize == 0 ) itsType = Null_; } Iterator(ValueIterator begin, ValueIterator end) : - itsValueItBegin(begin), itsIndex(0), itsType(Value) + itsValueItBegin(begin), itsIndex(0), itsSize(std::distance(begin, end)), itsType(Value) { - if( std::distance( begin, end ) == 0 ) + if( itsSize == 0 ) itsType = Null_; } @@ -506,6 +506,9 @@ //! Get the value of the current node GenericValue const & value() { + if( itsIndex >= itsSize ) + throw cereal::Exception("No more objects in input"); + switch(itsType) { case Value : return itsValueItBegin[itsIndex]; @@ -546,7 +549,7 @@ private: MemberIterator itsMemberItBegin, itsMemberItEnd; //!< The member iterator (object) ValueIterator itsValueItBegin; //!< The value iterator (array) - size_t itsIndex; //!< The current index of this iterator + size_t itsIndex, itsSize; //!< The current index of this iterator enum Type {Value, Member, Null_} itsType; //!< Whether this holds values (array) or members (objects) or nothing }; @@ -561,18 +564,20 @@ @throws Exception if an expectedName is given and not found */ inline void search() { + // store pointer to itsNextName locally and reset to nullptr in case search() throws + auto localNextName = itsNextName; + itsNextName = nullptr; + // The name an NVP provided with setNextName() - if( itsNextName ) + if( localNextName ) { // The actual name of the current node auto const actualName = itsIteratorStack.back().name(); // Do a search if we don't see a name coming up, or if the names don't match - if( !actualName || std::strcmp( itsNextName, actualName ) != 0 ) - itsIteratorStack.back().search( itsNextName ); + if( !actualName || std::strcmp( localNextName, actualName ) != 0 ) + itsIteratorStack.back().search( localNextName ); } - - itsNextName = nullptr; } public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/archives/portable_binary.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/archives/portable_binary.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/archives/portable_binary.hpp 2021-11-23 02:16:43.649589206 +0100 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/archives/portable_binary.hpp 2022-05-20 01:47:18.941212813 +0200 @@ -11,14 +11,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/archives/xml.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/archives/xml.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/archives/xml.hpp 2021-11-23 02:16:43.650589201 +0100 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/archives/xml.hpp 2022-05-20 01:47:18.941212813 +0200 @@ -11,14 +11,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/cereal.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/cereal.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/cereal.hpp 2021-11-23 02:16:43.650589201 +0100 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/cereal.hpp 2022-05-20 01:47:18.941212813 +0200 @@ -11,14 +11,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND @@ -258,6 +258,26 @@ Interfaces for other forms of serialization functions is similar. This macro should be placed at global scope. @ingroup Utility */ + + //! On C++17, define the StaticObject as inline to merge the definitions across TUs + //! This prevents multiple definition errors when this macro appears in a header file + //! included in multiple TUs. + #ifdef CEREAL_HAS_CPP17 + #define CEREAL_CLASS_VERSION(TYPE, VERSION_NUMBER) \ + namespace cereal { namespace detail { \ + template <> struct Version<TYPE> \ + { \ + static std::uint32_t registerVersion() \ + { \ + ::cereal::detail::StaticObject<Versions>::getInstance().mapping.emplace( \ + std::type_index(typeid(TYPE)).hash_code(), VERSION_NUMBER ); \ + return VERSION_NUMBER; \ + } \ + static inline const std::uint32_t version = registerVersion(); \ + CEREAL_UNUSED_FUNCTION \ + }; /* end Version */ \ + } } // end namespaces + #else #define CEREAL_CLASS_VERSION(TYPE, VERSION_NUMBER) \ namespace cereal { namespace detail { \ template <> struct Version<TYPE> \ @@ -275,6 +295,8 @@ Version<TYPE>::registerVersion(); \ } } // end namespaces + #endif + // ###################################################################### //! The base output archive class /*! This is the base output archive for all output archives. If you create @@ -369,12 +391,17 @@ point to the same data. @internal - @param addr The address (see shared_ptr get()) pointed to by the shared pointer + @param sharedPointer The shared pointer itself (the adress is taked via get()). + The archive takes a copy to prevent the memory location to be freed + as long as the address is used as id. This is needed to prevent CVE-2020-11105. @return A key that uniquely identifies the pointer */ - inline std::uint32_t registerSharedPointer( void const * addr ) + inline std::uint32_t registerSharedPointer(const std::shared_ptr<const void>& sharedPointer) { + void const * addr = sharedPointer.get(); + // Handle null pointers by just returning 0 if(addr == 0) return 0; + itsSharedPointerStorage.push_back(sharedPointer); auto id = itsSharedPointerMap.find( addr ); if( id == itsSharedPointerMap.end() ) @@ -454,7 +481,7 @@ template <class T> inline ArchiveType & processImpl(DeferredData<T> const & d) { - std::function<void(void)> deferment( [=](){ self->process( d.value ); } ); + std::function<void(void)> deferment( [this, d](){ self->process( d.value ); } ); itsDeferments.emplace_back( std::move(deferment) ); return *self; @@ -645,6 +672,10 @@ //! Maps from addresses to pointer ids std::unordered_map<void const *, std::uint32_t> itsSharedPointerMap; + //! Copy of shared pointers used in #itsSharedPointerMap to make sure they are kept alive + // during lifetime of itsSharedPointerMap to prevent CVE-2020-11105. + std::vector<std::shared_ptr<const void>> itsSharedPointerStorage; + //! The id to be given to the next pointer std::uint32_t itsCurrentPointerId; @@ -859,7 +890,7 @@ template <class T> inline ArchiveType & processImpl(DeferredData<T> const & d) { - std::function<void(void)> deferment( [=](){ self->process( d.value ); } ); + std::function<void(void)> deferment( [this, d](){ self->process( d.value ); } ); itsDeferments.emplace_back( std::move(deferment) ); return *self; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/details/helpers.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/details/helpers.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/details/helpers.hpp 2021-11-23 02:16:43.650589201 +0100 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/details/helpers.hpp 2022-05-20 01:47:18.941212813 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/details/polymorphic_impl.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/details/polymorphic_impl.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/details/polymorphic_impl.hpp 2021-11-23 02:16:43.651589195 +0100 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/details/polymorphic_impl.hpp 2022-05-20 01:47:18.944546133 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND @@ -69,12 +69,26 @@ have been registered with CEREAL_REGISTER_ARCHIVE. This must be called after all archives are registered (usually after the archives themselves have been included). */ +#ifdef CEREAL_HAS_CPP17 #define CEREAL_BIND_TO_ARCHIVES(...) \ namespace cereal { \ namespace detail { \ template<> \ struct init_binding<__VA_ARGS__> { \ - static bind_to_archives<__VA_ARGS__> const & b; \ + static inline bind_to_archives<__VA_ARGS__> const & b= \ + ::cereal::detail::StaticObject< \ + bind_to_archives<__VA_ARGS__> \ + >::getInstance().bind(); \ + CEREAL_BIND_TO_ARCHIVES_UNUSED_FUNCTION \ + }; \ + }} /* end namespaces */ +#else +#define CEREAL_BIND_TO_ARCHIVES(...) \ + namespace cereal { \ + namespace detail { \ + template<> \ + struct init_binding<__VA_ARGS__> { \ + static bind_to_archives<__VA_ARGS__> const& b; \ CEREAL_BIND_TO_ARCHIVES_UNUSED_FUNCTION \ }; \ bind_to_archives<__VA_ARGS__> const & init_binding<__VA_ARGS__>::b = \ @@ -82,6 +96,7 @@ bind_to_archives<__VA_ARGS__> \ >::getInstance().bind(); \ }} /* end namespaces */ +#endif namespace cereal { @@ -654,7 +669,7 @@ auto ptr = PolymorphicCasters::template downcast<T>( dptr, baseInfo ); - #ifdef _MSC_VER + #if defined(_MSC_VER) && _MSC_VER < 1916 && !defined(__clang__) savePolymorphicSharedPtr( ar, ptr, ::cereal::traits::has_shared_from_this<T>::type() ); // MSVC doesn't like typename here #else // not _MSC_VER savePolymorphicSharedPtr( ar, ptr, typename ::cereal::traits::has_shared_from_this<T>::type() ); @@ -680,9 +695,23 @@ //! of instantiate_polymorphic_binding struct adl_tag {}; - //! Tag for init_binding, bind_to_archives and instantiate_polymorphic_binding. Due to the use of anonymous - //! namespace it becomes a different type in each translation unit. + //! Tag for init_binding, bind_to_archives and instantiate_polymorphic_binding. + //! For C++14 and below, we must instantiate a unique StaticObject per TU that is + //! otherwise identical -- otherwise we get multiple definition problems (ODR violations). + //! To achieve this, put a tag in an anonymous namespace and use it as a template argument. + //! + //! For C++17, we can use static inline global variables to unify these definitions across + //! all TUs in the same shared object (DLL). The tag is therefore not necessary. + //! For convenience, keep it to not complicate other code, but don't put it in + //! an anonymous namespace. Now the template instantiations will correspond + //! to the same type, and since they are marked inline with C++17, they will be merged + //! across all TUs. +#ifdef CEREAL_HAS_CPP17 + struct polymorphic_binding_tag {}; +#else namespace { struct polymorphic_binding_tag {}; } +#endif + //! Causes the static object bindings between an archive type and a serializable type T template <class Archive, class T> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/details/polymorphic_impl_fwd.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/details/polymorphic_impl_fwd.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/details/polymorphic_impl_fwd.hpp 2019-05-01 14:17:34.408338548 +0200 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/details/polymorphic_impl_fwd.hpp 2022-05-20 01:47:18.944546133 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/details/static_object.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/details/static_object.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/details/static_object.hpp 2021-11-23 02:16:43.651589195 +0100 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/details/static_object.hpp 2022-05-20 01:47:18.944546133 +0200 @@ -11,13 +11,13 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND @@ -44,7 +44,7 @@ License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(__clang__) # define CEREAL_DLL_EXPORT __declspec(dllexport) # define CEREAL_USED #else // clang or gcc @@ -94,7 +94,8 @@ std::unique_lock<std::mutex> lock; #else public: - LockGuard(LockGuard const &) = default; // prevents implicit copy ctor warning + LockGuard() = default; + LockGuard(LockGuard const &) = default; // prevents implicit copy ctor warning ~LockGuard() CEREAL_NOEXCEPT {} // prevents variable not used #endif }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/details/traits.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/details/traits.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/details/traits.hpp 2021-11-23 02:16:43.651589195 +0100 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/details/traits.hpp 2022-05-20 01:47:18.944546133 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/details/util.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/details/util.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/details/util.hpp 2019-05-01 14:17:34.408338548 +0200 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/details/util.hpp 2022-05-20 01:47:18.944546133 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/external/LICENSE new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/external/LICENSE --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/external/LICENSE 1970-01-01 01:00:00.000000000 +0100 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/external/LICENSE 2022-05-20 01:47:18.944546133 +0200 @@ -0,0 +1,21 @@ +Copyright (C) 2004-2008 Ren?? Nyffenegger + +This source code is provided 'as-is', without any express or implied +warranty. In no event will the author be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this source code must not be misrepresented; you must not + claim that you wrote the original source code. If you use this source code + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original source code. + +3. This notice may not be removed or altered from any source distribution. + +Ren?? Nyffenegger rene.nyffeneg...@adp-gmbh.ch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/external/rapidjson/LICENSE new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/external/rapidjson/LICENSE --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/external/rapidjson/LICENSE 1970-01-01 01:00:00.000000000 +0100 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/external/rapidjson/LICENSE 2022-05-20 01:47:18.944546133 +0200 @@ -0,0 +1,13 @@ +Tencent is pleased to support the open source community by making RapidJSON available. + +Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved. + +Licensed under the MIT License (the "License"); you may not use this file except +in compliance with the License. You may obtain a copy of the License at + +http://opensource.org/licenses/MIT + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/external/rapidjson/document.h new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/external/rapidjson/document.h --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/external/rapidjson/document.h 2021-11-23 02:16:43.652589190 +0100 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/external/rapidjson/document.h 2022-05-20 01:47:18.947879453 +0200 @@ -24,6 +24,9 @@ #include "encodedstream.h" #include <new> // placement new #include <limits> +#ifdef __cpp_lib_three_way_comparison +#include <compare> +#endif CEREAL_RAPIDJSON_DIAG_PUSH #ifdef __clang__ @@ -175,12 +178,16 @@ //! @name relations //@{ - bool operator==(ConstIterator that) const { return ptr_ == that.ptr_; } - bool operator!=(ConstIterator that) const { return ptr_ != that.ptr_; } - bool operator<=(ConstIterator that) const { return ptr_ <= that.ptr_; } - bool operator>=(ConstIterator that) const { return ptr_ >= that.ptr_; } - bool operator< (ConstIterator that) const { return ptr_ < that.ptr_; } - bool operator> (ConstIterator that) const { return ptr_ > that.ptr_; } + template <bool Const_> bool operator==(const GenericMemberIterator<Const_, Encoding, Allocator>& that) const { return ptr_ == that.ptr_; } + template <bool Const_> bool operator!=(const GenericMemberIterator<Const_, Encoding, Allocator>& that) const { return ptr_ != that.ptr_; } + template <bool Const_> bool operator<=(const GenericMemberIterator<Const_, Encoding, Allocator>& that) const { return ptr_ <= that.ptr_; } + template <bool Const_> bool operator>=(const GenericMemberIterator<Const_, Encoding, Allocator>& that) const { return ptr_ >= that.ptr_; } + template <bool Const_> bool operator< (const GenericMemberIterator<Const_, Encoding, Allocator>& that) const { return ptr_ < that.ptr_; } + template <bool Const_> bool operator> (const GenericMemberIterator<Const_, Encoding, Allocator>& that) const { return ptr_ > that.ptr_; } + +#ifdef __cpp_lib_three_way_comparison + template <bool Const_> std::strong_ordering operator<=>(const GenericMemberIterator<Const_, Encoding, Allocator>& that) const { return ptr_ <=> that.ptr_; } +#endif //@} //! @name dereference diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/external/rapidjson/msinttypes/LICENSE new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/external/rapidjson/msinttypes/LICENSE --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/external/rapidjson/msinttypes/LICENSE 1970-01-01 01:00:00.000000000 +0100 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/external/rapidjson/msinttypes/LICENSE 2022-05-20 01:47:18.947879453 +0200 @@ -0,0 +1,29 @@ +ISO C9x compliant stdint.h for Microsoft Visual Studio +Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 + + Copyright (c) 2006-2013 Alexander Chemeris + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + 3. Neither the name of the product nor the names of its contributors may + be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/macros.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/macros.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/macros.hpp 2021-11-23 02:16:43.656589168 +0100 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/macros.hpp 2022-05-20 01:47:18.947879453 +0200 @@ -25,14 +25,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND @@ -51,7 +51,7 @@ Note that even with this enabled you must still ensure that archives are accessed by only one thread at a time; it is safe - to use multiple archives in paralel, but not to access one archive + to use multiple archives in parallel, but not to access one archive from many places simultaneously. */ #define CEREAL_THREAD_SAFE 0 #endif // CEREAL_THREAD_SAFE @@ -134,7 +134,9 @@ // ###################################################################### //! Checks if C++17 is available -#if __cplusplus >= 201703L || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) +//! NOTE: clang v5 has a bug with inline variables, so disable C++17 on that compiler +#if (__cplusplus >= 201703L || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)) \ + && (!defined(__clang__) || __clang_major__ > 5) #define CEREAL_HAS_CPP17 #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/specialize.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/specialize.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/specialize.hpp 2021-11-23 02:16:43.656589168 +0100 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/specialize.hpp 2022-05-20 01:47:18.947879453 +0200 @@ -11,14 +11,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/array.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/array.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/array.hpp 2019-05-01 14:17:34.415005210 +0200 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/array.hpp 2022-05-20 01:47:18.947879453 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/atomic.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/atomic.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/atomic.hpp 2021-11-23 02:16:43.656589168 +0100 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/atomic.hpp 2022-05-20 01:47:18.947879453 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/base_class.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/base_class.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/base_class.hpp 2021-11-23 02:16:43.656589168 +0100 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/base_class.hpp 2022-05-20 01:47:18.947879453 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/bitset.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/bitset.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/bitset.hpp 2021-11-23 02:16:43.656589168 +0100 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/bitset.hpp 2022-05-20 01:47:18.947879453 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/boost_variant.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/boost_variant.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/boost_variant.hpp 2021-11-23 02:16:43.656589168 +0100 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/boost_variant.hpp 2022-05-20 01:47:18.947879453 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/chrono.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/chrono.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/chrono.hpp 2019-05-01 14:17:34.415005210 +0200 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/chrono.hpp 2022-05-20 01:47:18.947879453 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/common.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/common.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/common.hpp 2019-05-01 14:17:34.415005210 +0200 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/common.hpp 2022-05-20 01:47:18.947879453 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/complex.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/complex.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/complex.hpp 2019-05-01 14:17:34.415005210 +0200 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/complex.hpp 2022-05-20 01:47:18.947879453 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/concepts/pair_associative_container.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/concepts/pair_associative_container.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/concepts/pair_associative_container.hpp 2019-05-01 14:17:34.415005210 +0200 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/concepts/pair_associative_container.hpp 2022-05-20 01:47:18.947879453 +0200 @@ -13,14 +13,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/deque.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/deque.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/deque.hpp 2019-05-01 14:17:34.415005210 +0200 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/deque.hpp 2022-05-20 01:47:18.947879453 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/forward_list.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/forward_list.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/forward_list.hpp 2019-05-01 14:17:34.415005210 +0200 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/forward_list.hpp 2022-05-20 01:47:18.947879453 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/functional.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/functional.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/functional.hpp 2019-05-01 14:17:34.415005210 +0200 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/functional.hpp 2022-05-20 01:47:18.947879453 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/list.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/list.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/list.hpp 2019-05-01 14:17:34.415005210 +0200 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/list.hpp 2022-05-20 01:47:18.947879453 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/map.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/map.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/map.hpp 2019-05-01 14:17:34.415005210 +0200 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/map.hpp 2022-05-20 01:47:18.947879453 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/memory.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/memory.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/memory.hpp 2021-11-23 02:16:43.657589163 +0100 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/memory.hpp 2022-05-20 01:47:18.951212772 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND @@ -263,7 +263,7 @@ { auto & ptr = wrapper.ptr; - uint32_t id = ar.registerSharedPointer( ptr.get() ); + uint32_t id = ar.registerSharedPointer( ptr ); ar( CEREAL_NVP_("id", id) ); if( id & detail::msb_32bit ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/optional.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/optional.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/optional.hpp 2021-11-23 02:16:43.657589163 +0100 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/optional.hpp 2022-05-20 01:47:18.951212772 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND @@ -56,9 +56,8 @@ if (nullopt) { optional = std::nullopt; } else { - T value; - ar(CEREAL_NVP_("data", value)); - optional = std::move(value); + optional.emplace(); + ar(CEREAL_NVP_("data", *optional)); } } } // namespace cereal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/polymorphic.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/polymorphic.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/polymorphic.hpp 2021-11-23 02:16:43.657589163 +0100 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/polymorphic.hpp 2022-05-20 01:47:18.951212772 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND @@ -38,7 +38,7 @@ #include "cereal/details/traits.hpp" #include "cereal/details/polymorphic_impl.hpp" -#ifdef _MSC_VER +#if defined(_MSC_VER) && _MSC_VER < 1916 #define CEREAL_STATIC_CONSTEXPR static #else #define CEREAL_STATIC_CONSTEXPR static constexpr diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/queue.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/queue.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/queue.hpp 2019-05-01 14:17:34.415005210 +0200 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/queue.hpp 2022-05-20 01:47:18.951212772 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/set.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/set.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/set.hpp 2019-05-01 14:17:34.418338540 +0200 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/set.hpp 2022-05-20 01:47:18.951212772 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/stack.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/stack.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/stack.hpp 2019-05-01 14:17:34.418338540 +0200 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/stack.hpp 2022-05-20 01:47:18.951212772 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/string.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/string.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/string.hpp 2019-05-01 14:17:34.418338540 +0200 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/string.hpp 2022-05-20 01:47:18.951212772 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/tuple.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/tuple.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/tuple.hpp 2021-11-23 02:16:43.657589163 +0100 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/tuple.hpp 2022-05-20 01:47:18.951212772 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/unordered_map.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/unordered_map.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/unordered_map.hpp 2019-05-01 14:17:34.418338540 +0200 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/unordered_map.hpp 2022-05-20 01:47:18.951212772 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/unordered_set.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/unordered_set.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/unordered_set.hpp 2019-05-01 14:17:34.418338540 +0200 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/unordered_set.hpp 2022-05-20 01:47:18.951212772 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/utility.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/utility.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/utility.hpp 2019-05-01 14:17:34.418338540 +0200 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/utility.hpp 2022-05-20 01:47:18.951212772 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/valarray.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/valarray.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/valarray.hpp 2019-05-01 14:17:34.418338540 +0200 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/valarray.hpp 2022-05-20 01:47:18.951212772 +0200 @@ -20,7 +20,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/variant.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/variant.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/variant.hpp 2021-11-23 02:16:43.657589163 +0100 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/variant.hpp 2022-05-20 01:47:18.951212772 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND @@ -54,25 +54,24 @@ }; //! @internal - template<int N, class Variant, class ... Args, class Archive> + template<int N, class Variant, class Archive> typename std::enable_if<N == std::variant_size_v<Variant>, void>::type load_variant(Archive & /*ar*/, int /*target*/, Variant & /*variant*/) { throw ::cereal::Exception("Error traversing variant during load"); } //! @internal - template<int N, class Variant, class H, class ... T, class Archive> + template<int N, class Variant, class Archive> typename std::enable_if<N < std::variant_size_v<Variant>, void>::type load_variant(Archive & ar, int target, Variant & variant) { if(N == target) { - H value; - ar( CEREAL_NVP_("data", value) ); - variant = std::move(value); + variant.template emplace<N>(); + ar( CEREAL_NVP_("data", std::get<N>(variant)) ); } else - load_variant<N+1, Variant, T...>(ar, target, variant); + load_variant<N+1>(ar, target, variant); } } // namespace variant_detail @@ -98,7 +97,7 @@ if(index >= static_cast<std::int32_t>(std::variant_size_v<variant_t>)) throw Exception("Invalid 'index' selector when deserializing std::variant"); - variant_detail::load_variant<0, variant_t, VariantTypes...>(ar, index, variant); + variant_detail::load_variant<0>(ar, index, variant); } //! Serializing a std::monostate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/vector.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/vector.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/types/vector.hpp 2021-11-23 02:16:43.657589163 +0100 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/types/vector.hpp 2022-05-20 01:47:18.951212772 +0200 @@ -12,14 +12,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND @@ -100,7 +100,7 @@ ar( make_size_tag( size ) ); vector.resize( static_cast<std::size_t>( size ) ); - for(auto v : vector) + for(auto && v : vector) { bool b; ar( b ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/version.hpp new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/version.hpp --- old/e-antic-1.2.0/libeantic/test/external/cereal/include/cereal/version.hpp 2021-11-23 02:16:43.657589163 +0100 +++ new/e-antic-1.2.1/libeantic/test/external/cereal/include/cereal/version.hpp 2022-05-20 01:47:18.951212772 +0200 @@ -18,14 +18,14 @@ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of cereal nor the + * Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND @@ -42,7 +42,7 @@ //! The minor version #define CEREAL_VERSION_MINOR 3 //! The patch version -#define CEREAL_VERSION_PATCH 0 +#define CEREAL_VERSION_PATCH 2 //! The full version as a single number #define CEREAL_VERSION (CEREAL_VERSION_MAJOR * 10000 \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/libeantic/test/renfxx/t-cereal.cpp new/e-antic-1.2.1/libeantic/test/renfxx/t-cereal.cpp --- old/e-antic-1.2.0/libeantic/test/renfxx/t-cereal.cpp 2021-11-23 02:10:32.040586660 +0100 +++ new/e-antic-1.2.1/libeantic/test/renfxx/t-cereal.cpp 2022-05-20 01:38:03.663483487 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2019-2021 Julian R??th + Copyright (C) 2019-2022 Julian R??th This file is part of e-antic @@ -60,3 +60,14 @@ test_serialization(a); test_serialization(std::vector<renf_elem_class>{a, a, b}); } + +TEST_CASE("Deserialize elements which were created with e-antic <1") { + std::stringstream s; + s << R"({"cereal":{"cereal_class_version": 0, "parent": {"shared": 2147483649, "name": "c", "embedding": "[1.979642883761865464752184075553437574753038743897433376 +/- 4.15e-55]", "minpoly": "c^10 - 11*c^8 + 44*c^6 - 77*c^4 + 55*c^2 - 11", "precision": 64}, "value": "292/33*c^9 + 2272/33*c^8 - 804/11*c^7 - 6225/11*c^6 + 6032/33*c^5 + 46124/33*c^4 - 156*c^3 - 39275/33*c^2 + 100/3*c + 307"}})"; + + renf_elem_class x; + { + ::cereal::JSONInputArchive archive(s); + archive(x); + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/e-antic-1.2.0/pyeantic/configure.ac new/e-antic-1.2.1/pyeantic/configure.ac --- old/e-antic-1.2.0/pyeantic/configure.ac 2022-04-10 14:08:32.433766504 +0200 +++ new/e-antic-1.2.1/pyeantic/configure.ac 2022-05-20 13:05:22.068755417 +0200 @@ -2,7 +2,7 @@ dnl We need at least autoconf 2.69 for this configure.ac to work. AC_PREREQ([2.69]) -AC_INIT([pyeantic], [1.2.0], [julian.ru...@fsfe.org]) +AC_INIT([pyeantic], [1.2.1], [julian.ru...@fsfe.org]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([1.14.1 tar-pax foreign])
