arma_version.hpp   arma_version.hpp 
skipping to change at line 18 skipping to change at line 18
// Lesser General Public License (LGPL) as published // Lesser General Public License (LGPL) as published
// by the Free Software Foundation, either version 3 // by the Free Software Foundation, either version 3
// of the License or (at your option) any later version. // of the License or (at your option) any later version.
// (see http://www.opensource.org/licenses for more info) // (see http://www.opensource.org/licenses for more info)
//! \addtogroup arma_version //! \addtogroup arma_version
//! @{ //! @{
#define ARMA_VERSION_MAJOR 1 #define ARMA_VERSION_MAJOR 1
#define ARMA_VERSION_MINOR 0 #define ARMA_VERSION_MINOR 0
#define ARMA_VERSION_PATCH 0 #define ARMA_VERSION_PATCH 2
#define ARMA_VERSION_NAME "Antipodean Antileech" #define ARMA_VERSION_NAME "Antipodean Antileech"
// http://dictionary.reference.com/browse/leech // http://dictionary.reference.com/browse/leech
// //
// 2. a person who clings to another for personal gain, // 2. a person who clings to another for personal gain,
// esp. without giving anything in return, and usually // esp. without giving anything in return, and usually
// with the implication or effect of exhausting the // with the implication or effect of exhausting the
// other's resources; parasite. // other's resources; parasite.
struct arma_version struct arma_version
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 compiler_setup.hpp   compiler_setup.hpp 
skipping to change at line 73 skipping to change at line 73
#define arma_aligned __attribute__((aligned)) #define arma_aligned __attribute__((aligned))
#define arma_warn_unused __attribute__((warn_unused_result)) #define arma_warn_unused __attribute__((warn_unused_result))
#define arma_deprecated __attribute__((deprecated)) #define arma_deprecated __attribute__((deprecated))
#if (ARMA_GCC_VERSION >= 40200) #if (ARMA_GCC_VERSION >= 40200)
#if defined(_GLIBCXX_USE_C99_MATH_TR1) && defined(_GLIBCXX_USE_C99_COMP LEX_TR1) #if defined(_GLIBCXX_USE_C99_MATH_TR1) && defined(_GLIBCXX_USE_C99_COMP LEX_TR1)
#define ARMA_HAVE_STD_TR1 #define ARMA_HAVE_STD_TR1
#endif #endif
#endif #endif
#if defined(__GXX_EXPERIMENTAL_CXX0X__)
#undef ARMA_HAVE_STD_TR1
#endif
#if (ARMA_GCC_VERSION >= 40300) #if (ARMA_GCC_VERSION >= 40300)
#undef arma_hot #undef arma_hot
#undef arma_cold #undef arma_cold
#define arma_hot __attribute__((hot)) #define arma_hot __attribute__((hot))
#define arma_cold __attribute__((cold)) #define arma_cold __attribute__((cold))
#endif #endif
#undef ARMA_GCC_VERSION #undef ARMA_GCC_VERSION
 End of changes. 1 change blocks. 
0 lines changed or deleted 4 lines changed or added


 fn_min.hpp   fn_min.hpp 
skipping to change at line 139 skipping to change at line 139
return op_min::direct_min(A); return op_min::direct_min(A);
} }
template<typename eT> template<typename eT>
inline inline
arma_warn_unused arma_warn_unused
eT eT
min(const Op<subview<eT>, op_min>& in) min(const Op<subview<eT>, op_min>& in)
{ {
arma_extra_debug_sigprint(); arma_extra_debug_sigprint();
arma_extra_debug_print("max(): two consecutive max() calls detected"); arma_extra_debug_print("min(): two consecutive min() calls detected");
const subview<eT>& X = in.m; const subview<eT>& X = in.m;
arma_debug_check( (X.n_elem == 0), "max(): given matrix has no elements" ); arma_debug_check( (X.n_elem == 0), "min(): given matrix has no elements" );
return op_min::direct_min(X); return op_min::direct_min(X);
} }
//! @} //! @}
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 subview_cube_meat.hpp   subview_cube_meat.hpp 
skipping to change at line 508 skipping to change at line 508
subview_cube<eT>& t = *this; subview_cube<eT>& t = *this;
arma_debug_assert_same_size(t, x, "copy into subcube"); arma_debug_assert_same_size(t, x, "copy into subcube");
const u32 t_n_rows = t.n_rows; const u32 t_n_rows = t.n_rows;
const u32 t_n_cols = t.n_cols; const u32 t_n_cols = t.n_cols;
const u32 t_aux_slice1 = t.aux_slice1; const u32 t_aux_slice1 = t.aux_slice1;
for(u32 col = 0; col < t_n_cols; ++col) for(u32 col = 0; col < t_n_cols; ++col)
{ {
syslib:copy_elem( t.slice_colptr(t_aux_slice1, col), x.colptr(col), t_n _rows ); syslib::copy_elem( t.slice_colptr(t_aux_slice1, col), x.colptr(col), t_ n_rows );
} }
} }
template<typename eT> template<typename eT>
template<typename T1> template<typename T1>
inline inline
void void
subview_cube<eT>::operator+= (const Base<eT,T1>& in) subview_cube<eT>::operator+= (const Base<eT,T1>& in)
{ {
arma_extra_debug_sigprint(); arma_extra_debug_sigprint();
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/