Squashed 'externals/nitro/' changes from 3118941cc..39452b3cb

39452b3cb Merge branch 'cpp17' into 3.0/main f6179b4e1 Merge branch 'main' into cpp17 254107f5d Merge branch 'cpp17' into 3.0/main 19b260009 Merge branch 'main' into cpp17 b5d609a0a need #pragma warning(disable) outside push/pop 8aaed9edc Merge commit '6fd9fc0188c10edf2d35324ce7203bb7ae487ccc' into 3.0/main 6fd9fc018 Squashed 'externals/coda-oss/' changes from 0ed92d85a7..1b142c2b90 b13ecaf76 latest from CODA-OSS bba080581 Merge branch 'cpp17' into 3.0/main 185f02f14 Merge commit '5efbb0c81357a6ee4da4209e42668c942cb915da' into cpp17 5efbb0c81 Squashed 'externals/coda-oss/' changes from aba8366d8b..0ed92d85a7 0678478cb latest from CODA-OSS 3afd90921 develop/sync_externals d0d99025d Squashed 'externals/coda-oss/' changes from 1ec9a072c4..aba8366d8b c16779d74 Merge commit 'd0d99025d060792e63273741fab6e4a99700b49a' into cpp17 2f4fef813 latest from CODA-OSS 261f3752f Merge branch 'main' into cpp17 414e6c648 Merge branch '3.0/main' of github.com:mdaus/nitro into 3.0/main 8481b89af enable modules 4f1a05b23 /guard:cf b08acb056 Merge commit '7b975da9e1e2263e8b8986ca2192068ee52f5e4f' into 3.0/main 7b975da9e Squashed 'externals/coda-oss/' changes from 5629b305ef..093ff911f0 bd93fa195 enable "Warnings as Errors" 12fc2d89f Squashed 'externals/coda-oss/' changes from 1ec9a072c4..5629b305ef ccc45a604 Merge commit '12fc2d89fe87139566964956eeae53fa98952bf7' into 3.0/main 28256d876 Merge branch 'cpp17' into 3.0/main b5612a7df enable "WarningsAsErrors" for DEBUG builds f067a751a Squashed 'externals/coda-oss/' changes from 5015192abb..1ec9a072c4 2f47cc122 Merge commit 'f067a751ac940fc485c06f003e2e2c23071a8766' into cpp17 50a3500ec Merge branch 'main' into cpp17 f9161c2a0 account for toString() changes d7007662e be sure the string is properly padded for the field type 108117000 account to toString() changes f236200ce be sure the string is properly padded for the field type d6eb09304 Revert "trying to fix toString() differences" 75fed1a17 return type needs to be explicit (not `auto`) for subsequent specialization 3172afb98 trying to fix toString() differences 7d304ad5d Merge commit '41bdd91f83bcd4c3b04ade8bb94fdfae8e210dd2' into 3.0/main 41bdd91f8 Squashed 'externals/coda-oss/' changes from 5015192abb..8e91362963 e6f512993 latest from CODA-OSS a45ed7a2c Merge branch 'cpp17' into 3.0/main c899f14ad Merge branch 'main' into cpp17 f9ff61eb9 Squashed 'externals/coda-oss/' changes from 8b21c3828b..5015192abb 50c75444b Merge commit 'f9ff61eb905ed2119f4f908c568b577643cf42f8' into cpp17 d37a0d078 latest from CODA-OSS c2372d744 Merge branch 'main' into cpp17 770cd28ec remove .regenerate_python_bindings.py ae1b65338 Merge commit '8eea63416df2bea89cfd83b5d4695251ee1a6976' into 3.0/main 8eea63416 Squashed 'externals/coda-oss/' changes from 8b21c3828b..1a76d7ba3f 6c785faf1 latest from CODA-OSS c9a7d5a50 Merge branch '3.0/main' of github.com:mdaus/nitro into 3.0/main 25d31edae merge cpp17 9618cb382 Merge branch 'main' into cpp17 eba459da4 Squashed 'externals/coda-oss/' changes from e573adb323..8b21c3828b c3ad6c72e Merge commit 'eba459da43c07c6a3d80b63248c9c7fb49605723' into cpp17 0355e94ea latest from CODA-OSS 325fba327 Merge branch 'cpp17' of github.com:mdaus/nitro into cpp17 7558c7085 develop/sync_externals 2490f6fdc Merge branch 'main' into cpp17 4aa042353 turn off "Warnings as Errors" to fix github builds 45cd3febe turn off code-analysis to fix GitHub builds 911c7b3ae Squashed 'externals/coda-oss/' changes from eb60210ff2..e573adb323 80a517fcb Merge commit '911c7b3ae49e1f92b94f2dc83d7716b7abc459c2' into cpp17 c3e3d3768 add config.h files 1cca072bd latest from CODA-OSS 2b976b57d disable code-analysis to fix GitHub build 8e7830d47 Merge commit 'be62d43d7722324764ffecc8469e524969285eb6' into 3.0/main be62d43d7 Squashed 'externals/coda-oss/' changes from 8e54b1f268..e1c12cabf4 6756adf41 Merge commit 'a55797ffb01accac94c8cbdfd8b8852aed4cca7b' into 3.0/main a55797ffb Squashed 'externals/coda-oss/' changes from eb60210ff2..8e54b1f268 d544fb6ad latest from CODA-OSS ff1e3109f sync with 2023/main 0d8d1aa76 C++17 -> 3.0/main cb5d115bc Squashed 'externals/coda-oss/' changes from 434b85fe53..eb60210ff2 8a3df82fb Merge commit 'cb5d115bcc2ecc11f81e4ccad23caff4f3f8ac29' into cpp17 dc3074153 Merge branch 'main' into cpp17 b40d3f96f Squashed 'externals/coda-oss/' changes from b6ead418cf..434b85fe53 cca11bf4c Merge commit 'b40d3f96fff13bf708f319c684348ebd9884aff1' into cpp17 2d6d5aa31 Merge branch 'main' into cpp17 d32176660 Merge branch 'main' into cpp17 a8e6556aa Squashed 'externals/coda-oss/' changes from 07bcb3a39b..b6ead418cf 53596f720 Merge commit 'a8e6556aa7bc5c105d3b4383589da7ef48982deb' into cpp17 29ccecf64 latest from CODA-OSS b315d9b6c Merge branch 'main' into cpp17 b708bd8ea `final` for NITFException a2af78776 don't need FmtX() with no formatting 368cead55 Squashed 'externals/coda-oss/' changes from 70a006d8a4..07bcb3a39b 9b10c5340 Merge commit '368cead55f182d12953a6964b2598021f9629cf3' into cpp17 6e40d15b4 latest from CODA-OSS 31fc61888 develop/sync_externals eab6b6c35 Squashed 'externals/coda-oss/' changes from 14f0b1545c..70a006d8a4 ff335eeaf Merge commit 'eab6b6c35439c1eb7fa22fb042aae4a61a936d66' into cpp17 5648a0267 Merge branch 'main' into cpp17 4fbdccb89 Squashed 'externals/coda-oss/' changes from c92a55d7c7..14f0b1545c 732538e80 Merge commit '4fbdccb89c89f2253ae8c3fbe830e69e338ae1ac' into cpp17 fe8900094 Merge branch 'main' into cpp17 331deafa2 Merge commit 'afc15cad7caa998e32e6630489dbc22be8e5e9d5' into cpp17 afc15cad7 Squashed 'externals/coda-oss/' changes from 8dee6f7a68..a8c5a3b2b2 5b47be120 latest from CODA-OSS 475d30a6e Merge branch 'main' into cpp17 10befb769 Merge branch 'main' into cpp17 a5bd34266 Merge commit 'b1f170ff084565365cdca72e88b87c80b7f848ba' into cpp17 b1f170ff0 Squashed 'externals/coda-oss/' changes from e87c32b4de..436289c928 d6efa7ec5 restore C++17 REVERT: 3118941cc update various actions to latest versions (#608) REVERT: f39321c67 latest from CODA-OSS REVERT: 60952fb78 preload the remaining TREs (#607) REVERT: 847101014 latest from CODA-OSS (#606) git-subtree-dir: externals/nitro git-subtree-split: 39452b3cb82fcc510bf63dfe4bb8eef65b5230f9
ngageoint · Jan 22, 2024 · 517d23a · 517d23a
1 parent dd1e6e5
commit 517d23a
Show file tree

