SINGA-34 Support external zookeeper service fixbug from gflags namespace in tool.cc; the namespace gflags is renamed to google for new versions.
Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/7954a87d Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/7954a87d Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/7954a87d Branch: refs/heads/master Commit: 7954a87d28a8471c7e9b8b72a31393b84d398df4 Parents: a14c682 Author: wang wei <[email protected]> Authored: Fri Jul 17 00:48:35 2015 +0800 Committer: wang wei <[email protected]> Committed: Fri Jul 17 00:48:35 2015 +0800 ---------------------------------------------------------------------- src/utils/tool.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/7954a87d/src/utils/tool.cc ---------------------------------------------------------------------- diff --git a/src/utils/tool.cc b/src/utils/tool.cc index 37ce729..7309108 100644 --- a/src/utils/tool.cc +++ b/src/utils/tool.cc @@ -3,6 +3,9 @@ #include "proto/cluster.pb.h" #include "utils/cluster_rt.h" #include "utils/common.h" +#ifndef GFLAGS_GFLAGS_H_ + namespace gflags = google; +#endif // GFLAGS_GFLAGS_H_ DEFINE_string(global, "conf/singa.conf", "Global config file"); @@ -15,7 +18,7 @@ int main(int argc, char **argv) { singa::SetupLog(global.log_dir(), "SingaTool"); LOG(INFO) << "The global config is \n" << global.DebugString(); - + singa::JobManager mng(global.zookeeper_host()); int ret = 0; if (!mng.Init()) ret = 1;
