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 300 #define ARMA_VERSION_MINOR 300
#define ARMA_VERSION_PATCH 5 #define ARMA_VERSION_PATCH 6
#define ARMA_VERSION_NAME "Medieval Cornea Scraper" #define ARMA_VERSION_NAME "Medieval Cornea Scraper"
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 47 skipping to change at line 47
#undef ARMA_USE_CXX11 #undef ARMA_USE_CXX11
#define ARMA_USE_CXX11 #define ARMA_USE_CXX11
#endif #endif
#include "armadillo_bits/config.hpp" #include "armadillo_bits/config.hpp"
#include "armadillo_bits/compiler_setup.hpp" #include "armadillo_bits/compiler_setup.hpp"
#if defined(ARMA_USE_CXX11) #if defined(ARMA_USE_CXX11)
#include <initializer_list> #include <initializer_list>
#include <cstdint> #include <cstdint>
#include <chrono>
#include <random> #include <random>
#if !defined(ARMA_DONT_USE_CXX11_CHRONO)
#include <chrono>
#endif
#endif #endif
#if defined(ARMA_USE_TBB_ALLOC) #if defined(ARMA_USE_TBB_ALLOC)
#include <tbb/scalable_allocator.h> #include <tbb/scalable_allocator.h>
#endif #endif
#if defined(ARMA_USE_MKL_ALLOC) #if defined(ARMA_USE_MKL_ALLOC)
#include <mkl_service.h> #include <mkl_service.h>
#endif #endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 3 lines changed or added


 compiler_setup.hpp   compiler_setup.hpp 
skipping to change at line 146 skipping to change at line 146
#define ARMA_HAVE_ALIGNED_ATTRIBUTE #define ARMA_HAVE_ALIGNED_ATTRIBUTE
#if defined(__GXX_EXPERIMENTAL_CXX0X__) #if defined(__GXX_EXPERIMENTAL_CXX0X__)
#undef ARMA_USE_CXX11 #undef ARMA_USE_CXX11
#define ARMA_USE_CXX11 #define ARMA_USE_CXX11
#endif #endif
#if defined(ARMA_USE_CXX11) #if defined(ARMA_USE_CXX11)
#if (ARMA_GCC_VERSION < 40700) && !defined(__clang__) #if (ARMA_GCC_VERSION < 40700) && !defined(__clang__)
#pragma message ("Your C++ compiler is in C++11 mode, but it has inco #pragma message ("WARNING: your C++ compiler is in C++11 mode, but it
mplete support for C++11 features") has incomplete support for C++11 features; if something breaks, you get to
keep all the pieces")
#define ARMA_DONT_USE_CXX11_CHRONO
#endif #endif
#endif #endif
#if !defined(ARMA_USE_CXX11) #if !defined(ARMA_USE_CXX11)
#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_TR1 #define ARMA_HAVE_TR1
#endif #endif
#endif #endif
#if (ARMA_GCC_VERSION >= 40300) #if (ARMA_GCC_VERSION >= 40300)
 End of changes. 1 change blocks. 
2 lines changed or deleted 4 lines changed or added


 wall_clock_bones.hpp   wall_clock_bones.hpp 
skipping to change at line 26 skipping to change at line 26
inline wall_clock(); inline wall_clock();
inline ~wall_clock(); inline ~wall_clock();
inline void tic(); //!< start the timer inline void tic(); //!< start the timer
inline double toc(); //!< return the number of seconds since the last ca ll to tic() inline double toc(); //!< return the number of seconds since the last ca ll to tic()
private: private:
bool valid; bool valid;
#if defined(ARMA_USE_CXX11) #if defined(ARMA_USE_CXX11) && !defined(ARMA_DONT_USE_CXX11_CHRONO)
std::chrono::steady_clock::time_point chrono_time1; std::chrono::steady_clock::time_point chrono_time1;
#elif defined(ARMA_HAVE_GETTIMEOFDAY) #elif defined(ARMA_HAVE_GETTIMEOFDAY)
struct timeval posix_time1; struct timeval posix_time1;
struct timeval posix_time2; struct timeval posix_time2;
#else #else
clock_t time1; clock_t time1;
#endif #endif
}; };
//! @} //! @}
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 wall_clock_meat.hpp   wall_clock_meat.hpp 
skipping to change at line 30 skipping to change at line 30
{ {
arma_extra_debug_sigprint(); arma_extra_debug_sigprint();
} }
inline inline
void void
wall_clock::tic() wall_clock::tic()
{ {
arma_extra_debug_sigprint(); arma_extra_debug_sigprint();
#if defined(ARMA_USE_CXX11) #if defined(ARMA_USE_CXX11) && !defined(ARMA_DONT_USE_CXX11_CHRONO)
{ {
chrono_time1 = std::chrono::steady_clock::now(); chrono_time1 = std::chrono::steady_clock::now();
valid = true; valid = true;
} }
#elif defined(ARMA_HAVE_GETTIMEOFDAY) #elif defined(ARMA_HAVE_GETTIMEOFDAY)
{ {
gettimeofday(&posix_time1, 0); gettimeofday(&posix_time1, 0);
valid = true; valid = true;
} }
#else #else
skipping to change at line 56 skipping to change at line 56
} }
inline inline
double double
wall_clock::toc() wall_clock::toc()
{ {
arma_extra_debug_sigprint(); arma_extra_debug_sigprint();
if(valid) if(valid)
{ {
#if defined(ARMA_USE_CXX11) #if defined(ARMA_USE_CXX11) && !defined(ARMA_DONT_USE_CXX11_CHRONO)
{ {
const std::chrono::steady_clock::time_point chrono_time2 = std::chron o::steady_clock::now(); const std::chrono::steady_clock::time_point chrono_time2 = std::chron o::steady_clock::now();
typedef std::chrono::duration<double> duration_type; typedef std::chrono::duration<double> duration_type;
const duration_type chrono_span = std::chrono::duration_cast< duratio n_type >(chrono_time2 - chrono_time1); const duration_type chrono_span = std::chrono::duration_cast< duratio n_type >(chrono_time2 - chrono_time1);
return chrono_span.count(); return chrono_span.count();
} }
#elif defined(ARMA_HAVE_GETTIMEOFDAY) #elif defined(ARMA_HAVE_GETTIMEOFDAY)
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 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/