Hide file tree

Showing 1,604 changed files with 334,764 additions and 401,193 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -15,20 +15,15 @@ on:
   push:
     branches: [ "main" ]
   pull_request:
+    # The branches below must be a subset of the branches above
     branches: [ "main" ]
   schedule:
-    - cron: '35 17 * * 6'
+    - cron: '19 23 * * 3'
 
 jobs:
   analyze:
     name: Analyze
-    # Runner size impacts CodeQL analysis time. To learn more, please see:
-    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
-    #   - https://gh.io/supported-runners-and-hardware-resources
-    #   - https://gh.io/using-larger-runners
-    # Consider using larger runners for possible analysis time improvements.
-    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
-    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+    runs-on: ubuntu-latest
     permissions:
       actions: read
       contents: read
@@ -37,44 +32,41 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'c-cpp' ]
-        # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ]
-        # Use only 'java-kotlin' to analyze code written in Java, Kotlin or both
-        # Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        language: [ 'cpp' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
-
-        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
         # queries: security-extended,security-and-quality
+
 
-    # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
 
-    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
     #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
 
     # - run: |
-    #     echo "Run, Build Application using script"
-    #     ./location_of_script_within_repo/buildscript.sh
+    #   echo "Run, Build Application using script"
+    #   ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
-      with:
-        category: "/language:${{matrix.language}}"
+      uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/frequent_check.yml b/.github/workflows/frequent_check.yml
@@ -14,9 +14,9 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout
+    - uses: actions/checkout@v2
     - name: Set up Python
-      uses: actions/setup-python@v5 # https://github.com/marketplace/actions/setup-python
+      uses: actions/setup-python@v1
       with:
         python-version: '3.7'
     - name: configure
