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

Merge commit '3d11f56880521c1d45504c965ae12886e9b72ace'

Browse Source
This commit is contained in:
tqchen
2015-04-08 17:39:45 -07:00
parent 23c273173f 3d11f56880
commit 9a6adb0f33
29 changed files with 225 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
subtree/rabit/rabit-learn/io/io-inl.h
View File

@@ -50,7 +50,7 @@ inline InputSplit *CreateInputSplit(const char *uri,
}
template<typename TStream>
class StreamAdapter : public IStream {
class StreamAdapter : public Stream {
public:
explicit StreamAdapter(TStream *stream)
: stream_(stream) {
@@ -75,9 +75,9 @@ class StreamAdapter : public IStream {
* \param uri the uri of the input, can contain hdfs prefix
* \param mode can be 'w' or 'r' for read or write
*/
inline IStream *CreateStream(const char *uri, const char *mode) {
inline Stream *CreateStream(const char *uri, const char *mode) {
#if RABIT_USE_WORMHOLE
return new StreamAdapter<dmlc::IStream>(dmlc::IStream::Create(uri, mode));
return new StreamAdapter<dmlc::Stream>(dmlc::Stream::Create(uri, mode));
#else
using namespace std;
if (!strncmp(uri, "file://", 7)) {