summaryrefslogtreecommitdiff
path: root/one.cpp
diff options
context:
space:
mode:
authorGrant Limberg <grant.limberg@zerotier.com>2016-11-03 12:10:50 -0700
committerGrant Limberg <grant.limberg@zerotier.com>2016-11-03 12:10:50 -0700
commit8ffae313fd5042bb4330afd98019e4ee907714cb (patch)
treebafa4a54f0a9e3ec57e4fba1b9e10b37b531b105 /one.cpp
parent8cced06a2dff66300a46e2962cd462f58096b15c (diff)
downloadinfinitytier-8ffae313fd5042bb4330afd98019e4ee907714cb.tar.gz
infinitytier-8ffae313fd5042bb4330afd98019e4ee907714cb.zip
add new files & remove old ones from VS project. Now builds & runs on Windows again
Diffstat (limited to 'one.cpp')
-rw-r--r--one.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/one.cpp b/one.cpp
index 79e8caf8..55cc2e19 100644
--- a/one.cpp
+++ b/one.cpp
@@ -402,7 +402,7 @@ static int cli(int argc,char **argv)
auto &addr = assignedAddresses[j];
if (addr.is_string()) {
if (aa.length() > 0) aa.push_back(',');
- aa.append(addr);
+ aa.append(addr.get<std::string>());
}
}
}
@@ -1194,9 +1194,5 @@ int main(int argc,char **argv)
delete zt1Service;
zt1Service = (OneService *)0;
-#ifdef __UNIX_LIKE__
- OSUtils::rm(pidPath.c_str());
-#endif
-
return returnValue;
}