arma_version.hpp   arma_version.hpp 
skipping to change at line 13 skipping to change at line 13
// //
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/. // file, You can obtain one at http://mozilla.org/MPL/2.0/.
//! \addtogroup arma_version //! \addtogroup arma_version
//! @{ //! @{
#define ARMA_VERSION_MAJOR 4 #define ARMA_VERSION_MAJOR 4
#define ARMA_VERSION_MINOR 320 #define ARMA_VERSION_MINOR 320
#define ARMA_VERSION_PATCH 1 #define ARMA_VERSION_PATCH 2
#define ARMA_VERSION_NAME "Daintree Tea Raider" #define ARMA_VERSION_NAME "Daintree Tea Raider"
struct arma_version struct arma_version
{ {
static const unsigned int major = ARMA_VERSION_MAJOR; static const unsigned int major = ARMA_VERSION_MAJOR;
static const unsigned int minor = ARMA_VERSION_MINOR; static const unsigned int minor = ARMA_VERSION_MINOR;
static const unsigned int patch = ARMA_VERSION_PATCH; static const unsigned int patch = ARMA_VERSION_PATCH;
static static
inline inline
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 armadillo   armadillo 
skipping to change at line 67 skipping to change at line 67
#if defined(ARMA_HAVE_TR1) #if defined(ARMA_HAVE_TR1)
#include <tr1/cmath> #include <tr1/cmath>
#include <tr1/complex> #include <tr1/complex>
#endif #endif
#endif #endif
#include "armadillo_bits/include_atlas.hpp" #include "armadillo_bits/include_atlas.hpp"
#if defined(ARMA_USE_HDF5) #if defined(ARMA_USE_HDF5)
#include <hdf5.h> #include <hdf5.h>
#if defined(H5_USE_16_API_DEFAULT) || defined(H5_USE_16_API)
#pragma message ("WARNING: disabling use of HDF5 due to its incompatibl
e configuration")
#undef ARMA_USE_HDF5
#endif
#endif #endif
//! \namespace arma namespace for Armadillo classes and functions //! \namespace arma namespace for Armadillo classes and functions
namespace arma namespace arma
{ {
// preliminaries // preliminaries
#include "armadillo_bits/forward_bones.hpp" #include "armadillo_bits/forward_bones.hpp"
#include "armadillo_bits/arma_static_check.hpp" #include "armadillo_bits/arma_static_check.hpp"
 End of changes. 1 change blocks. 
0 lines changed or deleted 5 lines changed or added


 config.hpp   config.hpp 
skipping to change at line 170 skipping to change at line 170
#endif #endif
#endif #endif
#if defined(ARMA_DONT_USE_CXX11_RNG) #if defined(ARMA_DONT_USE_CXX11_RNG)
#undef ARMA_USE_CXX11_RNG #undef ARMA_USE_CXX11_RNG
#endif #endif
#if defined(ARMA_DONT_USE_HDF5) #if defined(ARMA_DONT_USE_HDF5)
#undef ARMA_USE_HDF5 #undef ARMA_USE_HDF5
#endif #endif
#if defined(H5_USE_16_API_DEFAULT) || defined(H5_USE_16_API)
// #pragma message ("disabling use of HDF5 due to its incompatible config
uration")
#undef ARMA_USE_HDF5
#endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 0 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/