Skip to content

Commit

Permalink
Fixes gcc error related to cstdint
Browse files Browse the repository at this point in the history
  • Loading branch information
wvangeit committed Dec 11, 2024
1 parent b0a0cf6 commit 3586f93
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 0 deletions.
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ get-dakota-src:
git apply ../src_patches/dakota-src.patch && \
git apply ../src_patches/boost.patch && \
git apply ../src_patches/dakenv_restart.patch && \
git apply ../src_patches/cstdint_dak_types.patch && \
git apply --whitespace=nowarn ../src_patches/adaptsampl_batch.patch && \
find . \( -name \*.cpp -o -name \*.hpp -o -name \*.c -o -name \*.h \) -exec \
sed -i -E -f ../src_patches/replace_old_macros_numpy.sed {} +
cd dakota/packages/external && \
git apply ../../../src_patches/cstdint.patch
24 changes: 24 additions & 0 deletions src_patches/cstdint.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
diff --git a/trilinos/packages/teuchos/core/src/Teuchos_BigUInt.hpp b/trilinos/packages/teuchos/core/src/Teuchos_BigUInt.hpp
index 5b6d3c5e..7fbfec7b 100644
--- a/trilinos/packages/teuchos/core/src/Teuchos_BigUInt.hpp
+++ b/trilinos/packages/teuchos/core/src/Teuchos_BigUInt.hpp
@@ -43,6 +43,7 @@
#define TEUCHOS_BIG_UINT_HPP

#include <iostream>
+#include <cstdint>
#include <Teuchos_BigUIntDecl.hpp>

/*! \file Teuchos_BigUInt.hpp
diff --git a/trilinos/packages/teuchos/core/src/Teuchos_BigUIntDecl.hpp b/trilinos/packages/teuchos/core/src/Teuchos_BigUIntDecl.hpp
index e82e8be9..a51f66cf 100644
--- a/trilinos/packages/teuchos/core/src/Teuchos_BigUIntDecl.hpp
+++ b/trilinos/packages/teuchos/core/src/Teuchos_BigUIntDecl.hpp
@@ -42,6 +42,7 @@
#ifndef TEUCHOS_BIG_UINT_DECL_HPP
#define TEUCHOS_BIG_UINT_DECL_HPP

+#include <cstdint>
#include <iosfwd>

/*! \file Teuchos_BigUIntDecl.hpp
12 changes: 12 additions & 0 deletions src_patches/cstdint_dak_types.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/src/dakota_data_types.hpp b/src/dakota_data_types.hpp
index 8771587..a430d51 100644
--- a/src/dakota_data_types.hpp
+++ b/src/dakota_data_types.hpp
@@ -21,6 +21,7 @@
#include <list>
#include <map>
#include <set>
+#include <cstdint>

namespace Dakota {

0 comments on commit 3586f93

Please sign in to comment.