Skip to content

Commit

Permalink
SIX-3.2.0 (#590)
Browse files Browse the repository at this point in the history
* Squashed commit of the following:

commit 904aeb8
Author: J. Daniel Smith <dan@jdanielsmith.me>
Date:   Tue Aug 30 15:27:33 2022 -0400

    NITRO-2.11.0

commit 5e724e7
Author: J. Daniel Smith <dan@jdanielsmith.me>
Date:   Tue Aug 30 15:25:52 2022 -0400

    coda-oss 2022-08-30_cpp14

* SIX-3.2.0
  • Loading branch information
J. Daniel Smith authored Aug 30, 2022
1 parent 451d230 commit 757a907
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
5 changes: 5 additions & 0 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

# SIX [Release](https://github.com/ngageoint/six-library/releases) Notes

## [Version 3.2.0](https://github.com/ngageoint/six-library/releases/tag/SIX-3.2.0); August 30, 2022
* [coda-oss](https://github.com/mdaus/coda-oss) version [2022-08-30_cpp14](https://github.com/mdaus/coda-oss/releases/tag/2022-08-30_cpp14)
* [nitro](https://github.com/mdaus/nitro) version [2.11.0](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.0)
* This version is identical to [Version 3.1.14](https://github.com/ngageoint/six-library/releases/tag/SIX-3.1.14) except that C++14 is now required.

## [Version 3.1.14](https://github.com/ngageoint/six-library/releases/tag/SIX-3.1.14); August 30, 2022
* [coda-oss](https://github.com/mdaus/coda-oss) version [2022-08-30](https://github.com/mdaus/coda-oss/releases/tag/2022-08-30)
* [nitro](https://github.com/mdaus/nitro) version [2.10.12](https://github.com/mdaus/nitro/releases/tag/NITRO-2.10.12)
Expand Down
11 changes: 6 additions & 5 deletions six/modules/c++/six/include/six/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,23 @@
* see <http://www.gnu.org/licenses/>.
*
*/
#ifndef SIX_Version_h_INCLUDED_
#define SIX_Version_h_INCLUDED_
#ifndef SIX_six_Version_h_INCLUDED_
#define SIX_six_Version_h_INCLUDED_
#pragma once

#include "config/Version.h"
#include "nitf/Version.hpp"

// SIX 3.2.0 2022-Aug-30 (C++14)
// SIX 3.1.14 2022-Aug-30
// SIX 3.1.13 2022-Aug-02
// SIX 3.1.12 2022-Jun-29
// SIX 3.1.11 2022-May-13
// SIX 3.1.10 2022-May-03
// SIX 3.1.9 2022-Feb-02
#define SIX_VERSION_MAJOR 3
#define SIX_VERSION_MINOR 1
#define SIX_VERSION_PATCH 14
#define SIX_VERSION_MINOR 2
#define SIX_VERSION_PATCH 0
//#define SIX_VERSION_BUILD 0
//#define SIX_VERSION CODA_OSS_MAKE_VERSION_MMPB(SIX_VERSION_MAJOR, SIX_VERSION_MINOR, SIX_VERSION_PATCH, SIX_VERSION_BUILD)
#define SIX_VERSION CODA_OSS_MAKE_VERSION_MMP(SIX_VERSION_MAJOR, SIX_VERSION_MINOR, SIX_VERSION_PATCH)
Expand All @@ -49,4 +50,4 @@ namespace six
//constexpr auto version_build = CODA_OSS_GET_VERSION_BUILD(SIX_VERSION);
}

#endif // SIX_Version_h_INCLUDED_
#endif // SIX_six_Version_h_INCLUDED_

0 comments on commit 757a907

Please sign in to comment.