@@ -34,7 +34,7 @@ jobs:
         cd out
         ctest -C ${{ matrix.configuration }} --output-on-failure
     - name: Add msbuild to PATH
-      uses: microsoft/setup-msbuild@v1.1 # https://github.com/marketplace/actions/setup-msbuild
+      uses: microsoft/setup-msbuild@v1 # https://github.com/marketplace/actions/setup-msbuild
       with:
         msbuild-architecture: x64
     - name: msbuild
@@ -51,7 +51,7 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout
+    - uses: actions/checkout@v2
     - name: configure CODA-OSS
       run: |
         mkdir externals\coda-oss\out
@@ -63,7 +63,7 @@ jobs:
         cmake --build . --config ${{ matrix.configuration }} -j
         cmake --build . --config ${{ matrix.configuration }} --target install
     - name: Add msbuild to PATH
-      uses: microsoft/setup-msbuild@v1.1 # https://github.com/marketplace/actions/setup-msbuild
+      uses: microsoft/setup-msbuild@v1.0.2 # https://github.com/marketplace/actions/setup-msbuild
       with:
         msbuild-architecture: x64
     - name: msbuild
@@ -87,9 +87,9 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout
+    - uses: actions/checkout@v2
     - name: Set up Python
-      uses: actions/setup-python@v5 # https://github.com/marketplace/actions/setup-python
+      uses: actions/setup-python@v1
       with:
         python-version: '3.7'
     - name: configure

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,9 +17,9 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout
+    - uses: actions/checkout@v2
     - name: Set up Python
-      uses: actions/setup-python@v5 # https://github.com/marketplace/actions/setup-python
+      uses: actions/setup-python@v1
       with:
         python-version: '3.7'
     - name: configure
@@ -37,7 +37,7 @@ jobs:
         cd out
         ctest -C ${{ matrix.configuration }} --output-on-failure
     - name: Add msbuild to PATH
-      uses: microsoft/setup-msbuild@v1.1 # https://github.com/marketplace/actions/setup-msbuild
+      uses: microsoft/setup-msbuild@v1.0.2 # https://github.com/marketplace/actions/setup-msbuild
       with:
         msbuild-architecture: x64
     - name: msbuild
@@ -54,7 +54,7 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout
+    - uses: actions/checkout@v2
     - name: configure CODA-OSS
       run: |
         mkdir externals\coda-oss\out
@@ -66,7 +66,7 @@ jobs:
         cmake --build . --config ${{ matrix.configuration }} -j
         cmake --build . --config ${{ matrix.configuration }} --target install
     - name: Add msbuild to PATH
-      uses: microsoft/setup-msbuild@v1.1 # https://github.com/marketplace/actions/setup-msbuild
+      uses: microsoft/setup-msbuild@v1 # https://github.com/marketplace/actions/setup-msbuild
       with:
         msbuild-architecture: x64
     - name: msbuild
@@ -90,9 +90,9 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout
+    - uses: actions/checkout@v2
     - name: Set up Python
-      uses: actions/setup-python@v5 # https://github.com/marketplace/actions/setup-python
+      uses: actions/setup-python@v1
       with:
         python-version: '3.7'
     - name: configure

diff --git a/.regenerate_python_bindings.py b/.regenerate_python_bindings.py
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,9 @@
 cmake_minimum_required(VERSION 3.14)
 project(nitro)
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_C_STANDARD 99)
+set(C_STANDARD_REQUIRED true)
+set(CMAKE_CXX_STANDARD 20)
 set(CXX_STANDARD_REQUIRED true)
 
 if (${CMAKE_PROJECT_NAME} STREQUAL nitro)

diff --git a/UnitTest/UnitTest.vcxproj b/UnitTest/UnitTest.vcxproj
@@ -64,11 +64,16 @@
       <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <TreatWarningAsError>true</TreatWarningAsError>
       <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
+      <UseStandardPreprocessor>true</UseStandardPreprocessor>
+      <TreatWarningAsError>true</TreatWarningAsError>
       <ControlFlowGuard>Guard</ControlFlowGuard>
+      <TranslateIncludes>true</TranslateIncludes>
+      <EnableModules>true</EnableModules>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
@@ -88,11 +93,16 @@
       <UseFullPaths>true</UseFullPaths>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
-      <ControlFlowGuard>Guard</ControlFlowGuard>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
+      <UseStandardPreprocessor>true</UseStandardPreprocessor>
+      <ControlFlowGuard>Guard</ControlFlowGuard>
+      <TranslateIncludes>true</TranslateIncludes>
+      <EnableModules>true</EnableModules>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/copy_externals.csh b/copy_externals.csh
@@ -1,7 +1,7 @@
 #!/bin/csh -f
 
 rm -r -f tmp && mkdir tmp && cd tmp
-git clone --depth 1 -b main [email protected]:mdaus/coda-oss.git
+git clone --depth 1 -b 2023/main [email protected]:mdaus/coda-oss.git
 rm -r -f coda-oss/.git
 
 cd ..

diff --git a/dot-github-workflows-macos.yml b/dot-github-workflows-macos.yml