!14 Fix type error: incorrect namespace used

From: @lilong88 
Reviewed-by: @yangzhao_kl, @sinever 
Signed-off-by: @yangzhao_kl, @sinever
This commit is contained in:
openeuler-ci-bot 2024-05-15 01:15:58 +00:00 committed by Gitee
commit 8735a32234
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 31 additions and 1 deletions

View File

@ -0,0 +1,25 @@
From e8e1a2b17ebc435ed6b4805e5bc26955b9f522c2 Mon Sep 17 00:00:00 2001
From: lilong <lilong@kylinos.cn>
Date: Wed, 24 Apr 2024 16:29:21 +0800
Subject: [PATCH] Fix type error: incorrect namespace used
---
liboctave/util/lo-utils.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/liboctave/util/lo-utils.cc b/liboctave/util/lo-utils.cc
index 0807fed..b287f77 100644
--- a/liboctave/util/lo-utils.cc
+++ b/liboctave/util/lo-utils.cc
@@ -250,7 +250,7 @@ octave_read_fp_value (std::istream& is)
// FIXME: resetting stream position is likely to fail unless we are
// reading from a file.
- std::ios::streampos pos = is.tellg ();
+ std::streampos pos = is.tellg ();
char c1 = ' ';
--
2.43.0

View File

@ -5,7 +5,7 @@
Name: octave Name: octave
Epoch: 6 Epoch: 6
Version: 5.1.0 Version: 5.1.0
Release: 1 Release: 2
Summary: A high-level language for numerical computations Summary: A high-level language for numerical computations
License: GPLv3+ License: GPLv3+
URL: http://www.octave.org URL: http://www.octave.org
@ -13,6 +13,7 @@ Source0: https://ftp.gnu.org/gnu/octave/octave-%{version}.tar.lz
Source2: xorg.conf Source2: xorg.conf
Source3: octave-5.1.0-docs.tar.lz Source3: octave-5.1.0-docs.tar.lz
Patch0: octave-clear-the-eof-condition.patch Patch0: octave-clear-the-eof-condition.patch
Patch1: 0001-Fix-type-error-incorrect-namespace-used.patch
Provides: octave(api) = %{octave_api} Provides: octave(api) = %{octave_api}
Provides: bundled(gnulib) Provides: bundled(gnulib)
Provides: bundled(qterminal) Provides: bundled(qterminal)
@ -41,6 +42,7 @@ BuildRequires: readline-devel suitesparse-devel sundials-devel tex(dvips)
BuildRequires: texlive-collection-fontsrecommended texlive-ec texlive-metapost zlib-devel BuildRequires: texlive-collection-fontsrecommended texlive-ec texlive-metapost zlib-devel
BuildRequires: mesa-dri-drivers xorg-x11-apps BuildRequires: mesa-dri-drivers xorg-x11-apps
BuildRequires: zip BuildRequires: zip
BuildRequires: libXcursor-devel libXfixes-devel libXext-devel libXinerama-devel
Requires: epstool gnuplot gnuplot-common hdf5 hicolor-icon-theme java-headless less info Requires: epstool gnuplot gnuplot-common hdf5 hicolor-icon-theme java-headless less info
Requires: texinfo tex(amssymb.sty) tex(fontenc.sty) tex(graphicx.sty) tex(hyperref.sty) Requires: texinfo tex(amssymb.sty) tex(fontenc.sty) tex(graphicx.sty) tex(hyperref.sty)
Requires: tex(inputenc.sty) tex(listings.sty) tex(lmodern.sty) tex(mathtools.sty) Requires: tex(inputenc.sty) tex(listings.sty) tex(lmodern.sty) tex(mathtools.sty)
@ -232,5 +234,8 @@ make check
%{_pkgdocdir}/refcard*.pdf %{_pkgdocdir}/refcard*.pdf
%changelog %changelog
* Wed Apr 24 2024 lilong <lilong@kylinos.cn> - 6:5.1.0-2
- Fix type error:incorrect namespace used
* Fri Jul 16 2021 huanghaitao <huanghaitao8@huawei.com> - 5.1.0-1 * Fri Jul 16 2021 huanghaitao <huanghaitao8@huawei.com> - 5.1.0-1
- package init - package init