Merge branch 'develop' into develop

svalinn · Jul 25, 2023 · fc606fb · fc606fb
2 parents 8809c38 + 05bf358
commit fc606fb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml
@@ -23,11 +23,13 @@ jobs:
           auto-activate-base: true
           activate-environment: ""
 
+      # yaml-cpp package has conflicting gtest headers and is not needed for this project
       - name: Conda dependencies
         shell:  bash -l {0}
         run: |
           conda install curl eigen
           conda install -c conda-forge hdf5=1.10.6
+          conda remove -y yaml-cpp
 
       - name: Environment Variables
         shell: bash -l {0}

diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst
@@ -24,10 +24,11 @@ Next version
    * Introduced logger to better manage console output (#876)
 
 **Fixed:**
-   * Patch to compile with Geant4 10.6
-   * Updated DAGMC code to be compatible with Geant4 v11.1.1 (#860)
-   * Patched cmake-search paths for double-down and MOAB (#878)
 
+   * Patch to compile with Geant4 v11.1.1 (#803 #860)
+   * Patched cmake-search paths for double-down and MOAB (#878)
+   * Patch to compile with gcc-13 (#882)
+   * Tweak conda environment for Windows build to avoid conflicting gtest headers (#888)
 
 v3.2.2
 ====================

diff --git a/src/dagmc/dagmcmetadata.cpp b/src/dagmc/dagmcmetadata.cpp
@@ -1,6 +1,7 @@
 #include "dagmcmetadata.hpp"
 
 #include <algorithm>
+#include <cstdint>
 #include <iostream>
 #include <set>
 #include <sstream>