Added cereal as submodule, removed local copy

The submodule is the current master, which is exactly v1.2.2.
The removed local copy is v1.1.1.

Files saved with the old version seem to be readable with the new version. (apart from the fact that we've now changed to Eigen, which makes it incompatible to the old models.)

.gitmodules

@@ -13,3 +13,6 @@
 [submodule "3rdparty/mexplus"]
 	path = 3rdparty/mexplus
 	url = https://github.com/kyamagu/mexplus.git
+[submodule "3rdparty/cereal"]
+	path = 3rdparty/cereal
+	url = https://github.com/USCiLab/cereal.git

cereal @ 51cbda5f

+Subproject commit 51cbda5f30e56c801c07fe3d3aba5d7fb9e6cca4

3rdparty/cereal-1.1.1/LICENSE

-Copyright (c) 2014, Randolph Voorhies, Shane Grant
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * 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
-      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
-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.

3rdparty/cereal-1.1.1/README.md

-cereal - A C++11 library for serialization
-==========================================
-
-<img src="http://uscilab.github.io/cereal/assets/img/cerealboxside.png" align="right"/><p>cereal is a header-only C++11 serialization library.  cereal takes arbitrary data types and reversibly turns them into different representations, such as compact binary encodings, XML, or JSON.  cereal was designed to be fast, light-weight, and easy to extend - it has no external dependencies and can be easily bundled with other code or used standalone.</p>
-
-### cereal has great documentation
-
-Looking for more information on how cereal works and its documentation?  Visit [cereal's web page](http://USCiLab.github.com/cereal) to get the latest information.
-
-### cereal is easy to use
-
-Installation and use of of cereal is fully documented on the [main web page](http://USCiLab.github.com/cereal), but this is a quick and dirty version:
-
-* Download cereal and place the headers somewhere your code can see them
-* Write serialization functions for your custom types or use the built in support for the standard library cereal provides
-* Use the serialization archives to load and save data
-
-```cpp
-#include <cereal/types/unordered_map.hpp>
-#include <cereal/types/memory.hpp>
-#include <cereal/archives/binary.hpp>
-#include <fstream>
-    
-struct MyRecord
-{
-  uint8_t x, y;
-  float z;
-  
-  template <class Archive>
-  void serialize( Archive & ar )
-  {
-    ar( x, y, z );
-  }
-};
-    
-struct SomeData
-{
-  int32_t id;
-  std::shared_ptr<std::unordered_map<uint32_t, MyRecord>> data;
-  
-  template <class Archive>
-  void save( Archive & ar ) const
-  {
-    ar( data );
-  }
-      
-  template <class Archive>
-  void load( Archive & ar )
-  {
-    static int32_t idGen = 0;
-    id = idGen++;
-    ar( data );
-  }
-};
-
-int main()
-{
-  std::ofstream os("out.cereal", std::ios::binary);
-  cereal::BinaryOutputArchive archive( os );
-
-  SomeData myData;
-  archive( myData );
-
-  return 0;
-}
-```    
-
-### cereal has a mailing list
-
-Either get in touch over <a href="mailto:cerealcpp@googlegroups.com">email</a> or [on the web](https://groups.google.com/forum/#!forum/cerealcpp).
-
-
-
-## cereal has a permissive license
-
-cereal is licensed under the [BSD license](http://opensource.org/licenses/BSD-3-Clause).
-
-## cereal build status
-
-* develop : [![Build Status](https://travis-ci.org/USCiLab/cereal.png?branch=develop)](https://travis-ci.org/USCiLab/cereal)
-
----
-
-Were you looking for the Haskell cereal?  Go <a href="https://github.com/GaloisInc/cereal">here</a>.

3rdparty/cereal-1.1.1/include/cereal/archives/adapters.hpp

-/*! \file adapters.hpp
-    \brief Archive adapters that provide additional functionality
-           on top of an existing archive */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * 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
-        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
-  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.
-*/
-#ifndef CEREAL_ARCHIVES_ADAPTERS_HPP_
-#define CEREAL_ARCHIVES_ADAPTERS_HPP_
-
-#include <cereal/details/helpers.hpp>
-#include <utility>
-
-namespace cereal
-{
-  #ifdef CEREAL_FUTURE_EXPERIMENTAL
-
-  // Forward declaration for friend access
-  template <class U, class A> U & get_user_data( A & );
-
-  //! Wraps an archive and gives access to user data
-  /*! This adapter is useful if you require access to
-      either raw pointers or references within your
-      serialization functions.
-
-      While cereal does not directly support serialization
-      raw pointers or references, it is sometimes the case
-      that you may want to supply something such as a raw
-      pointer or global reference to some constructor.
-      In this situation this adapter would likely be used
-      with the construct class to allow for non-default
-      constructors.
-
-      @note This feature is experimental and may be altered or removed in a future release. See issue #46.
-
-      @code{.cpp}
-      struct MyUserData
-      {
-        int * myRawPointer;
-        std::reference_wrapper<MyOtherType> myReference;
-      };
-
-      struct MyClass
-      {
-        // Note the raw pointer parameter
-        MyClass( int xx, int * rawP );
-
-        int x;
-
-        template <class Archive>
-        void serialize( Archive & ar )
-        { ar( x ); }
-
-        template <class Archive>
-        static void load_and_construct( Archive & ar, cereal::construct<MyClass> & construct )
-        {
-          int xx;
-          ar( xx );
-          // note the need to use get_user_data to retrieve user data from the archive
-          construct( xx, cereal::get_user_data<MyUserData>( ar ).myRawPointer );
-        }
-      };
-
-      int main()
-      {
-        {
-          MyUserData md;
-          md.myRawPointer = &something;
-          md.myReference = someInstanceOfType;
-
-          std::ifstream is( "data.xml" );
-          cereal::UserDataAdapter<MyUserData, cereal::XMLInputArchive> ar( md, is );
-
-          std::unique_ptr<MyClass> sc;
-          ar( sc ); // use as normal
-        }
-
-        return 0;
-      }
-      @endcode
-
-      @relates get_user_data
-
-      @tparam UserData The type to give the archive access to
-      @tparam Archive The archive to wrap */
-  template <class UserData, class Archive>
-  class UserDataAdapter : public Archive
-  {
-    public:
-      //! Construct the archive with some user data struct
-      /*! This will forward all arguments (other than the user
-          data) to the wrapped archive type.  The UserDataAdapter
-          can then be used identically to the wrapped archive type
-
-          @tparam Args The arguments to pass to the constructor of
-                       the archive. */
-      template <class ... Args>
-      UserDataAdapter( UserData & ud, Args && ... args ) :
-        Archive( std::forward<Args>( args )... ),
-        userdata( ud )
-      { }
-
-    private:
-      //! Overload the rtti function to enable dynamic_cast
-      void rtti() {}
-      friend UserData & get_user_data<UserData>( Archive & ar );
-      UserData & userdata; //!< The actual user data
-  };
-
-  //! Retrieves user data from an archive wrapped by UserDataAdapter
-  /*! This will attempt to retrieve the user data associated with
-      some archive wrapped by UserDataAdapter.  If this is used on
-      an archive that is not wrapped, a run-time exception will occur.
-
-      @note This feature is experimental and may be altered or removed in a future release. See issue #46.
-
-      @note The correct use of this function cannot be enforced at compile
-            time.
-
-      @relates UserDataAdapter
-      @tparam UserData The data struct contained in the archive
-      @tparam Archive The archive, which should be wrapped by UserDataAdapter
-      @param ar The archive
-      @throws Exception if the archive this is used upon is not wrapped with
-                        UserDataAdapter. */
-  template <class UserData, class Archive>
-  UserData & get_user_data( Archive & ar )
-  {
-    try
-    {
-      return dynamic_cast<UserDataAdapter<UserData, Archive> &>( ar ).userdata;
-    }
-    catch( std::bad_cast const & )
-    {
-      throw ::cereal::Exception("Attempting to get user data from archive not wrapped in UserDataAdapter");
-    }
-  }
-  #endif // CEREAL_FUTURE_EXPERIMENTAL
-} // namespace cereal
-
-#endif // CEREAL_ARCHIVES_ADAPTERS_HPP_

3rdparty/cereal-1.1.1/include/cereal/archives/binary.hpp

-/*! \file binary.hpp
-    \brief Binary input and output archives */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * 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
-        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
-  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.
-*/
-#ifndef CEREAL_ARCHIVES_BINARY_HPP_
-#define CEREAL_ARCHIVES_BINARY_HPP_
-
-#include <cereal/cereal.hpp>
-#include <sstream>
-
-namespace cereal
-{
-  // ######################################################################
-  //! An output archive designed to save data in a compact binary representation
-  /*! This archive outputs data to a stream in an extremely compact binary
-      representation with as little extra metadata as possible.
-
-      This archive does nothing to ensure that the endianness of the saved
-      and loaded data is the same.  If you need to have portability over
-      architectures with different endianness, use PortableBinaryOutputArchive.
-
-      When using a binary archive and a file stream, you must use the
-      std::ios::binary format flag to avoid having your data altered
-      inadvertently.
-
-      \ingroup Archives */
-  class BinaryOutputArchive : public OutputArchive<BinaryOutputArchive, AllowEmptyClassElision>
-  {
-    public:
-      //! Construct, outputting to the provided stream
-      /*! @param stream The stream to output to.  Can be a stringstream, a file stream, or
-                        even cout! */
-      BinaryOutputArchive(std::ostream & stream) :
-        OutputArchive<BinaryOutputArchive, AllowEmptyClassElision>(this),
-        itsStream(stream)
-      { }
-
-      //! Writes size bytes of data to the output stream
-      void saveBinary( const void * data, std::size_t size )
-      {
-        auto const writtenSize = static_cast<std::size_t>( itsStream.rdbuf()->sputn( reinterpret_cast<const char*>( data ), size ) );
-
-        if(writtenSize != size)
-          throw Exception("Failed to write " + std::to_string(size) + " bytes to output stream! Wrote " + std::to_string(writtenSize));
-      }
-
-    private:
-      std::ostream & itsStream;
-  };
-
-  // ######################################################################
-  //! An input archive designed to load data saved using BinaryOutputArchive
-  /*  This archive does nothing to ensure that the endianness of the saved
-      and loaded data is the same.  If you need to have portability over
-      architectures with different endianness, use PortableBinaryOutputArchive.
-
-      When using a binary archive and a file stream, you must use the
-      std::ios::binary format flag to avoid having your data altered
-      inadvertently.
-
-      \ingroup Archives */
-  class BinaryInputArchive : public InputArchive<BinaryInputArchive, AllowEmptyClassElision>
-  {
-    public:
-      //! Construct, loading from the provided stream
-      BinaryInputArchive(std::istream & stream) :
-        InputArchive<BinaryInputArchive, AllowEmptyClassElision>(this),
-        itsStream(stream)
-    { }
-
-      //! Reads size bytes of data from the input stream
-      void loadBinary( void * const data, std::size_t size )
-      {
-        auto const readSize = static_cast<std::size_t>( itsStream.rdbuf()->sgetn( reinterpret_cast<char*>( data ), size ) );
-
-        if(readSize != size)
-          throw Exception("Failed to read " + std::to_string(size) + " bytes from input stream! Read " + std::to_string(readSize));
-      }
-
-    private:
-      std::istream & itsStream;
-  };
-
-  // ######################################################################
-  // Common BinaryArchive serialization functions
-
-  //! Saving for POD types to binary
-  template<class T> inline
-  typename std::enable_if<std::is_arithmetic<T>::value, void>::type
-  CEREAL_SAVE_FUNCTION_NAME(BinaryOutputArchive & ar, T const & t)
-  {
-    ar.saveBinary(std::addressof(t), sizeof(t));
-  }
-
-  //! Loading for POD types from binary
-  template<class T> inline
-  typename std::enable_if<std::is_arithmetic<T>::value, void>::type
-  CEREAL_LOAD_FUNCTION_NAME(BinaryInputArchive & ar, T & t)
-  {
-    ar.loadBinary(std::addressof(t), sizeof(t));
-  }
-
-  //! Serializing NVP types to binary
-  template <class Archive, class T> inline
-  CEREAL_ARCHIVE_RESTRICT(BinaryInputArchive, BinaryOutputArchive)
-  CEREAL_SERIALIZE_FUNCTION_NAME( Archive & ar, NameValuePair<T> & t )
-  {
-    ar( t.value );
-  }
-
-  //! Serializing SizeTags to binary
-  template <class Archive, class T> inline
-  CEREAL_ARCHIVE_RESTRICT(BinaryInputArchive, BinaryOutputArchive)
-  CEREAL_SERIALIZE_FUNCTION_NAME( Archive & ar, SizeTag<T> & t )
-  {
-    ar( t.size );
-  }
-
-  //! Saving binary data
-  template <class T> inline
-  void CEREAL_SAVE_FUNCTION_NAME(BinaryOutputArchive & ar, BinaryData<T> const & bd)
-  {
-    ar.saveBinary( bd.data, static_cast<std::size_t>( bd.size ) );
-  }
-
-  //! Loading binary data
-  template <class T> inline
-  void CEREAL_LOAD_FUNCTION_NAME(BinaryInputArchive & ar, BinaryData<T> & bd)
-  {
-    ar.loadBinary(bd.data, static_cast<std::size_t>(bd.size));
-  }
-} // namespace cereal
-
-// register archives for polymorphic support
-CEREAL_REGISTER_ARCHIVE(cereal::BinaryOutputArchive)
-CEREAL_REGISTER_ARCHIVE(cereal::BinaryInputArchive)
-
-// tie input and output archives together
-CEREAL_SETUP_ARCHIVE_TRAITS(cereal::BinaryInputArchive, cereal::BinaryOutputArchive)
-
-#endif // CEREAL_ARCHIVES_BINARY_HPP_

3rdparty/cereal-1.1.1/include/cereal/details/static_object.hpp

-/*! \file static_object.hpp
-    \brief Internal polymorphism static object support
-    \ingroup Internal */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * 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
-        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
-  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.
-*/
-#ifndef CEREAL_DETAILS_STATIC_OBJECT_HPP_
-#define CEREAL_DETAILS_STATIC_OBJECT_HPP_
-
-//! Prevent link optimization from removing non-referenced static objects
-/*! Especially for polymorphic support, we create static objects which
-    may not ever be explicitly referenced.  Most linkers will detect this
-    and remove the code causing various unpleasant runtime errors.  These
-    macros, adopted from Boost (see force_include.hpp) prevent this
-    (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
-    Use, modification and distribution is subject to the Boost Software
-    License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-    http://www.boost.org/LICENSE_1_0.txt) */
-
-#ifdef _MSC_VER
-#   define CEREAL_DLL_EXPORT __declspec(dllexport)
-#   define CEREAL_USED
-#else // clang or gcc
-#   define CEREAL_DLL_EXPORT
-#   define CEREAL_USED __attribute__ ((__used__))
-#endif
-
-namespace cereal
-{
-  namespace detail
-  {
-    //! A static, pre-execution object
-    /*! This class will create a single copy (singleton) of some
-        type and ensures that merely referencing this type will
-        cause it to be instantiated and initialized pre-execution.
-        For example, this is used heavily in the polymorphic pointer
-        serialization mechanisms to bind various archive types with
-        different polymorphic classes */
-    template <class T>
-    class CEREAL_DLL_EXPORT StaticObject
-    {
-      private:
-        //! Forces instantiation at pre-execution time
-        static void instantiate( T const & ) {}
-
-        static T & create()
-        {
-          static T t;
-          instantiate(instance);
-          return t;
-        }
-
-        StaticObject( StaticObject const & /*other*/ ) {}
-
-      public:
-        static T & getInstance()
-        {
-          return create();
-        }
-
-      private:
-        static T & instance;
-    };
-
-    template <class T> T & StaticObject<T>::instance = StaticObject<T>::create();
-  } // namespace detail
-} // namespace cereal
-
-#endif // CEREAL_DETAILS_STATIC_OBJECT_HPP_
\ No newline at end of file

3rdparty/cereal-1.1.1/include/cereal/details/util.hpp

-/*! \file util.hpp
-    \brief Internal misc utilities
-    \ingroup Internal */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * 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
-        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
-  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.
-*/
-#ifndef CEREAL_DETAILS_UTIL_HPP_
-#define CEREAL_DETAILS_UTIL_HPP_
-
-#include <typeinfo>
-#include <string>
-
-#ifdef _MSC_VER
-namespace cereal
-{
-  namespace util
-  {
-    //! Demangles the type encoded in a string
-    /*! @internal */
-    inline std::string demangle( std::string const & name )
-    { return name; }
-
-    //! Gets the demangled name of a type
-    /*! @internal */
-    template <class T> inline
-    std::string demangledName()
-    { return typeid( T ).name(); }
-  } // namespace util
-} // namespace cereal
-#else // clang or gcc
-#include <cxxabi.h>
-#include <cstdlib>
-namespace cereal
-{
-  namespace util
-  {
-    //! Demangles the type encoded in a string
-    /*! @internal */
-    inline std::string demangle(std::string mangledName)
-    {
-      int status = 0;
-      char *demangledName = nullptr;
-      std::size_t len;
-
-      demangledName = abi::__cxa_demangle(mangledName.c_str(), 0, &len, &status);
-
-      std::string retName(demangledName);
-      free(demangledName);
-
-      return retName;
-    }
-
-    //! Gets the demangled name of a type
-    /*! @internal */
-    template<class T> inline
-    std::string demangledName()
-    { return demangle(typeid(T).name()); }
-  }
-} // namespace cereal
-#endif // clang or gcc branch of _MSC_VER
-#endif // CEREAL_DETAILS_UTIL_HPP_

3rdparty/cereal-1.1.1/include/cereal/external/base64.hpp

-/*
-   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.nyffenegger@adp-gmbh.ch
-*/
-
-#ifndef CEREAL_EXTERNAL_BASE64_HPP_
-#define CEREAL_EXTERNAL_BASE64_HPP_
-
-#include <string>
-
-namespace base64
-{
-  static const std::string chars =
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-    "abcdefghijklmnopqrstuvwxyz"
-    "0123456789+/";
-
-  static inline bool is_base64(unsigned char c) {
-    return (isalnum(c) || (c == '+') || (c == '/'));
-  }
-
-  inline std::string encode(unsigned char const* bytes_to_encode, size_t in_len) {
-    std::string ret;
-    int i = 0;
-    int j = 0;
-    unsigned char char_array_3[3];
-    unsigned char char_array_4[4];
-
-    while (in_len--) {
-      char_array_3[i++] = *(bytes_to_encode++);
-      if (i == 3) {
-        char_array_4[0] = (unsigned char) ((char_array_3[0] & 0xfc) >> 2);
-        char_array_4[1] = (unsigned char) ( ( ( char_array_3[0] & 0x03 ) << 4 ) + ( ( char_array_3[1] & 0xf0 ) >> 4 ) );
-        char_array_4[2] = (unsigned char) ( ( ( char_array_3[1] & 0x0f ) << 2 ) + ( ( char_array_3[2] & 0xc0 ) >> 6 ) );
-        char_array_4[3] = (unsigned char) ( char_array_3[2] & 0x3f );
-
-        for(i = 0; (i <4) ; i++)
-          ret += chars[char_array_4[i]];
-        i = 0;
-      }
-    }
-
-    if (i)
-    {
-      for(j = i; j < 3; j++)
-        char_array_3[j] = '\0';
-
-      char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
-      char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4);
-      char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6);
-      char_array_4[3] = char_array_3[2] & 0x3f;
-
-      for (j = 0; (j < i + 1); j++)
-        ret += chars[char_array_4[j]];
-
-      while((i++ < 3))
-        ret += '=';
-
-    }
-
-    return ret;
-
-  }
-
-  inline std::string decode(std::string const& encoded_string) {
-    size_t in_len = encoded_string.size();
-    size_t i = 0;
-    size_t j = 0;
-    int in_ = 0;
-    unsigned char char_array_4[4], char_array_3[3];
-    std::string ret;
-
-    while (in_len-- && ( encoded_string[in_] != '=') && is_base64(encoded_string[in_])) {
-      char_array_4[i++] = encoded_string[in_]; in_++;
-      if (i ==4) {
-        for (i = 0; i <4; i++)
-          char_array_4[i] = (unsigned char) chars.find( char_array_4[i] );
-
-        char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
-        char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
-        char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
-
-        for (i = 0; (i < 3); i++)
-          ret += char_array_3[i];
-        i = 0;
-      }
-    }
-
-    if (i) {
-      for (j = i; j <4; j++)
-        char_array_4[j] = 0;
-
-      for (j = 0; j <4; j++)
-        char_array_4[j] = (unsigned char) chars.find( char_array_4[j] );
-
-      char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
-      char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
-      char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
-
-      for (j = 0; (j < i - 1); j++) ret += char_array_3[j];
-    }
-
-    return ret;
-  }
-} // base64
-#endif // CEREAL_EXTERNAL_BASE64_HPP_

3rdparty/cereal-1.1.1/include/cereal/external/rapidjson/internal/strfunc.h

-#ifndef RAPIDJSON_INTERNAL_STRFUNC_H_
-#define RAPIDJSON_INTERNAL_STRFUNC_H_
-
-namespace rapidjson {
-namespace internal {
-
-//! Custom strlen() which works on different character types.
-/*!	\tparam Ch Character type (e.g. char, wchar_t, short)
-	\param s Null-terminated input string.
-	\return Number of characters in the string. 
-	\note This has the same semantics as strlen(), the return value is not number of Unicode codepoints.
-*/
-template <typename Ch>
-inline SizeType StrLen(const Ch* s) {
-	const Ch* p = s;
-	while (*p != '\0')
-		++p;
-	return SizeType(p - s);
-}
-
-} // namespace internal
-} // namespace rapidjson
-
-#endif // RAPIDJSON_INTERNAL_STRFUNC_H_

CMakeLists.txt

@@ -58,7 +58,7 @@ message(STATUS "Eigen3 include dir found at ${EIGEN3_INCLUDE_DIR}")
 set(eos_3RDPARTY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty") # this is used by the CMakeLists.txt files in the subdirectories
 
 # Set the include directories of the 3rd-party submodules that we use:
-set(CEREAL_INCLUDE_DIR "${eos_3RDPARTY_DIR}/cereal-1.1.1/include")
+set(CEREAL_INCLUDE_DIR "${eos_3RDPARTY_DIR}/cereal/include")
 set(glm_INCLUDE_DIR "${eos_3RDPARTY_DIR}/glm")
 set(nanoflann_INCLUDE_DIR "${eos_3RDPARTY_DIR}/nanoflann/include")
 set(eigen3_nnls_INCLUDE_DIR "${eos_3RDPARTY_DIR}/eigen3-nnls/src")
@@ -130,7 +130,7 @@ source_group(video REGULAR_EXPRESSION include/eos/video/*)
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include) # our library headers
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/share/ DESTINATION share) # the model and metadata
 # For 3rd party headers, we only copy the headers and licence files:
-install(DIRECTORY ${eos_3RDPARTY_DIR}/cereal-1.1.1/ DESTINATION 3rdparty/cereal-1.1.1) # cereal headers
+install(DIRECTORY ${eos_3RDPARTY_DIR}/cereal/ DESTINATION 3rdparty/cereal) # cereal headers
 install(DIRECTORY ${eos_3RDPARTY_DIR}/glm/glm/ DESTINATION 3rdparty/glm/glm) # glm headers
 install(FILES ${eos_3RDPARTY_DIR}/glm/copying.txt DESTINATION 3rdparty/glm/) # glm licence
 install(DIRECTORY ${eos_3RDPARTY_DIR}/nanoflann/include/ DESTINATION 3rdparty/nanoflann/include) # nanoflann header