[mlpack] 180/207: use preprocessor to omit extra instant of Load function under windows

Barak A. Pearlmutter barak+git at pearlmutter.net
Thu Mar 23 17:53:52 UTC 2017


This is an automated email from the git hooks/post-receive script.

bap pushed a commit to branch master
in repository mlpack.

commit 9a8ca1aeac82a53eac70e3642069b6924ee9a9ad
Author: stereomatchingkiss <thamngapwei at gmail.com>
Date:   Sun Mar 12 09:20:48 2017 +0800

    use preprocessor to omit extra instant of Load function under windows
---
 src/mlpack/core/data/load.cpp | 2 ++
 src/mlpack/core/data/load.hpp | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/src/mlpack/core/data/load.cpp b/src/mlpack/core/data/load.cpp
index ab843b4..9a50109 100644
--- a/src/mlpack/core/data/load.cpp
+++ b/src/mlpack/core/data/load.cpp
@@ -26,8 +26,10 @@ template bool Load<double, IncrementPolicy>(const std::string&, arma::Mat<double
                                             DatasetMapper<IncrementPolicy>&,
                                             const bool, const bool);
 
+#ifndef  _WIN32
 template bool Load<unsigned long long, IncrementPolicy>(const std::string&, arma::Mat<unsigned long long>&,
                                                         DatasetMapper<IncrementPolicy>&,
                                                         const bool, const bool);
+#endif
 
 }}
diff --git a/src/mlpack/core/data/load.hpp b/src/mlpack/core/data/load.hpp
index c791c2e..d35960d 100644
--- a/src/mlpack/core/data/load.hpp
+++ b/src/mlpack/core/data/load.hpp
@@ -69,7 +69,10 @@ extern template bool Load<int>(const std::string&, arma::Mat<int>&, const bool,
 extern template bool Load<size_t>(const std::string&, arma::Mat<size_t>&, const bool, const bool);
 extern template bool Load<float>(const std::string&, arma::Mat<float>&, const bool, const bool);
 extern template bool Load<double>(const std::string&, arma::Mat<double>&, const bool, const bool);
+
+#ifndef  _WIN32
 extern template bool Load<unsigned long long>(const std::string&, arma::Mat<unsigned long long>&, const bool, const bool);
+#endif
 
 /**
  * Load a column vector from a file, guessing the filetype from the extension.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mlpack.git



More information about the debian-science-commits mailing list