diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-10-23 21:09:49 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-10-23 21:09:49 +0200 |
| commit | e38d6a9c2fba815ac34e74baa843f15e33846813 (patch) | |
| tree | 0a3dd602449386119fc15de32a5cf7e5f607b2a1 /gnu/packages/patches/teuchos-remove-duplicate-using.patch | |
| parent | da716c8b9cdc358609a368bd5da70b31cd97a938 (diff) | |
| parent | cbd20d627497053871db863970c07d93c7081786 (diff) | |
Merge branch 'master' into gnome-team
Change-Id: Ib6f55bebef2fb235fa59fd5442102a3e0ace3191
Diffstat (limited to 'gnu/packages/patches/teuchos-remove-duplicate-using.patch')
| -rw-r--r-- | gnu/packages/patches/teuchos-remove-duplicate-using.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/gnu/packages/patches/teuchos-remove-duplicate-using.patch b/gnu/packages/patches/teuchos-remove-duplicate-using.patch new file mode 100644 index 0000000000..55cd3f6fc3 --- /dev/null +++ b/gnu/packages/patches/teuchos-remove-duplicate-using.patch @@ -0,0 +1,34 @@ +commit e27d9ae98502626d8407045a4e082797682ba56b +Author: Christian Glusa <caglusa@sandia.gov> +Date: Fri Jul 3 18:02:27 2020 -0600 + + Teuchos Comm test: remove duplicate 'using ...' + +diff --git a/packages/teuchos/comm/test/Comm/reduce.cpp b/packages/teuchos/comm/test/Comm/reduce.cpp +index c05ebc0dc34..eac1975ef83 100644 +--- a/packages/teuchos/comm/test/Comm/reduce.cpp ++++ b/packages/teuchos/comm/test/Comm/reduce.cpp +@@ -53,9 +53,6 @@ bool + testReduceSum (bool& success, std::ostream& out, + const int root, const Teuchos::Comm<int>& comm) + { +-#ifdef HAVE_TEUCHOS_MPI +- using Teuchos::MpiComm; +-#endif // HAVE_TEUCHOS_MPI + using Teuchos::reduce; + using Teuchos::TypeNameTraits; + using std::endl; +diff --git a/packages/teuchos/comm/test/Comm/scatter.cpp b/packages/teuchos/comm/test/Comm/scatter.cpp +index 0ca961d2846..001009029c4 100644 +--- a/packages/teuchos/comm/test/Comm/scatter.cpp ++++ b/packages/teuchos/comm/test/Comm/scatter.cpp +@@ -53,9 +53,6 @@ bool + testScatter (bool& success, std::ostream& out, + const int root, const Teuchos::Comm<int>& comm) + { +-#ifdef HAVE_TEUCHOS_MPI +- using Teuchos::MpiComm; +-#endif // HAVE_TEUCHOS_MPI + using Teuchos::scatter; + using Teuchos::TypeNameTraits; + using std::endl; |