[mlpack-git] master: Stop special handling for Armadillo versions for HDF5. (a277255)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/066c67040a600a4600eebc6b5e0d63dc090acb8d...a27725526b5b0168175b3dd50b92b7121fb49c91

>---------------------------------------------------------------

commit a27725526b5b0168175b3dd50b92b7121fb49c91
Author: Ryan Curtin <ryan at ratml.org>
Date:   Thu Sep 29 10:10:01 2016 -0400

    Stop special handling for Armadillo versions for HDF5.
    
    This should hopefully fix a few more failing tests in the matrix build.


>---------------------------------------------------------------

a27725526b5b0168175b3dd50b92b7121fb49c91
 src/mlpack/tests/load_save_test.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/mlpack/tests/load_save_test.cpp b/src/mlpack/tests/load_save_test.cpp
index 27930ed..9cf7cb6 100644
--- a/src/mlpack/tests/load_save_test.cpp
+++ b/src/mlpack/tests/load_save_test.cpp
@@ -518,9 +518,7 @@ BOOST_AUTO_TEST_CASE(SavePGMBinaryTest)
   remove("test_file.pgm");
 }
 
-#if defined(ARMA_USE_HDF5) && (ARMA_VERSION_MAJOR == 3 \
-    || (ARMA_VERSION_MAJOR == 4 && (ARMA_VERSION_MINOR < 300 \
-    ||  ARMA_VERSION_MINOR > 400)))
+#if defined(ARMA_USE_HDF5)
 /**
  * Make sure load as HDF5 is successful.
  */