[mlpack-git] master: Disable C4519 in prereqs.hpp not core.hpp. (00808b7)
gitdub at big.cc.gt.atl.ga.us
gitdub at big.cc.gt.atl.ga.us
Thu Mar 5 22:03:51 EST 2015
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/904762495c039e345beba14c1142fd719b3bd50e...f94823c800ad6f7266995c700b1b630d5ffdcf40
>---------------------------------------------------------------
commit 00808b7fb5e324816b54aec10f9446a93ee151e1
Author: Ryan Curtin <ryan at ratml.org>
Date: Wed Nov 19 18:38:40 2014 +0000
Disable C4519 in prereqs.hpp not core.hpp.
>---------------------------------------------------------------
00808b7fb5e324816b54aec10f9446a93ee151e1
src/mlpack/core.hpp | 7 -------
src/mlpack/prereqs.hpp | 7 +++++++
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/mlpack/core.hpp b/src/mlpack/core.hpp
index 1bb1401..4e4a5ec 100644
--- a/src/mlpack/core.hpp
+++ b/src/mlpack/core.hpp
@@ -193,10 +193,3 @@
#undef max
#endif
#endif
-
-// On Visual Studio, disable C4519 (default arguments for function templates)
-// since it's by default an error, which doesn't even make any sense because
-// it's part of the C++11 standard.
-#ifdef _MSC_VER
- #pragma warning(disable : 4519)
-#endif
diff --git a/src/mlpack/prereqs.hpp b/src/mlpack/prereqs.hpp
index fa18340..50a4f97 100644
--- a/src/mlpack/prereqs.hpp
+++ b/src/mlpack/prereqs.hpp
@@ -48,4 +48,11 @@ problems. It should only be necessary to include <mlpack/core.hpp> and not\
// Now include Armadillo through the special mlpack extensions.
#include <mlpack/core/arma_extend/arma_extend.hpp>
+// On Visual Studio, disable C4519 (default arguments for function templates)
+// since it's by default an error, which doesn't even make any sense because
+// it's part of the C++11 standard.
+#ifdef _MSC_VER
+ #pragma warning(disable : 4519)
+#endif
+
#endif
More information about the mlpack-git
mailing list