[SCM] ViennaCL packaging branch, master, updated. debian/1.2.0-1-23-gcc71e86

[Michael Wild]

The following commit has been merged in the master branch:
commit a86c82021f54b5fcd150ad371a02ee1a819ede5e
Author: Michael Wild <themiwi at users.sourceforge.net>
Date:   Tue May 29 16:52:52 2012 +0200

    Add 0002-Fix-declaration-order-of-prod_impl-trans_prod_impl.patch
    
    Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>

diff --git a/debian/patches/0002-Fix-declaration-order-of-prod_impl-trans_prod_impl.patch b/debian/patches/0002-Fix-declaration-order-of-prod_impl-trans_prod_impl.patch
new file mode 100644
index 0000000..0ef25e5
--- /dev/null
+++ b/debian/patches/0002-Fix-declaration-order-of-prod_impl-trans_prod_impl.patch
@@ -0,0 +1,56 @@
+From: Michael Wild <themiwi at users.sourceforge.net>
+Date: Tue, 29 May 2012 10:50:41 +0200
+Subject: Fix declaration order of prod_impl()/trans_prod_impl()
+
+In viennacl/linalg/matrix_operations.hpp. GCC-4.7 detects this error.
+
+Bug: https://sourceforge.net/tracker/?func=detail&aid=3530507&group_id=322140&atid=1353702
+Forwarded: https://sourceforge.net/tracker/download.php?group_id=322140&atid=1353702&file_id=444751&aid=3530507
+Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>
+---
+ viennacl/linalg/matrix_operations.hpp |   24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/viennacl/linalg/matrix_operations.hpp b/viennacl/linalg/matrix_operations.hpp
+index 1dcc167..36a741c 100644
+--- a/viennacl/linalg/matrix_operations.hpp
++++ b/viennacl/linalg/matrix_operations.hpp
+@@ -439,18 +439,6 @@ namespace viennacl
+                                          const viennacl::vector<SCALARTYPE, VECTOR_ALIGNMENT>, 
+                                          op_prod >(proxy, vec);
+     }
+-
+-    /** @brief Unwraps the transposed matrix proxy and forwards to trans_prod_impl()
+-    */
+-    template<class SCALARTYPE, typename F, unsigned int ALIGNMENT, unsigned int VECTOR_ALIGNMENT>
+-    void prod_impl(const viennacl::matrix_expression< const matrix<SCALARTYPE, F, ALIGNMENT>,
+-                                                      const matrix<SCALARTYPE, F, ALIGNMENT>,
+-                                                      op_trans> & mat,
+-                    const viennacl::vector<SCALARTYPE, VECTOR_ALIGNMENT> & vec, 
+-                          viennacl::vector<SCALARTYPE, VECTOR_ALIGNMENT> & result)
+-    {
+-      trans_prod_impl(mat.lhs(), vec, result);
+-    }
+     
+     /** @brief Carries out matrix-vector multiplication with a transposed matrix
+     *
+@@ -490,6 +478,18 @@ namespace viennacl
+                              ) );
+     }
+ 
++    /** @brief Unwraps the transposed matrix proxy and forwards to trans_prod_impl()
++    */
++    template<class SCALARTYPE, typename F, unsigned int ALIGNMENT, unsigned int VECTOR_ALIGNMENT>
++    void prod_impl(const viennacl::matrix_expression< const matrix<SCALARTYPE, F, ALIGNMENT>,
++                                                      const matrix<SCALARTYPE, F, ALIGNMENT>,
++                                                      op_trans> & mat,
++                    const viennacl::vector<SCALARTYPE, VECTOR_ALIGNMENT> & vec, 
++                          viennacl::vector<SCALARTYPE, VECTOR_ALIGNMENT> & result)
++    {
++      trans_prod_impl(mat.lhs(), vec, result);
++    }
++
+ 
+ 
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 8e39fab..5157109 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Add-virtual-dtor-to-abstract-result_of-class.patch
+0002-Fix-declaration-order-of-prod_impl-trans_prod_impl.patch

-- 
ViennaCL packaging