diff options
| author | George Hartzell <hartzell@alerce.com> | 2017-03-09 15:27:56 -0800 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2017-03-09 17:27:56 -0600 |
| commit | 611df0bebfae67247fc8cec4c7f28a5ee901e9fb (patch) | |
| tree | 474b7542ef31c621b3405ae84ca95536c2738e28 | |
| parent | ebd5066d0771f62525186631365843a145fe5631 (diff) | |
| download | spack-611df0bebfae67247fc8cec4c7f28a5ee901e9fb.tar.gz spack-611df0bebfae67247fc8cec4c7f28a5ee901e9fb.tar.bz2 spack-611df0bebfae67247fc8cec4c7f28a5ee901e9fb.tar.xz spack-611df0bebfae67247fc8cec4c7f28a5ee901e9fb.zip | |
New gcc uses C++14 mode, this fixes implicit conversion (#3392)
* New gcc uses C++14 mode, this fixes implicit conversion
The issue is described in depth [here][desc]. C++14 no longer
allows implicit conversion from iostream classes to void*.
This patch comes directly from [PR #6][patch].
[desc]: http://stackoverflow.com/questions/38659115/make-fails-with-error-cannot-convert-stdistream-aka-stdbasic-istreamchar
[patch]: https://github.com/agordon/libgtextutils/pull/6
* mend
| -rw-r--r-- | var/spack/repos/builtin/packages/libgtextutils/package.py | 1 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/libgtextutils/text_line_reader.patch | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/libgtextutils/package.py b/var/spack/repos/builtin/packages/libgtextutils/package.py index 05b6b7dabe..adecc6c7f7 100644 --- a/var/spack/repos/builtin/packages/libgtextutils/package.py +++ b/var/spack/repos/builtin/packages/libgtextutils/package.py @@ -31,4 +31,5 @@ class Libgtextutils(AutotoolsPackage): homepage = "https://github.com/agordon/libgtextutils" url = "https://github.com/agordon/libgtextutils/releases/download/0.7/libgtextutils-0.7.tar.gz" + patch('text_line_reader.patch') version('0.7', '593c7c62e3c76ec49f5736eed4f96806') diff --git a/var/spack/repos/builtin/packages/libgtextutils/text_line_reader.patch b/var/spack/repos/builtin/packages/libgtextutils/text_line_reader.patch new file mode 100644 index 0000000000..cc9c4cda08 --- /dev/null +++ b/var/spack/repos/builtin/packages/libgtextutils/text_line_reader.patch @@ -0,0 +1,10 @@ +--- libgtextutils/src/gtextutils/text_line_reader.cpp.orig 2017-03-09 07:49:56.358283887 -0800 ++++ libgtextutils/src/gtextutils/text_line_reader.cpp 2017-03-09 07:50:24.317503887 -0800 +@@ -44,6 +44,6 @@ + if (input_stream.eof()) + return false; + +- return input_stream ; ++ return static_cast<bool>(input_stream) ; + } + |