Hendrik/xgboost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better handling at msvc

Browse Source
This commit is contained in:
tqchen 2015-04-25 20:52:07 -07:00
parent 6601939588
commit 82ca10acb6
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/dmlc/io.h
View File

@ -300,7 +300,7 @@ class istream : public std::basic_istream<char> {
// implementations of inline functions // implementations of inline functions
template<typename T> template<typename T>
inline void Stream::Write(const std::vector<T> &vec) { inline void Stream::Write(const std::vector<T> &vec) {
size_t sz = vec.size(); uint64_t sz = static_cast<uint64_t>(vec.size());
this->Write(&sz, sizeof(sz)); this->Write(&sz, sizeof(sz));
if (sz != 0) { if (sz != 0) {
this->Write(&vec[0], sizeof(T) * sz); this->Write(&vec[0], sizeof(T) * sz);
@ -308,25 +308,25 @@ inline void Stream::Write(const std::vector<T> &vec) {
} }
template<typename T> template<typename T>
inline bool Stream::Read(std::vector<T> *out_vec) { inline bool Stream::Read(std::vector<T> *out_vec) {
size_t sz; uint64_t sz;
if (this->Read(&sz, sizeof(sz)) == 0) return false; if (this->Read(&sz, sizeof(sz)) == 0) return false;
out_vec->resize(sz); out_vec->resize(static_cast<size_t>(sz));
if (sz != 0) { if (sz != 0) {
if (this->Read(&(*out_vec)[0], sizeof(T) * sz) == 0) return false; if (this->Read(&(*out_vec)[0], sizeof(T) * sz) == 0) return false;
} }
return true; return true;
} }
inline void Stream::Write(const std::string &str) { inline void Stream::Write(const std::string &str) {
size_t sz = str.length(); uint64_t sz = static_cast<uint64_t>(str.length());
this->Write(&sz, sizeof(sz)); this->Write(&sz, sizeof(sz));
if (sz != 0) { if (sz != 0) {
this->Write(&str[0], sizeof(char) * sz); this->Write(&str[0], sizeof(char) * sz);
} }
} }
inline bool Stream::Read(std::string *out_str) { inline bool Stream::Read(std::string *out_str) {
size_t sz; uint64_t sz;
if (this->Read(&sz, sizeof(sz)) == 0) return false; if (this->Read(&sz, sizeof(sz)) == 0) return false;
out_str->resize(sz); out_str->resize(static_cast<size_t>(sz));
if (sz != 0) { if (sz != 0) {
if (this->Read(&(*out_str)[0], sizeof(char) * sz) == 0) { if (this->Read(&(*out_str)[0], sizeof(char) * sz) == 0) {
return false; return false;

8
include/rabit/utils.h
View File

@ -43,10 +43,10 @@ extern "C" {
#ifdef _MSC_VER #ifdef _MSC_VER
typedef unsigned char uint8_t; typedef unsigned char uint8_t;
typedef unsigned short int uint16_t; typedef unsigned __int16 uint16_t;
typedef unsigned int uint32_t; typedef unsigned __int32 uint32_t;
typedef unsigned long uint64_t; typedef unsigned __int64 uint64_t;
typedef long int64_t; typedef __int64 int64_t;
#else #else
#include <inttypes.h> #include <inttypes.h>
#endif #endif