diff options
| author | Grant Limberg <grant.limberg@zerotier.com> | 2016-11-21 12:59:43 -0800 |
|---|---|---|
| committer | Grant Limberg <grant.limberg@zerotier.com> | 2016-11-21 12:59:43 -0800 |
| commit | 1be55d61820344f08f06e2ba79cee2d876601267 (patch) | |
| tree | 96fef6aa92989ba51b133eee65126ff54d2fdd40 /one.cpp | |
| parent | 8ebcd44405841dc0b7529336cdc5207bda876633 (diff) | |
| parent | ccdd4ffda70a35219fae1cdce1306f3d4ebd8dc9 (diff) | |
| download | infinitytier-1be55d61820344f08f06e2ba79cee2d876601267.tar.gz infinitytier-1be55d61820344f08f06e2ba79cee2d876601267.zip | |
Merge branch 'dev' into systemtray
Diffstat (limited to 'one.cpp')
| -rw-r--r-- | one.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -696,7 +696,7 @@ static int idtool(int argc,char **argv) CertificateOfMembership com; for(int a=3;a<argc;++a) { - std::vector<std::string> params(Utils::split(argv[a],",","","")); + std::vector<std::string> params(OSUtils::split(argv[a],",","","")); if (params.size() == 3) { uint64_t qId = Utils::hexStrToU64(params[0].c_str()); uint64_t qValue = Utils::hexStrToU64(params[1].c_str()); @@ -1084,7 +1084,7 @@ int main(int argc,char **argv) fprintf(stderr,"%s: no home path specified and no platform default available" ZT_EOL_S,argv[0]); return 1; } else { - std::vector<std::string> hpsp(Utils::split(homeDir.c_str(),ZT_PATH_SEPARATOR_S,"","")); + std::vector<std::string> hpsp(OSUtils::split(homeDir.c_str(),ZT_PATH_SEPARATOR_S,"","")); std::string ptmp; if (homeDir[0] == ZT_PATH_SEPARATOR) ptmp.push_back(ZT_PATH_SEPARATOR); |