From aa871b787076c5e71e5d6609b1ee47cc5f7c4990 Mon Sep 17 00:00:00 2001
From: Dan Smith <dan.smith@maxar.com>
Date: Mon, 8 Jan 2024 10:22:31 -0500
Subject: [PATCH] Squashed 'externals/coda-oss/' changes from
 86ec09d4ef..dcc88d3b7c

dcc88d3b7c Merge branch 'main' into cpp17
59a47c70e4 update to latest versions of various actions (#762)
fdd40c8ec4 AVX2 causes crashes with older compilers on build servers :-(
c40ea14042 add missing #include
f98c13c38c add missing #include

git-subtree-dir: externals/coda-oss
git-subtree-split: dcc88d3b7ccd2a75ae18853bcd383c3eda9d8003
---
 .github/workflows/build_unittest.yml           | 18 +++++++++---------
 cmake/CodaBuild.cmake                          | 14 +++++++++-----
 .../c++/hdf5.lite/include/hdf5/lite/highfive.h |  2 ++
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build_unittest.yml b/.github/workflows/build_unittest.yml
index 5ef40d292..1bdce7286 100644
--- a/.github/workflows/build_unittest.yml
+++ b/.github/workflows/build_unittest.yml
@@ -11,9 +11,9 @@ jobs:
     name: ${{ matrix.os }}-${{ matrix.python-version }}-CMake
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout
     - name: Set up Python
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5 # https://github.com/marketplace/actions/setup-python
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install python dependencies
@@ -63,7 +63,7 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout
     - name: configure
       run: |
         ls env:
@@ -76,7 +76,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.0.2 # https://github.com/marketplace/actions/setup-msbuild
+      uses: microsoft/setup-msbuild@v1.1 # https://github.com/marketplace/actions/setup-msbuild
       with:
         msbuild-architecture: x64
     - name: msbuild
@@ -98,9 +98,9 @@ jobs:
     name: ${{ matrix.os }}-${{ matrix.python-version }}-CMake
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout
     - name: Set up Python
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5 # https://github.com/marketplace/actions/setup-python
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install python dependencies
@@ -139,7 +139,7 @@ jobs:
     name: ${{ matrix.os }}-${{ matrix.configuration }}-${{ matrix.avx }}-CMake
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout
     - name: configure
       run: |
         mkdir out && cd out
@@ -164,9 +164,9 @@ jobs:
     name: ${{ matrix.os }}-${{ matrix.python-version }}-waf${{ matrix.debugging }}
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout
     - name: Set up Python
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5 # https://github.com/marketplace/actions/setup-python
       with:
         python-version: ${{ matrix.python-version }}
     - name: configure_with_swig
diff --git a/cmake/CodaBuild.cmake b/cmake/CodaBuild.cmake
index c4c859da6..a74502f3c 100644
--- a/cmake/CodaBuild.cmake
+++ b/cmake/CodaBuild.cmake
@@ -147,11 +147,15 @@ macro(coda_initialize_build)
     set(CMAKE_CXX_EXTENSIONS OFF)
 
     # Turn on AVX2 by default ... it's from 2013.
-    if (NOT ENABLE_AVX512F)
-        if (NOT DISABLE_AVX2)
-            set(ENABLE_AVX2 true)
-        endif()
-    endif()
+    # Well, no :-( ... it seems to cause crashes w/older
+    # compilers on build servers. :-(
+    set(ENABLE_AVX2 false)
+    set(ENABLE_AVX512F false)
+    #if (NOT ENABLE_AVX512F)
+    #    if (NOT DISABLE_AVX2)
+    #        set(ENABLE_AVX2 true)
+    #    endif()
+    #endif()
 
     # MSVC-specific flags and options.
     if (MSVC)
diff --git a/modules/c++/hdf5.lite/include/hdf5/lite/highfive.h b/modules/c++/hdf5.lite/include/hdf5/lite/highfive.h
index d5d91987b..c93d5a9a4 100644
--- a/modules/c++/hdf5.lite/include/hdf5/lite/highfive.h
+++ b/modules/c++/hdf5.lite/include/hdf5/lite/highfive.h
@@ -33,6 +33,8 @@
 #include <stdexcept>
 #include <vector>
 
+#include "types/RowCol.h"
+
 #include "H5_.h"
 #include "SpanRC.h"