From e63faf0e85dd72467bc43129aeb713e3a1ff09f3 Mon Sep 17 00:00:00 2001 From: tqchen Date: Mon, 27 Apr 2015 22:52:19 -0700 Subject: [PATCH] minor shadow fix --- src/io/page_dmatrix-inl.hpp | 4 ++-- src/learner/learner-inl.hpp | 3 +-- src/tree/updater_colmaker-inl.hpp | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/io/page_dmatrix-inl.hpp b/src/io/page_dmatrix-inl.hpp index 80bd080a3..8fb02e18e 100644 --- a/src/io/page_dmatrix-inl.hpp +++ b/src/io/page_dmatrix-inl.hpp @@ -185,8 +185,8 @@ class DMatrixPageBase : public DataMatrix { iter_->Load(utils::FileStream(utils::FopenCheck(fname_row.c_str(), "rb"))); // save data matrix utils::FileStream fs(utils::FopenCheck(cache_file, "wb")); - int magic = kMagic; - fs.Write(&magic, sizeof(magic)); + int tmagic = kMagic; + fs.Write(&tmagic, sizeof(tmagic)); this->info.SaveBinary(fs); fs.Close(); if (!silent) { diff --git a/src/learner/learner-inl.hpp b/src/learner/learner-inl.hpp index e972b2257..ecbc17615 100644 --- a/src/learner/learner-inl.hpp +++ b/src/learner/learner-inl.hpp @@ -235,9 +235,8 @@ class BoostLearner : public rabit::Serializable { /*! * \brief save model into file * \param fname file name - * \param save_base64 whether save in base64 format */ - inline void SaveModel(const char *fname, bool save_base64 = false) const { + inline void SaveModel(const char *fname) const { utils::IStream *fo = utils::IStream::Create(fname, "w"); if (save_base64 != 0 || !strcmp(fname, "stdout")) { fo->Write("bs64\t", 5); diff --git a/src/tree/updater_colmaker-inl.hpp b/src/tree/updater_colmaker-inl.hpp index 63cdf80ba..f657c0335 100644 --- a/src/tree/updater_colmaker-inl.hpp +++ b/src/tree/updater_colmaker-inl.hpp @@ -237,7 +237,6 @@ class ColMaker: public IUpdater { bool need_forward = param.need_forward_search(fmat.GetColDensity(fid)); bool need_backward = param.need_backward_search(fmat.GetColDensity(fid)); const std::vector &qexpand = qexpand_; - int nthread; #pragma omp parallel { const int tid = omp_get_thread_num();