diff --git a/externals/coda-oss/ReleaseNotes.md b/externals/coda-oss/ReleaseNotes.md index 45307ae397..8027ad8bea 100644 --- a/externals/coda-oss/ReleaseNotes.md +++ b/externals/coda-oss/ReleaseNotes.md @@ -11,12 +11,14 @@ ``` # coda-oss Release Notes -## [Release 202?-??-??](https://github.com/mdaus/coda-oss/releases/tag/202?-??-??) +## [Release 2022-11-04](https://github.com/mdaus/coda-oss/releases/tag/2022-11-04) +* "Cut" from [main](https://github.com/mdaus/coda-oss/tree/main), not *master*. * The [HDFGroup](https://hdfgroup.org/)s [HDF5 library](https://github.com/HDFGroup/hdf5) is built and installed; a simple (and very incomplete!) wrapper is provided, this is at the "hello world!" stage. * A few **cli** routines have been tweaked to make unit-testing easier. * Utilitiy routines for finding various files when unit-testing. -* Removed C++14 work-arounds needed in C++11. +* Removed C++14 work-arounds needed in C++11. Legacy C++ exception specificatons removed. +* Rebuild `waf` for FIPS error; added more debug options. ## [Release 2022-08-30](https://github.com/mdaus/coda-oss/releases/tag/2022-08-30) * XML is now always written as UTF-8; the code will still try to read Windows-1252. diff --git a/externals/coda-oss/modules/drivers/hdf5/CMakeLists.txt b/externals/coda-oss/modules/drivers/hdf5/CMakeLists.txt index 8c1f1ab74e..37a9230b54 100644 --- a/externals/coda-oss/modules/drivers/hdf5/CMakeLists.txt +++ b/externals/coda-oss/modules/drivers/hdf5/CMakeLists.txt @@ -1,7 +1,7 @@ set(MODULE_NAME hdf5) if(CODA_ENABLE_HDF5) - coda_add_module(${MODULE_NAME} VERSION 1.12.2) + coda_add_module(${MODULE_NAME} VERSION 1.13.2) else() message("${MODULE_NAME} will not be built since HDF5 is not enabled") endif() diff --git a/externals/coda-oss/modules/drivers/hdf5/include/H5Exception.h b/externals/coda-oss/modules/drivers/hdf5/include/H5Exception.h index 0607803928..89419669d1 100644 --- a/externals/coda-oss/modules/drivers/hdf5/include/H5Exception.h +++ b/externals/coda-oss/modules/drivers/hdf5/include/H5Exception.h @@ -75,7 +75,7 @@ class H5_DLLCPP Exception { Exception(const Exception &orig); // virtual Destructor - virtual ~Exception() throw(); + virtual ~Exception() noexcept; protected: // Default value for detail_message @@ -90,84 +90,84 @@ class H5_DLLCPP FileIException : public Exception { public: FileIException(const H5std_string &func_name, const H5std_string &message = DEFAULT_MSG); FileIException(); - virtual ~FileIException() throw() override; + virtual ~FileIException() noexcept override; }; class H5_DLLCPP GroupIException : public Exception { public: GroupIException(const H5std_string &func_name, const H5std_string &message = DEFAULT_MSG); GroupIException(); - virtual ~GroupIException() throw() override; + virtual ~GroupIException() noexcept override; }; class H5_DLLCPP DataSpaceIException : public Exception { public: DataSpaceIException(const H5std_string &func_name, const H5std_string &message = DEFAULT_MSG); DataSpaceIException(); - virtual ~DataSpaceIException() throw() override; + virtual ~DataSpaceIException() noexcept override; }; class H5_DLLCPP DataTypeIException : public Exception { public: DataTypeIException(const H5std_string &func_name, const H5std_string &message = DEFAULT_MSG); DataTypeIException(); - virtual ~DataTypeIException() throw() override; + virtual ~DataTypeIException() noexcept override; }; class H5_DLLCPP ObjHeaderIException : public Exception { public: ObjHeaderIException(const H5std_string &func_name, const H5std_string &message = DEFAULT_MSG); ObjHeaderIException(); - virtual ~ObjHeaderIException() throw() override; + virtual ~ObjHeaderIException() noexcept override; }; class H5_DLLCPP PropListIException : public Exception { public: PropListIException(const H5std_string &func_name, const H5std_string &message = DEFAULT_MSG); PropListIException(); - virtual ~PropListIException() throw() override; + virtual ~PropListIException() noexcept override; }; class H5_DLLCPP DataSetIException : public Exception { public: DataSetIException(const H5std_string &func_name, const H5std_string &message = DEFAULT_MSG); DataSetIException(); - virtual ~DataSetIException() throw() override; + virtual ~DataSetIException() noexcept override; }; class H5_DLLCPP AttributeIException : public Exception { public: AttributeIException(const H5std_string &func_name, const H5std_string &message = DEFAULT_MSG); AttributeIException(); - virtual ~AttributeIException() throw() override; + virtual ~AttributeIException() noexcept override; }; class H5_DLLCPP ReferenceException : public Exception { public: ReferenceException(const H5std_string &func_name, const H5std_string &message = DEFAULT_MSG); ReferenceException(); - virtual ~ReferenceException() throw() override; + virtual ~ReferenceException() noexcept override; }; class H5_DLLCPP LibraryIException : public Exception { public: LibraryIException(const H5std_string &func_name, const H5std_string &message = DEFAULT_MSG); LibraryIException(); - virtual ~LibraryIException() throw() override; + virtual ~LibraryIException() noexcept override; }; class H5_DLLCPP LocationException : public Exception { public: LocationException(const H5std_string &func_name, const H5std_string &message = DEFAULT_MSG); LocationException(); - virtual ~LocationException() throw() override; + virtual ~LocationException() noexcept override; }; class H5_DLLCPP IdComponentException : public Exception { public: IdComponentException(const H5std_string &func_name, const H5std_string &message = DEFAULT_MSG); IdComponentException(); - virtual ~IdComponentException() throw() override; + virtual ~IdComponentException() noexcept override; }; // end of IdComponentException } // namespace H5 diff --git a/externals/coda-oss/modules/drivers/hdf5/source/H5Exception.cpp b/externals/coda-oss/modules/drivers/hdf5/source/H5Exception.cpp index 5687514c3e..91ab3311b4 100644 --- a/externals/coda-oss/modules/drivers/hdf5/source/H5Exception.cpp +++ b/externals/coda-oss/modules/drivers/hdf5/source/H5Exception.cpp @@ -352,7 +352,7 @@ Exception::printErrorStack(FILE *stream, hid_t err_stack) ///\brief Noop destructor // Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- -Exception::~Exception() throw() +Exception::~Exception() noexcept { } @@ -382,7 +382,7 @@ FileIException::FileIException(const H5std_string &func, const H5std_string &mes // Function: FileIException destructor ///\brief Noop destructor. //-------------------------------------------------------------------------- -FileIException::~FileIException() throw() +FileIException::~FileIException() noexcept { } @@ -412,7 +412,7 @@ GroupIException::GroupIException(const H5std_string &func, const H5std_string &m // Function: GroupIException destructor ///\brief Noop destructor. //-------------------------------------------------------------------------- -GroupIException::~GroupIException() throw() +GroupIException::~GroupIException() noexcept { } @@ -442,7 +442,7 @@ DataSpaceIException::DataSpaceIException(const H5std_string &func, const H5std_s // Function: DataSpaceIException destructor ///\brief Noop destructor. //-------------------------------------------------------------------------- -DataSpaceIException::~DataSpaceIException() throw() +DataSpaceIException::~DataSpaceIException() noexcept { } @@ -472,7 +472,7 @@ DataTypeIException::DataTypeIException(const H5std_string &func, const H5std_str // Function: DataTypeIException destructor ///\brief Noop destructor. //-------------------------------------------------------------------------- -DataTypeIException::~DataTypeIException() throw() +DataTypeIException::~DataTypeIException() noexcept { } @@ -502,7 +502,7 @@ ObjHeaderIException::ObjHeaderIException(const H5std_string &func, const H5std_s // Function: ObjHeaderIException destructor ///\brief Noop destructor. //-------------------------------------------------------------------------- -ObjHeaderIException::~ObjHeaderIException() throw() +ObjHeaderIException::~ObjHeaderIException() noexcept { } @@ -532,7 +532,7 @@ PropListIException::PropListIException(const H5std_string &func, const H5std_str // Function: PropListIException destructor ///\brief Noop destructor. //-------------------------------------------------------------------------- -PropListIException::~PropListIException() throw() +PropListIException::~PropListIException() noexcept { } @@ -562,7 +562,7 @@ DataSetIException::DataSetIException(const H5std_string &func, const H5std_strin // Function: DataSetIException destructor ///\brief Noop destructor. //-------------------------------------------------------------------------- -DataSetIException::~DataSetIException() throw() +DataSetIException::~DataSetIException() noexcept { } @@ -592,7 +592,7 @@ AttributeIException::AttributeIException(const H5std_string &func, const H5std_s // Function: AttributeIException destructor ///\brief Noop destructor. //-------------------------------------------------------------------------- -AttributeIException::~AttributeIException() throw() +AttributeIException::~AttributeIException() noexcept { } @@ -622,7 +622,7 @@ ReferenceException::ReferenceException(const H5std_string &func, const H5std_str // Function: ReferenceException destructor ///\brief Noop destructor. //-------------------------------------------------------------------------- -ReferenceException::~ReferenceException() throw() +ReferenceException::~ReferenceException() noexcept { } @@ -652,7 +652,7 @@ LibraryIException::LibraryIException(const H5std_string &func, const H5std_strin // Function: LibraryIException destructor ///\brief Noop destructor. //-------------------------------------------------------------------------- -LibraryIException::~LibraryIException() throw() +LibraryIException::~LibraryIException() noexcept { } @@ -682,7 +682,7 @@ LocationException::LocationException(const H5std_string &func, const H5std_strin // Function: LocationException destructor ///\brief Noop destructor. //-------------------------------------------------------------------------- -LocationException::~LocationException() throw() +LocationException::~LocationException() noexcept { } @@ -712,7 +712,7 @@ IdComponentException::IdComponentException(const H5std_string &func, const H5std // Function: IdComponentException destructor ///\brief Noop destructor. //-------------------------------------------------------------------------- -IdComponentException::~IdComponentException() throw() +IdComponentException::~IdComponentException() noexcept { } diff --git a/externals/coda-oss/modules/drivers/hdf5/wscript b/externals/coda-oss/modules/drivers/hdf5/wscript index 35b872c5fb..e3665533e6 100644 --- a/externals/coda-oss/modules/drivers/hdf5/wscript +++ b/externals/coda-oss/modules/drivers/hdf5/wscript @@ -1,5 +1,5 @@ NAME = 'hdf5' -VERSION = '1.12.2' +VERSION = '1.13.2' options = configure = distclean = lambda p: None diff --git a/externals/nitro/ReleaseNotes.md b/externals/nitro/ReleaseNotes.md index 87e0476239..df93e5af7d 100644 --- a/externals/nitro/ReleaseNotes.md +++ b/externals/nitro/ReleaseNotes.md @@ -1,9 +1,11 @@ # NITRO (NITF i/o) Release Notes -## [Version 2.??.?](https://github.com/mdaus/nitro/releases/tag/NITRO-2.??.?); ??? ??, 202? -* [coda-oss](https://github.com/mdaus/coda-oss) release [202?-??-??](https://github.com/mdaus/coda-oss/releases/tag/202?-??-??) +## [Version 2.11.1](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.1); November 4, 2022 +* [coda-oss](https://github.com/mdaus/coda-oss) release [2022-11-04](https://github.com/mdaus/coda-oss/releases/tag/2022-11-04) * fixed incorrect field sizes in the CSEXRB TRE. * make unittests work better when included elsewhere (e.g., SIX) as **externals**. +* remove exception specifications +* `tarfile.extractall()` sanitization ## [Version 2.11.0](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.0); August 30, 2022 * [coda-oss](https://github.com/mdaus/coda-oss) release [2022-08-30_cpp14](https://github.com/mdaus/coda-oss/releases/tag/2022-08-30_cpp14) diff --git a/externals/nitro/Test++/pch.h b/externals/nitro/Test++/pch.h index cbc4595c7c..050a70e79f 100644 --- a/externals/nitro/Test++/pch.h +++ b/externals/nitro/Test++/pch.h @@ -28,6 +28,8 @@ #pragma warning(disable: 5032) // detected #pragma warning(push) with no corresponding #pragma warning(pop) #pragma warning(push) #pragma warning(disable: 4464) // relative include path contains '..' +#pragma warning(disable: 4625) // '...' : copy constructor was implicitly defined as deleted +#pragma warning(disable: 4626) // '...' : assignment operator was implicitly defined as deleted #include #include #include diff --git a/externals/nitro/modules/c++/nitf/include/nitf/Version.hpp b/externals/nitro/modules/c++/nitf/include/nitf/Version.hpp index a81c898ae0..034da40ed3 100644 --- a/externals/nitro/modules/c++/nitf/include/nitf/Version.hpp +++ b/externals/nitro/modules/c++/nitf/include/nitf/Version.hpp @@ -27,6 +27,7 @@ #include "config/Version.h" #include "nitf/Version.h" + // 2.11.1 November 4, 2022 // 2.11.0 August 30, 2022 (C++14) // 2.10.12 August 30, 2022 // 2.10.11 August 2, 2022 @@ -36,7 +37,7 @@ // 2.10.7 December 13, 2021 #define NITF_VERSION_MAJOR 2 #define NITF_VERSION_MINOR 11 -#define NITF_VERSION_PATCH 0 +#define NITF_VERSION_PATCH 1 #define NITF_VERSION_BUILD 0 #define NITF_VERSION CODA_OSS_MAKE_VERSION_MMPB(NITF_VERSION_MAJOR, NITF_VERSION_MINOR, NITF_VERSION_PATCH, NITF_VERSION_BUILD) diff --git a/externals/nitro/modules/c++/nitf/tests/test_functional.h b/externals/nitro/modules/c++/nitf/tests/test_functional.h index 2b99b1f092..52540ddf75 100644 --- a/externals/nitro/modules/c++/nitf/tests/test_functional.h +++ b/externals/nitro/modules/c++/nitf/tests/test_functional.h @@ -48,7 +48,7 @@ typedef typename std::vector< std::pair< std::string, Iterator end() { return mVec.end(); } std::mem_fun_ref_t operator[] (const std::string& key) - throw(except::NoSuchKeyException) + { if (!exists(key)) throw except::NoSuchKeyException(key); diff --git a/externals/nitro/modules/c/nrt/include/nrt/Version.h b/externals/nitro/modules/c/nrt/include/nrt/Version.h index 4388a60d2a..666074102c 100644 --- a/externals/nitro/modules/c/nrt/include/nrt/Version.h +++ b/externals/nitro/modules/c/nrt/include/nrt/Version.h @@ -1,5 +1,5 @@ #pragma once #if !defined(NRT_LIB_VERSION) -#define NRT_LIB_VERSION "2.11.0" +#define NRT_LIB_VERSION "2.11.1" #endif