commit armadillo for openSUSE:Factory

31 May 2012

Hello community,

here is the log from the commit of package armadillo for openSUSE:Factory checked in at 2012-05-31 17:02:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-05-22 08:12:05.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.armadillo.new/armadillo.changes	2012-05-31 17:02:49.000000000 +0200
@@ -1,0 +2,7 @@
+Tue May 29 03:56:47 UTC 2012 - badshah400@gmail.com
+
+- Update to version 3.2.1:
+  + Minor fix for compiling without debugging enabled (aka release
+    mode).
+
+-------------------------------------------------------------------

Old:
----
  armadillo-3.2.0.tar.gz

New:
----
  armadillo-3.2.1.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ armadillo.spec ++++++
--- /var/tmp/diff_new_pack.gWyc7a/_old	2012-05-31 17:02:51.000000000 +0200
+++ /var/tmp/diff_new_pack.gWyc7a/_new	2012-05-31 17:02:51.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           armadillo
-Version:        3.2.0
+Version:        3.2.1
 Release:        0
 Summary:        Fast C++ matrix library with interfaces to LAPACK and ATLAS
 License:        LGPL-3.0+

++++++ armadillo-3.2.0.tar.gz -> armadillo-3.2.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.2.0/CMakeLists.txt new/armadillo-3.2.1/CMakeLists.txt
--- old/armadillo-3.2.0/CMakeLists.txt	2012-05-18 10:22:32.000000000 +0200
+++ new/armadillo-3.2.1/CMakeLists.txt	2012-05-25 08:27:22.000000000 +0200
@@ -16,7 +16,7 @@
 
 set(ARMA_MAJOR 3)
 set(ARMA_MINOR 2)
-set(ARMA_PATCH 0)
+set(ARMA_PATCH 1)
 
 message(STATUS "Configuring Armadillo ${ARMA_MAJOR}.${ARMA_MINOR}.${ARMA_PATCH}")
 
@@ -280,7 +280,11 @@
 # library in either /usr/lib or /usr/lib64
 
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+  message(STATUS "*** CMAKE_INSTALL_PREFIX was initalised by cmake to the default value of ${CMAKE_INSTALL_PREFIX}")
+  message(STATUS "*** CMAKE_INSTALL_PREFIX changed to /usr")
+  unset(CMAKE_INSTALL_PREFIX)
   set(CMAKE_INSTALL_PREFIX "/usr")
+  #set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "install prefix" FORCE)
 endif()
 
 # Allow for the "lib" directory to be specified on the command line
@@ -288,11 +292,15 @@
   set(INSTALL_LIB_DIR "lib")
   if(UNIX AND NOT APPLE)   # I don't know how Mac OS handles 64 bit systems
     if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-      message(STATUS "Detected 64 bit system")
