Skip to content

Commit

Permalink
Develop/update externals (#603)
Browse files Browse the repository at this point in the history 
* latest from coda-oss

* xml.lite changes from coda-oss

* need updates to Python bindings too

* trying to fine the right macro for SWIG

* more xml.lite updates from coda-oss

* "private" is part of name mangling

* test_xmlParser might be be running in coda-oss

* xml.lite tweaks from coda-oss

* coda-oss release 2021-12-13

* nitro release 2.10.7

* Squashed commit of the following:

commit 474b7f2
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 13:00:02 2021 -0500

    xml.lite changes that need to get back to coda-oss

commit c9c0ec3
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 11:45:39 2021 -0500

    Squashed commit of the following:

    commit 33bd170
    Author: Dan Smith <[email protected]>
    Date:   Mon Dec 13 11:44:54 2021 -0500

        nitro release 2.10.7

    commit ef19ad2
    Author: Dan Smith <[email protected]>
    Date:   Mon Dec 13 11:42:09 2021 -0500

        coda-oss release 2021-12-13

    commit 86c1856
    Author: Dan Smith <[email protected]>
    Date:   Fri Dec 10 11:57:26 2021 -0500

        xml.lite tweaks from coda-oss

    commit f21f79d
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 17:36:09 2021 -0500

        test_xmlParser might be be running in coda-oss

    commit 3526cd0
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 16:09:17 2021 -0500

        "private" is part of name mangling

    commit 351a45f
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 15:54:13 2021 -0500

        more xml.lite updates from coda-oss

    commit 1c72ba2
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 15:15:34 2021 -0500

        trying to fine the right macro for SWIG

    commit 8d6e11d
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:51:34 2021 -0500

        need updates to Python bindings too

    commit e208dd4
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:41:12 2021 -0500

        xml.lite changes from coda-oss

    commit 169df75
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 14:32:37 2021 -0500

        latest from coda-oss

commit 1a74d40
Author: Dan Smith <[email protected]>
Date:   Fri Dec 10 12:26:10 2021 -0500

    more use of new xml.lite infrastructure

commit 5d641a4
Author: Dan Smith <[email protected]>
Date:   Fri Dec 10 11:58:22 2021 -0500

    use new xml.lite APIs to simplify code

commit 01f811e
Author: Dan Smith <[email protected]>
Date:   Fri Dec 10 11:57:57 2021 -0500

    Squashed commit of the following:

    commit 86c1856
    Author: Dan Smith <[email protected]>
    Date:   Fri Dec 10 11:57:26 2021 -0500

        xml.lite tweaks from coda-oss

    commit f21f79d
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 17:36:09 2021 -0500

        test_xmlParser might be be running in coda-oss

    commit 3526cd0
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 16:09:17 2021 -0500

        "private" is part of name mangling

    commit 351a45f
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 15:54:13 2021 -0500

        more xml.lite updates from coda-oss

    commit 1c72ba2
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 15:15:34 2021 -0500

        trying to fine the right macro for SWIG

    commit 8d6e11d
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:51:34 2021 -0500

        need updates to Python bindings too

    commit e208dd4
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:41:12 2021 -0500

        xml.lite changes from coda-oss

    commit 169df75
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 14:32:37 2021 -0500

        latest from coda-oss

commit 25b83eb
Author: Dan Smith <[email protected]>
Date:   Fri Dec 10 09:06:38 2021 -0500

    Squashed commit of the following:

    commit 3f59a62
    Author: Dan Smith <[email protected]>
    Date:   Fri Dec 10 08:44:54 2021 -0500

        still can't get French XML working

    commit 1a826e5
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 17:37:11 2021 -0500

        Squashed commit of the following:

        commit f21f79d
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 17:36:09 2021 -0500

            test_xmlParser might be be running in coda-oss

        commit 3526cd0
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 16:09:17 2021 -0500

            "private" is part of name mangling

        commit 351a45f
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:54:13 2021 -0500

            more xml.lite updates from coda-oss

        commit 1c72ba2
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:15:34 2021 -0500

            trying to fine the right macro for SWIG

        commit 8d6e11d
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:51:34 2021 -0500

            need updates to Python bindings too

        commit e208dd4
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:41:12 2021 -0500

            xml.lite changes from coda-oss

        commit 169df75
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 14:32:37 2021 -0500

            latest from coda-oss

    commit f705be9
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 17:35:35 2021 -0500

        add overloads for other code

    commit d613234
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 16:57:55 2021 -0500

        option to disable XML validation for SICD too

    commit bc2c97e
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 16:09:44 2021 -0500

        Squashed commit of the following:

        commit 3526cd0
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 16:09:17 2021 -0500

            "private" is part of name mangling

        commit 351a45f
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:54:13 2021 -0500

            more xml.lite updates from coda-oss

        commit 1c72ba2
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:15:34 2021 -0500

            trying to fine the right macro for SWIG

        commit 8d6e11d
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:51:34 2021 -0500

            need updates to Python bindings too

        commit e208dd4
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:41:12 2021 -0500

            xml.lite changes from coda-oss

        commit 169df75
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 14:32:37 2021 -0500

            latest from coda-oss

    commit 4cd813b
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 15:16:01 2021 -0500

        Squashed commit of the following:

        commit 1c72ba2
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:15:34 2021 -0500

            trying to fine the right macro for SWIG

        commit 8d6e11d
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:51:34 2021 -0500

            need updates to Python bindings too

        commit e208dd4
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:41:12 2021 -0500

            xml.lite changes from coda-oss

        commit 169df75
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 14:32:37 2021 -0500

            latest from coda-oss

    commit 7b210f9
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:51:53 2021 -0500

        Squashed commit of the following:

        commit 8d6e11d
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:51:34 2021 -0500

            need updates to Python bindings too

        commit e208dd4
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:41:12 2021 -0500

            xml.lite changes from coda-oss

        commit 169df75
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 14:32:37 2021 -0500

            latest from coda-oss

    commit 4a4d621
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:47:21 2021 -0500

        trying to get the "french" SICD unit-test working

    commit d63e6ea
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:42:55 2021 -0500

        Squashed commit of the following:

        commit e208dd4
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:41:12 2021 -0500

            xml.lite changes from coda-oss

        commit 169df75
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 14:32:37 2021 -0500

            latest from coda-oss

    commit d1a7e6f
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 09:29:07 2021 -0500

        test_valid_six unittests now working

    commit d6fb257
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 17:45:26 2021 -0500

        trying to re-enable more unittests

    commit c787e98
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 16:54:28 2021 -0500

        unit-test breaks on Linux

    commit bd82787
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 15:25:31 2021 -0500

        Squashed commit of the following:

        commit c56ac71
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:23:00 2021 -0500

            merge in develop/SIDD-3.0

    commit e621466
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 15:08:04 2021 -0500

        merge in develop/8AMPI_PHSI

commit 67768ea
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 10:02:19 2021 -0500

    Squashed commit of the following:

    commit d1a7e6f
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 09:29:07 2021 -0500

        test_valid_six unittests now working

    commit d6fb257
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 17:45:26 2021 -0500

        trying to re-enable more unittests

    commit c787e98
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 16:54:28 2021 -0500

        unit-test breaks on Linux

    commit bd82787
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 15:25:31 2021 -0500

        Squashed commit of the following:

        commit c56ac71
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:23:00 2021 -0500

            merge in develop/SIDD-3.0

    commit e621466
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 15:08:04 2021 -0500

        merge in develop/8AMPI_PHSI

commit b582c05
Author: Dan Smith <[email protected]>
Date:   Wed Dec 8 15:26:24 2021 -0500

    Squashed commit of the following:

    commit bd82787
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 15:25:31 2021 -0500

        Squashed commit of the following:

        commit c56ac71
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:23:00 2021 -0500

            merge in develop/SIDD-3.0

    commit e621466
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 15:08:04 2021 -0500

        merge in develop/8AMPI_PHSI

commit c56ac71
Author: Dan Smith <[email protected]>
Date:   Wed Dec 8 15:23:00 2021 -0500

    merge in develop/SIDD-3.0

* xml.lite tweaks from coda-oss

* simple URI validation

* create a "path" after splitting on ":"

* sanity-check a URI

* latest from coda-oss

* latest from coda-oss

* adjust for coda-oss changes

* latest from coda-oss

* explicitly =delete move

* str::strip from coda-oss

* use strongly-type TRE fields

* latest from coda-oss

* latest from nitro

* remove errors/warnings from coda-oss

* more tweaks to remove compiler warnings

* latest from coda-oss

* latest from "nitro"

* fix #ifdef

* descriptor updates from "nitro"

* certain NITRO unittests don't work in externals/nitro

* remove comments with a backslash at the end

* noexcept(false)

* UTF-8 to native string conversion

* Utf-8 -> Windows-1252

* latest drop from coda-oss

* update to account for coda-oss changes

* latest from "nitro"

* tweaks to get coda-oss building w/o warnings

* sys::Filesystem -> coda_oss::filesystem

* sys/Bit.h -> std/bit

* no more gsl::make_span

* rename sys/Filesystem

* finish renaming of sys/Filesystem.* to sys/filesystem.*

* latest from coda-oss

* construct a std::span directly, no make_span() utility (generates CA diagnostic)

* latest from coda-oss

* account for str:: changes in coda-oss

* turn off some code-analysis diagnostics

* minimize changes from "master"

* latest from coda-oss

* std::filesystem instead of coda_oss::filesystem

* latest from coda-oss

* latest from "nitro"

* latest from coda-oss

* latest from NITRO

* Update StringStream.h

* not all unit-tests build in "externals"

* fix compiler warning from xml.lite

* latest from coda-oss

* tweak GSL from coda-oss

* our span now has iterators

* latest from coda-oss

* latest from "nitro"

* latest from coda-oss

* latest from coda-oss

* latest from "nitro"

* imageCompression() now returns an "enum"

* unit tests that don't work in "externals"

* latest from coda-oss

* latest from "nitro"

* Update ReleaseNotes.md

* account for change to nitf::MemorySource

* some NITRO unit-tests don't work in "externals"

* tweaks to str::EncodedString from coda-oss

* latest from coda-oss and nitro

* latest from coda-oss

* coda-oss 2022-05-03

* NITRO-2.10.9

* Squashed commit of the following:

commit 40fe4e9
Author: Dan Smith <[email protected]>
Date:   Wed May 4 11:29:11 2022 -0400

    some projects get <six/Utilities.h> indirectrly

* latest from coda-oss

* latest from "nitro"

* add more coda-oss dependencies

* TEST_MAIN() no longer has argc/argv

* scene needs an explcit dependency on 'polygon'

* don't need VS UnitTest project

* Update test_j2k_loading++.cpp

* latest from coda-oss

* merge clobbered changes

* latest from coda-oss

* latest from "nitro"

* latest from coda-oss

* latest from "nitro"

* latest from coda-oss

* latest from "nitro"

* coda-oss 2022-06-29

* NITRO-2.10.10

* latest from "nitro"

* latest from coda-oss

* xml.lite uses UTF-8 from coda-oss

* latest from "nitro"

* coda-oss 2022-08-02

* NITRO-2.10.11

* coda-oss str API changes

* latest from coda-oss

* merge main

* update file permissions

* update file permissions

* not all NITRO unittests run in SIX

* match master

* latest from coda-oss

* latest from nitro

* latest from coda-oss

* latest from coda-oss and nitro

* unittest updates from NITRO

* run NITRO unittests in SIX

* unittest tweaks for NITRO

* try externals/nitro too

* coda-oss 2022-08-30_cpp14

* NITRO-2.11.0

* merge main

* latest from coda-oss

* latest from "nitro"

* run CodeQL against "main", not "master"

* fix compiler warnings (errors)

* latest from coda-oss

* latest from coda-oss

* merge main

* latest from nitro

* coda-oss updates

* update nitro

* externals/coda-oss/build is a real directory; don't .gitignore it.

* findFirstFile() utilities from coda-oss

* merge main-cpp17

* latest from coda-oss

* latest from "nitro"

* coda-oss release 2022-11-04

* NITRO 2.11.1

* "main" is still at C++14
  • Loading branch information
J. Daniel Smith authored Nov 4, 2022
1 parent bacdb10 commit 56c4038
Show file tree
Hide file tree
Showing 10 changed files with 42 additions and 35 deletions.
6 changes: 4 additions & 2 deletions externals/coda-oss/ReleaseNotes.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion externals/coda-oss/modules/drivers/hdf5/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -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()
26 changes: 13 additions & 13 deletions externals/coda-oss/modules/drivers/hdf5/include/H5Exception.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
26 changes: 13 additions & 13 deletions externals/coda-oss/modules/drivers/hdf5/source/H5Exception.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
}

