From c7f1e2835bfce8b9aa40671e14672a4221f2ecaa Mon Sep 17 00:00:00 2001
From: t-karatsu <49965247+t-karatsu@users.noreply.github.com>
Date: Fri, 27 Dec 2019 05:42:59 +0900
Subject: aspa: Fix common errors. (#14295)

* aspa: Fix common errors.

* defined new member 'Vec_value_type' in 'self' namespace.

* fix narrowing error.

* fix patch about typecast.
---
 .../builtin/packages/aspa/fix_common_errors.patch  | 59 ++++++++++++++++++++++
 var/spack/repos/builtin/packages/aspa/package.py   |  2 +
 2 files changed, 61 insertions(+)
 create mode 100644 var/spack/repos/builtin/packages/aspa/fix_common_errors.patch

diff --git a/var/spack/repos/builtin/packages/aspa/fix_common_errors.patch b/var/spack/repos/builtin/packages/aspa/fix_common_errors.patch
new file mode 100644
index 0000000000..093e95a3a5
--- /dev/null
+++ b/var/spack/repos/builtin/packages/aspa/fix_common_errors.patch
@@ -0,0 +1,59 @@
+diff -ur spack-src.org/src/mtl_headers/mtl/linalg_vec.h spack-src/src/mtl_headers/mtl/linalg_vec.h
+--- spack-src.org/src/mtl_headers/mtl/linalg_vec.h	2019-12-25 13:38:14.191695748 +0900
++++ spack-src/src/mtl_headers/mtl/linalg_vec.h	2019-12-25 13:39:08.887447770 +0900
+@@ -116,6 +116,7 @@
+   typedef difference_type Vec_difference_type;
+   typedef iterator Vec_iterator;
+   typedef const_iterator Vec_const_iterator;
++  typedef value_type Vec_value_type;
+ 
+   class IndexArray {
+   public:
+diff -ur spack-src.org/src/utils/toolbox/database/HDFDatabase.cc spack-src/src/utils/toolbox/database/HDFDatabase.cc
+--- spack-src.org/src/utils/toolbox/database/HDFDatabase.cc	2019-12-25 13:38:14.201696799 +0900
++++ spack-src/src/utils/toolbox/database/HDFDatabase.cc	2019-12-25 14:50:42.627965265 +0900
+@@ -686,7 +686,7 @@
+    herr_t errf;
+    if (nelements > 0) {
+ 
+-      hsize_t dim[] = {nelements};
++      hsize_t dim[] = {(unsigned long long)nelements};
+       hid_t space = H5Screate_simple(1, dim, NULL);
+ #ifdef ASSERT_HDF5_RETURN_VALUES
+       assert( space >= 0 );
+@@ -1233,7 +1233,7 @@
+    herr_t errf;
+    if (nelements > 0) {
+ 
+-      hsize_t dim[] = {nelements};
++      hsize_t dim[] = {(unsigned long long)nelements};
+       hid_t space = H5Screate_simple(1, dim, NULL);
+ #ifdef ASSERT_HDF5_RETURN_VALUES
+       assert( space >= 0 );
+@@ -1478,7 +1478,7 @@
+    herr_t errf;
+    if (nelements > 0) {
+ 
+-      hsize_t dim[] = {nelements};
++      hsize_t dim[] = {(unsigned long long)nelements};
+       hid_t space = H5Screate_simple(1, dim, NULL);
+ #ifdef ASSERT_HDF5_RETURN_VALUES
+       assert( space >= 0 );
+@@ -1722,7 +1722,7 @@
+    herr_t errf;
+    if (nelements > 0) {
+ 
+-      hsize_t dim[] = {nelements};
++      hsize_t dim[] = {(unsigned long long)nelements};
+       hid_t space = H5Screate_simple(1, dim, NULL);
+ #ifdef ASSERT_HDF5_RETURN_VALUES
+       assert(space >= 0);
+@@ -1998,7 +1998,7 @@
+       assert( errf >= 0 );
+ #endif
+ 
+-      hsize_t dim[] = {nelements};
++      hsize_t dim[] = {(unsigned long long)nelements};
+       hid_t space = H5Screate_simple(1, dim, NULL);
+ #ifdef ASSERT_HDF5_RETURN_VALUES
+       assert( space >= 0 );
diff --git a/var/spack/repos/builtin/packages/aspa/package.py b/var/spack/repos/builtin/packages/aspa/package.py
index e76da23af0..61b8dee024 100644
--- a/var/spack/repos/builtin/packages/aspa/package.py
+++ b/var/spack/repos/builtin/packages/aspa/package.py
@@ -28,6 +28,8 @@ class Aspa(MakefilePackage):
     depends_on('mpi', when='+mpi')
     depends_on('hdf5')
 
+    patch('fix_common_errors.patch')
+
     @property
     def build_targets(self):
         targets = [
-- 
cgit v1.2.3-60-g2f50