Skip to content
Browse files

Replica set function name changes

  • Loading branch information...
1 parent afd4441 commit dc7d6eca2ac024f5f1efb4ba3f4d8afbe94aafc4 @gerald-lindsly committed Jan 7, 2013
Showing with 6 additions and 4 deletions.
  1. +1 −0 MongoMatlabDriver.vcxproj
  2. +1 −0 MongoMatlabDriver.vcxproj.filters
  3. +1 −1 api_gridfs.c
  4. +3 −3 api_mongo.c
View
1 MongoMatlabDriver.vcxproj
@@ -254,6 +254,7 @@
<None Include="GridfileWriter.m" />
<None Include="GridFS.m" />
<None Include="LICENSE.txt" />
+ <None Include="makefile" />
<None Include="Mongo.m" />
<None Include="MongoCursor.m" />
<None Include="MongoSample.m" />
View
1 MongoMatlabDriver.vcxproj.filters
@@ -130,5 +130,6 @@
<None Include="substr.m">
<Filter>Source Files</Filter>
</None>
+ <None Include="makefile" />
</ItemGroup>
</Project>
View
2 api_gridfs.c
@@ -223,7 +223,7 @@ EXPORT int mongo_gridfile_read(struct gridfile_* gf, mxArray* data) {
mexErrMsgTxt("Gridfile:read - only complex values of type double are supported");
p = calcSize(data, &size);
remaining = gridfile_get_contentlength(gf_) - gf_->pos;
- if (size > remaining || cplx && size*2 > remaining)
+ if (size > remaining || (cplx && size*2 > remaining))
return 0;
if (size) gridfile_read(gf_, size, (char*)p);
if (size && cplx)
View
6 api_mongo.c
@@ -56,21 +56,21 @@ EXPORT void mmongo_destroy(struct mongo_* conn) {
EXPORT void mmongo_replset_init(struct mongo_* conn, char* name) {
mongo* conn_ = (mongo*)conn;
- mongo_replset_init(conn_, name);
+ mongo_replica_set_init(conn_, name);
}
EXPORT void mongo_add_seed(struct mongo_* conn, char* host) {
mongo* conn_ = (mongo*)conn;
mongo_host_port hp;
mongo_parse_host(host, &hp);
- mongo_replset_add_seed(conn_, hp.host, hp.port);
+ mongo_replica_set_add_seed(conn_, hp.host, hp.port);
}
EXPORT int mmongo_replset_connect(struct mongo_* conn) {
mongo* conn_ = (mongo*)conn;
- return (mongo_replset_connect(conn_) == MONGO_OK);
+ return (mongo_replica_set_client(conn_) == MONGO_OK);
}

0 comments on commit dc7d6ec

Please sign in to comment.
Something went wrong with that request. Please try again.