Expand Down Expand Up @@ -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
{
}

Expand Down Expand Up @@ -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
{
}

Expand Down Expand Up @@ -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
{
}

Expand Down Expand Up @@ -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
{
}

Expand Down Expand Up @@ -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
{
}

Expand Down Expand Up @@ -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
{
}

Expand Down Expand Up @@ -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
{
}

Expand Down Expand Up @@ -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
{
}

Expand Down Expand Up @@ -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
{
}

Expand Down Expand Up @@ -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
{
}

Expand Down Expand Up @@ -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
{
}

Expand Down Expand Up @@ -712,7 +712,7 @@ IdComponentException::IdComponentException(const H5std_string &func, const H5std
// Function: IdComponentException destructor
///\brief Noop destructor.
//--------------------------------------------------------------------------
IdComponentException::~IdComponentException() throw()
IdComponentException::~IdComponentException() noexcept
{
}

Expand Down
2 changes: 1 addition & 1 deletion externals/coda-oss/modules/drivers/hdf5/wscript
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
NAME = 'hdf5'
VERSION = '1.12.2'
VERSION = '1.13.2'

options = configure = distclean = lambda p: None

Expand Down
6 changes: 4 additions & 2 deletions externals/nitro/ReleaseNotes.md
View file
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 2 additions & 0 deletions externals/nitro/Test++/pch.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 <nitf/coda-oss.hpp>
#include <math/Round.h>
#include <import/io.h>
Expand Down
3 changes: 2 additions & 1 deletion externals/nitro/modules/c++/nitf/include/nitf/Version.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion externals/nitro/modules/c++/nitf/tests/test_functional.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ typedef typename std::vector< std::pair< std::string,
Iterator end() { return mVec.end(); }

std::mem_fun_ref_t<nitf::Field, T> operator[] (const std::string& key)
throw(except::NoSuchKeyException)

{
if (!exists(key))
throw except::NoSuchKeyException(key);
Expand Down
2 changes: 1 addition & 1 deletion externals/nitro/modules/c/nrt/include/nrt/Version.h
View file
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 56c4038

Please sign in to comment.