diff --git a/Makefile b/Makefile index 0da52e1..8779ad5 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/src_patches/cstdint.patch b/src_patches/cstdint.patch new file mode 100644 index 0000000..c8c462e --- /dev/null +++ b/src_patches/cstdint.patch @@ -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 ++#include + #include + + /*! \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 + #include + + /*! \file Teuchos_BigUIntDecl.hpp diff --git a/src_patches/cstdint_dak_types.patch b/src_patches/cstdint_dak_types.patch new file mode 100644 index 0000000..66af001 --- /dev/null +++ b/src_patches/cstdint_dak_types.patch @@ -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 + #include + #include ++#include + + namespace Dakota { +