From 0dbac3d11ec59f9c8322866d645e3717f68566d0 Mon Sep 17 00:00:00 2001 From: tqchen Date: Sat, 25 Jul 2015 21:23:40 -0700 Subject: [PATCH] fix travis --- scripts/travis_after_failure.sh | 2 +- src/utils/thread_buffer.h | 4 ++-- wrapper/xgboost_wrapper.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/travis_after_failure.sh b/scripts/travis_after_failure.sh index 15b74d87f..921e14953 100755 --- a/scripts/travis_after_failure.sh +++ b/scripts/travis_after_failure.sh @@ -1,5 +1,5 @@ #!/bin/bash if [ ${TASK} == "R-package" ]; then - cat R-package/xgboost.Rcheck/*.log + cat xgboost/xgboost.Rcheck/*.log fi diff --git a/src/utils/thread_buffer.h b/src/utils/thread_buffer.h index c4dc1185d..bc4fb9f5e 100644 --- a/src/utils/thread_buffer.h +++ b/src/utils/thread_buffer.h @@ -219,7 +219,7 @@ class ThreadBuffer { factory_.Destroy(); } } - inline void SetParam(const char *name, const char *val) { + inline void SetParam(const char *name, const char *val) { } inline bool Init(void) { if (!factory_.Init()) return false; @@ -242,7 +242,7 @@ class ThreadBuffer { inline const ElemFactory &get_factory() const { return factory_; } - + private: // initialized bool init_end_; diff --git a/wrapper/xgboost_wrapper.cpp b/wrapper/xgboost_wrapper.cpp index b27132d50..6956b567d 100644 --- a/wrapper/xgboost_wrapper.cpp +++ b/wrapper/xgboost_wrapper.cpp @@ -181,14 +181,14 @@ const char *XGBSetGetLastError_(const char *str_set) { #else // crippled implementation for solaris case // exception handling is not needed for R, so it is OK. -#define API_BEGIN() +#define API_BEGIN() #define API_END_FINALIZE(Finalize) return 0 #define API_END() return 0 const char *XGBSetGetLastError_(const char *str_set) { return NULL; } -#endif +#endif // XGBOOST_STRICT_CXX98_ /*! \brief return str message of the last error */ const char *XGBGetLastError() {