-        if(IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/lib64")
-          unset(INSTALL_LIB_DIR)
-          set(INSTALL_LIB_DIR "lib64")
-        endif()
+      message(STATUS "*** Detected 64 bit system")
+      # use "lib64" only on systems that have it (eg. Fedora, Red Hat).
+      # if installing in /usr/local/, the use of lib64 might be unreliable on systems which have /usr/local/lib64 but don't use it
+      if(IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/lib64")
+        unset(INSTALL_LIB_DIR)
+        set(INSTALL_LIB_DIR "lib64")
+        message(STATUS "*** ${CMAKE_INSTALL_PREFIX}/lib64/ exists, so destination directory for the run-time library changed to ${CMAKE_INSTALL_PREFIX}/lib64/")
+        message(STATUS "*** Your system and/or compiler must search ${CMAKE_INSTALL_PREFIX}/lib64/ during linking")
+      endif()
     endif()
   endif()
 endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.2.0/docs/index.html new/armadillo-3.2.1/docs/index.html
--- old/armadillo-3.2.0/docs/index.html	2012-05-18 10:22:32.000000000 +0200
+++ new/armadillo-3.2.1/docs/index.html	2012-05-25 05:34:16.000000000 +0200
@@ -61,7 +61,7 @@
 </li>
 <br>
 <li>
-Notes on <a href="#api_changes">API additions</a>
+Notes on <a href="#api_additions">API additions</a>
 </li>
 </ul>
 </td>
@@ -259,7 +259,8 @@
 <a href="#syntax">Matlab/Armadillo syntax differences</a> ·
 <a href="#example_prog">example program</a> ·
 <!--<a href="#catching_exceptions">catching exceptions</a> ·-->
-<a href="#api_changes">API changes</a>
+<a href="#config_hpp">config.hpp</a> ·
+<a href="#api_additions">API additions</a>
 </ul>
 <br>
 
@@ -540,6 +541,7 @@
 <li><a href="#Col">Col class</a></li>
 <li><a href="#Row">Row class</a></li>
 <li><a href="#Cube">Cube class</a></li>
+<li><a href="#config_hpp">config.hpp</a></li>
 </ul>
 </li>
 <br>
@@ -1569,7 +1571,7 @@
 For <i>mat</i>, <i>cube</i> and <i>field</i>, access the <i>n</i>-th element/object under the assumption of a flat layout,
 with column-major ordering of data (ie. column by column).
 A <i>std::logic_error</i> exception is thrown if the requested element is out of bounds.
-The bounds check can be optionally disabled at compile-time (see below).
+The bounds check can be optionally disabled at compile-time (see below) to get more speed.
                           </td>
                         </tr>
 <tr>
@@ -1602,7 +1604,7 @@
                           <td style="vertical-align: top;">
 For <i>mat</i> and <i>field</i> classes, access the element/object stored at the <i>i</i>-th row and <i>j</i>-th column.
 A <i>std::logic_error</i> exception is thrown if the requested element is out of bounds.
-The bounds check can be optionally disabled at compile-time (see below).
+The bounds check can be optionally disabled at compile-time (see below) to get more speed.
                           </td>
                         </tr>
 <tr>
@@ -1637,7 +1639,7 @@
                           <td style="vertical-align: top;">
 Cube only: access the element stored at the <i>i</i>-th row, <i>j</i>-th column and <i>k</i>-th slice.
 A <i>std::logic_error</i> exception is thrown if the requested element is out of bounds.
-The bounds check can be optionally disabled at compile-time (see below).
+The bounds check can be optionally disabled at compile-time (see below) to get more speed.
                           </td>
                         </tr>
 <tr>
@@ -1662,7 +1664,7 @@
 <br>
 <li>
 The bounds checks used by the <i>(n)</i>, <i>(i,j)</i> and <i>(i,j,k)</i> access forms
-can be disabled by defining <i>ARMA_NO_DEBUG</i> or <i>NDEBUG</i> macros 
+can be disabled by defining <a href="#config_hpp_arma_no_debug"><i>ARMA_NO_DEBUG</i></a> or <i>NDEBUG</i> macros 
 before including the <i>armadillo</i> header file (eg. <i>#define ARMA_NO_DEBUG</i>).
 Disabling the bounds checks is not recommended until your code has been thoroughly debugged
 -- it's better to write correct code first, and then maximise its speed.
@@ -1713,7 +1715,7 @@
 <br>
 <li>
 If you have a C++11 compiler, instances of <i>Mat</i>, <i>Col</i> and <i>Row</i> classes can be also initialised via initialiser lists;
-this requires support for the C++11 standard to be <a href="#added_in_24">explicitly enabled</a>
+this requires support for the C++11 standard to be <a href="#config_hpp_arma_use_cxx11">explicitly enabled</a>
 </li>
 <br>
 <li>
@@ -7318,7 +7320,7 @@
 </li>
 <br>
 <li>
-The "divide and conquer" algorithm provides slightly different results, but is notably faster for matrices of size 30x30 or greater
+The "divide and conquer" algorithm provides slightly different results, but is notably faster for large matrices
 </li>
 <br>
 <li>If the decomposition fails, the output objects are reset and:
@@ -8636,7 +8638,7 @@
 </li>
 <br>
 <li>
-<i>ARMA_64BIT_WORD</i> can be enabled via editing <i>include/armadillo_bits/config.hpp</i>
+<a href="#config_hpp_arma_64bit_word"><i>ARMA_64BIT_WORD</i></a> can be enabled via editing <i>include/armadillo_bits/config.hpp</i>
 </li>
 <br>
 <li>See also:
@@ -9664,6 +9666,508 @@
 <br>
 
 
+
+<a name="config_hpp"></a>
+<hr class="greyline">
+<br>
+<b>config.hpp</b>
+<br>
+<br>
+<ul>
+<li>
+Armadillo can be configured via editing the file <i>include/armadillo_bits/config.hpp</i>.
+Specific functionality can be enabled or disabled by uncommenting or commenting out a particular <i>#define</i>, listed below.
+<br>
+<br>
+<table style="text-align: left;" border="0" cellpadding="2" cellspacing="2">
+<tbody>
+  <tr>
+    <td style="vertical-align: top;">
+ARMA_USE_LAPACK
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+Enable the use of LAPACK, or a high-speed replacement for LAPACK (eg. Intel MKL, AMD ACML or the Accelerate framework).
+Armadillo requires LAPACK for functions such as <a href="#svd">svd()</a>, <a href="#inv">inv()</a>, <a href="#eig_sym">eig_sym()</a>, <a href="#solve">solve()</a>, etc.
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+ARMA_USE_BLAS
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+Enable the use of BLAS, or a high-speed replacement for BLAS (eg. OpenBLAS, Intel MKL, AMD ACML or the Accelerate framework).
+BLAS is used for <a href="#operators">matrix multiplication</a>.
+Without BLAS, Armadillo will use a built-in matrix multiplication routine, which might be slower for large matrices.
+<!--However, if you're using  64 bit operating system with 32 bit BLAS, it's better to disable the use of BLAS.-->
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+ARMA_BLAS_CAPITALS
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+Use capitalised (uppercase) BLAS and LAPACK function names (eg. DGEMM vs dgemm)
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+ARMA_BLAS_UNDERSCORE
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+Append an underscore to BLAS and LAPACK function names (eg. dgemm_ vs dgemm). Enabled by default.
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+ARMA_BLAS_LONG
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+Use "long" instead of "int" when calling BLAS and LAPACK functions
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+ARMA_BLAS_LONG_LONG
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+Use "long long" instead of "int" when calling BLAS and LAPACK functions
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+ARMA_USE_TBB_ALLOC
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+Use Intel TBB <i>scalable_malloc()</i> and <i>scalable_free()</i> instead of standard <i>new[]</i> and <i>delete[]</i> for managing matrix memory
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+ARMA_USE_MKL_ALLOC
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+Use Intel MKL <i>mkl_malloc()</i> and <i>mkl_free()</i> instead of standard <i>new[]</i> and <i>delete[]</i> for managing matrix memory
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+<a name="config_hpp_arma_64bit_word"></a>
+ARMA_64BIT_WORD
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+Use 64 bit integers. Useful if you require matrices/vectors capable of holding more than 4 billion elements.
+Your machine and compiler must have support for 64 bit integers (eg. via "long" or "long long").
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+<a name="config_hpp_arma_use_cxx11"></a>
+ARMA_USE_CXX11
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+Use C++11 features, such as <a href="#element_initialisation">initialiser lists</a>
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+<a name="config_hpp_arma_no_debug"></a>
+ARMA_NO_DEBUG
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+Disable all run-time checks, such as <a href="#element_access">bounds checking</a>.
+This will result in faster code, but you first need to make sure that your code runs correctly!
+We strongly recommend to have the run-time checks enabled during development,
+as this greatly aids in finding mistakes in your code, and hence speeds up development.
+We recommend that run-time checks be disabled <b>only</b> for the shipped version of your program.
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+ARMA_EXTRA_DEBUG
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+Print out the trace of internal functions used for evaluating expressions.
+Not recommended for normal use.
+This is mainly useful for debugging the library.
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+ARMA_MAT_PREALLOC
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+The number of preallocated elements used by matrices and vectors.
+Must be always enabled and set to an integer that is at least 1.
+By default set to 16.
+If you mainly use lots of very small vectors (eg. ≤ 4 elements), change the number to the size of your vectors.
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+ARMA_DEFAULT_OSTREAM
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+The default stream used for printing <a href="#logging">error messages</a> and by <a href="#print">.print()</a>.
+Must be always enabled.
+By default this is set to <i>std::cout</i>
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+ARMA_DONT_USE_LAPACK
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+Disable use of LAPACK. Overrides <i>ARMA_USE_LAPACK</i>
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+ARMA_DONT_USE_BLAS
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+Disable use of BLAS. Overrides <i>ARMA_USE_BLAS</i>
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+    <td style="vertical-align: top;">
+       
+    </td>
+  </tr>
+</tbody>
+</table>
+</li>
+
+<br>
+<li>
+See also:
+<ul>
+<li><a href="#logging">logging of warnings and errors</a></li>
+<li><a href="#element_access">element access</a></li>
+<li><a href="#element_initialisation">element initialisation</a></li>
+<li><a href="#uword">uword/sword</a></li>
+</ul>
+</li>
+<br>
+</ul>
+<br>
+
+
+
 <!--
 <a name="catching_exceptions"></a>
 <hr class="greyline">
@@ -9718,6 +10222,7 @@
 <br>
 -->
 
+<a name="api_additions"></a>
 <a name="api_changes"></a>
 <hr class="greyline">
 <br>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.2.0/include/armadillo_bits/arma_version.hpp new/armadillo-3.2.1/include/armadillo_bits/arma_version.hpp
--- old/armadillo-3.2.0/include/armadillo_bits/arma_version.hpp	2012-05-18 10:22:32.000000000 +0200
+++ new/armadillo-3.2.1/include/armadillo_bits/arma_version.hpp	2012-05-25 08:27:22.000000000 +0200
@@ -18,7 +18,7 @@
 
 #define ARMA_VERSION_MAJOR 3
 #define ARMA_VERSION_MINOR 2
-#define ARMA_VERSION_PATCH 0
+#define ARMA_VERSION_PATCH 1
 #define ARMA_VERSION_NAME  "Creamfields"
 
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.2.0/include/armadillo_bits/debug.hpp new/armadillo-3.2.1/include/armadillo_bits/debug.hpp
--- old/armadillo-3.2.0/include/armadillo_bits/debug.hpp	2012-05-07 11:50:35.000000000 +0200
+++ new/armadillo-3.2.1/include/armadillo_bits/debug.hpp	2012-05-24 12:33:23.000000000 +0200
@@ -1099,7 +1099,7 @@
   #define arma_debug_set_error          true ? (void)0 : arma_set_error
   #define arma_debug_assert_same_size   true ? (void)0 : arma_assert_same_size
   #define arma_debug_assert_mul_size    true ? (void)0 : arma_assert_mul_size
-  #define arma_debug_assert_cube_as_mat true ? (void)0 : arma_debug_assert_cube_as_mat
+  #define arma_debug_assert_cube_as_mat true ? (void)0 : arma_assert_cube_as_mat
 
 #endif
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/armadillo-3.2.0/include/armadillo_bits/podarray_bones.hpp new/armadillo-3.2.1/include/armadillo_bits/podarray_bones.hpp
--- old/armadillo-3.2.0/include/armadillo_bits/podarray_bones.hpp	2012-05-16 11:46:56.000000000 +0200
+++ new/armadillo-3.2.1/include/armadillo_bits/podarray_bones.hpp	2012-05-18 13:15:38.000000000 +0200
@@ -74,7 +74,7 @@
   
   protected:
   
-  inline void init_cold(const uword new_n_elemZ);
+  inline void init_cold(const uword new_n_elem);
   inline void init_warm(const uword new_n_elem);
   
   };

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)