Hello community,
here is the log from the commit of package armadillo for openSUSE:Factory
checked in at 2012-07-12 10:37:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/armadillo (Old)
and /work/SRC/openSUSE:Factory/.armadillo.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "armadillo", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/armadillo/armadillo.changes 2012-07-02
10:13:48.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.armadillo.new/armadillo.changes 2012-07-12
10:37:32.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Jul 11 15:44:44 UTC 2012 - badshah...@gmail.com
+
+- Update to version 3.2.4:
+ + Workaround for a regression (bug) in GCC 4.7.0 and 4.7.1.
+
+-------------------------------------------------------------------
Old:
----
armadillo-3.2.3.tar.gz
New:
----
armadillo-3.2.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ armadillo.spec ++++++
--- /var/tmp/diff_new_pack.aIv7GM/_old 2012-07-12 10:37:35.000000000 +0200
+++ /var/tmp/diff_new_pack.aIv7GM/_new 2012-07-12 10:37:35.000000000 +0200
@@ -17,7 +17,7 @@
Name: armadillo
-Version: 3.2.3
+Version: 3.2.4
Release: 0
Summary: Fast C++ matrix library with interfaces to LAPACK and ATLAS
License: LGPL-3.0+
++++++ armadillo-3.2.3.tar.gz -> armadillo-3.2.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/armadillo-3.2.3/CMakeLists.txt
new/armadillo-3.2.4/CMakeLists.txt
--- old/armadillo-3.2.3/CMakeLists.txt 2012-06-29 05:06:03.000000000 +0200
+++ new/armadillo-3.2.4/CMakeLists.txt 2012-07-11 10:08:37.000000000 +0200
@@ -16,7 +16,7 @@
set(ARMA_MAJOR 3)
set(ARMA_MINOR 2)
-set(ARMA_PATCH 3)
+set(ARMA_PATCH 4)
message(STATUS "Configuring Armadillo
${ARMA_MAJOR}.${ARMA_MINOR}.${ARMA_PATCH}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/armadillo-3.2.3/include/armadillo_bits/Col_bones.hpp
new/armadillo-3.2.4/include/armadillo_bits/Col_bones.hpp
--- old/armadillo-3.2.3/include/armadillo_bits/Col_bones.hpp 2012-06-29
05:04:33.000000000 +0200
+++ new/armadillo-3.2.4/include/armadillo_bits/Col_bones.hpp 2012-07-11
10:08:37.000000000 +0200
@@ -172,13 +172,18 @@
inline const Col& operator=(const std::string& text);
inline const Col& operator=(const subview_cube<eT>& X);
- using Col<eT>::operator();
+
+ #if !defined(ARMA_GCC47_BUG)
+ using Col<eT>::operator();
+ #endif
+
#if defined(ARMA_USE_CXX11)
- inline fixed(const std::initializer_list<eT>& list);
- inline const Col& operator=(const std::initializer_list<eT>& list);
+ inline fixed(const std::initializer_list<eT>& list);
+ inline const Col& operator=(const std::initializer_list<eT>& list);
#endif
+
arma_inline arma_warn_unused eT& operator[] (const uword i);
arma_inline arma_warn_unused eT operator[] (const uword i) const;
arma_inline arma_warn_unused eT& at (const uword i);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/armadillo-3.2.3/include/armadillo_bits/Mat_bones.hpp
new/armadillo-3.2.4/include/armadillo_bits/Mat_bones.hpp
--- old/armadillo-3.2.3/include/armadillo_bits/Mat_bones.hpp 2012-06-29
05:04:33.000000000 +0200
+++ new/armadillo-3.2.4/include/armadillo_bits/Mat_bones.hpp 2012-07-11
10:08:37.000000000 +0200
@@ -526,7 +526,7 @@
static const bool is_col = (fixed_n_cols == 1) ? true : false;
static const bool is_row = (fixed_n_rows == 1) ? true : false;
-
+
static const uword n_rows = fixed_n_rows;
static const uword n_cols = fixed_n_cols;
static const uword n_elem = fixed_n_elem;
@@ -542,12 +542,23 @@
inline fixed(const char* text);
inline fixed(const std::string& text);
- using Mat<eT>::operator=;
- using Mat<eT>::operator();
+
+ #if !defined(ARMA_GCC47_BUG)
+ using Mat<eT>::operator=;
+ using Mat<eT>::operator();
+ #else
+ template<typename T1> inline const Mat& operator=(const Base<eT,T1>& A);
+
+ inline const Mat& operator=(const eT val);
+
+ inline const Mat& operator=(const char* text);
+ inline const Mat& operator=(const std::string& text);
+ #endif
+
#if defined(ARMA_USE_CXX11)
- inline fixed(const std::initializer_list<eT>& list);
- inline const Mat& operator=(const std::initializer_list<eT>& list);
+ inline fixed(const std::initializer_list<eT>& list);
+ inline const Mat& operator=(const std::initializer_list<eT>& list);
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/armadillo-3.2.3/include/armadillo_bits/Mat_meat.hpp
new/armadillo-3.2.4/include/armadillo_bits/Mat_meat.hpp
--- old/armadillo-3.2.3/include/armadillo_bits/Mat_meat.hpp 2012-05-08
07:43:19.000000000 +0200
+++ new/armadillo-3.2.4/include/armadillo_bits/Mat_meat.hpp 2012-07-11
10:08:37.000000000 +0200
@@ -469,9 +469,9 @@
return *this;
}
-
+
#endif
-
+
//! Set the matrix to be equal to the specified scalar.
@@ -5744,6 +5744,69 @@
+#if defined(ARMA_GCC47_BUG)
+
+ template<typename eT>
+ template<uword fixed_n_rows, uword fixed_n_cols>
+ template<typename T1>
+ inline
+ const Mat<eT>&
+ Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::operator=(const Base<eT,T1>& A)
+ {
+ Mat<eT>::operator=(A.get_ref());
+
+ return *this;
+ }
+
+
+
+ template<typename eT>
+ template<uword fixed_n_rows, uword fixed_n_cols>
+ inline
+ const Mat<eT>&
+ Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::operator=(const eT val)
+ {
+ arma_extra_debug_sigprint();
+
+ Mat<eT>::operator=(val);
+
+ return *this;
+ }
+
+
+
+ template<typename eT>
+ template<uword fixed_n_rows, uword fixed_n_cols>
+ inline
+ const Mat<eT>&
+ Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::operator=(const char* text)
+ {
+ arma_extra_debug_sigprint();
+
+ Mat<eT>::operator=(text);
+
+ return *this;
+ }
+
+
+
+ template<typename eT>
+ template<uword fixed_n_rows, uword fixed_n_cols>
+ inline
+ const Mat<eT>&
+ Mat<eT>::fixed<fixed_n_rows, fixed_n_cols>::operator=(const std::string&
text)
+ {
+ arma_extra_debug_sigprint();
+
+ Mat<eT>::operator=(text);
+
+ return *this;
+ }
+
+#endif
+
+
+
#if defined(ARMA_USE_CXX11)
template<typename eT>
@@ -5779,7 +5842,7 @@
return *this;
}
-
+
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/armadillo-3.2.3/include/armadillo_bits/Row_bones.hpp
new/armadillo-3.2.4/include/armadillo_bits/Row_bones.hpp
--- old/armadillo-3.2.3/include/armadillo_bits/Row_bones.hpp 2012-06-29
05:04:33.000000000 +0200
+++ new/armadillo-3.2.4/include/armadillo_bits/Row_bones.hpp 2012-07-11
10:08:37.000000000 +0200
@@ -170,13 +170,18 @@
inline const Row& operator=(const std::string& text);
inline const Row& operator=(const subview_cube<eT>& X);
- using Row<eT>::operator();
+
+ #if !defined(ARMA_GCC47_BUG)
+ using Row<eT>::operator();
+ #endif
+
#if defined(ARMA_USE_CXX11)
- inline fixed(const std::initializer_list<eT>& list);
- inline const Row& operator=(const std::initializer_list<eT>& list);
+ inline fixed(const std::initializer_list<eT>& list);
+ inline const Row& operator=(const std::initializer_list<eT>& list);
#endif
+
arma_inline arma_warn_unused eT& operator[] (const uword i);
arma_inline arma_warn_unused eT operator[] (const uword i) const;
arma_inline arma_warn_unused eT& at (const uword i);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/armadillo-3.2.3/include/armadillo_bits/arma_version.hpp
new/armadillo-3.2.4/include/armadillo_bits/arma_version.hpp
--- old/armadillo-3.2.3/include/armadillo_bits/arma_version.hpp 2012-06-29
05:06:03.000000000 +0200
+++ new/armadillo-3.2.4/include/armadillo_bits/arma_version.hpp 2012-07-11
10:08:37.000000000 +0200
@@ -18,7 +18,7 @@
#define ARMA_VERSION_MAJOR 3
#define ARMA_VERSION_MINOR 2
-#define ARMA_VERSION_PATCH 3
+#define ARMA_VERSION_PATCH 4
#define ARMA_VERSION_NAME "Creamfields"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/armadillo-3.2.3/include/armadillo_bits/compiler_setup.hpp
new/armadillo-3.2.4/include/armadillo_bits/compiler_setup.hpp
--- old/armadillo-3.2.3/include/armadillo_bits/compiler_setup.hpp
2012-03-28 07:03:17.000000000 +0200
+++ new/armadillo-3.2.4/include/armadillo_bits/compiler_setup.hpp
2012-07-11 10:08:37.000000000 +0200
@@ -111,6 +111,15 @@
#define arma_cold __attribute__((cold))
#endif
+ #if ( (ARMA_GCC_VERSION >= 40700) && (ARMA_GCC_VERSION <= 40701) )
+ #define ARMA_GCC47_BUG
+
+ #warning "*** Detected GCC 4.7.0 / 4.7.1, which has a regression (bug)"
+ #warning "*** See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53549 "
+ #warning "*** A partial workaround for the bug has been activated, "
+ #warning "*** which reduces some functionality in fixed-size matrices "
+ #endif
+
#undef ARMA_GCC_VERSION
#endif
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
