diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-11-18 15:49:28 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-11-18 15:49:28 -0800 |
| commit | ccdd4ffda70a35219fae1cdce1306f3d4ebd8dc9 (patch) | |
| tree | dabf33f54a180293cd44961a9b9b557fe8fae4de /controller | |
| parent | 673c0c811ea443c217b3a4ca17eeaed3ab596501 (diff) | |
| download | infinitytier-ccdd4ffda70a35219fae1cdce1306f3d4ebd8dc9.tar.gz infinitytier-ccdd4ffda70a35219fae1cdce1306f3d4ebd8dc9.zip | |
Move split() to OSUtils since it is not used in core.
Diffstat (limited to 'controller')
| -rw-r--r-- | controller/EmbeddedNetworkController.cpp | 2 | ||||
| -rw-r--r-- | controller/JSONDB.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/controller/EmbeddedNetworkController.cpp b/controller/EmbeddedNetworkController.cpp index 74937dd8..974936e4 100644 --- a/controller/EmbeddedNetworkController.cpp +++ b/controller/EmbeddedNetworkController.cpp @@ -889,7 +889,7 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpPOST( json &v6m = b["v6AssignMode"]; if (!nv6m.is_object()) nv6m = json::object(); if (v6m.is_string()) { // backward compatibility - std::vector<std::string> v6ms(Utils::split(_jS(v6m,"").c_str(),",","","")); + std::vector<std::string> v6ms(OSUtils::split(_jS(v6m,"").c_str(),",","","")); std::sort(v6ms.begin(),v6ms.end()); v6ms.erase(std::unique(v6ms.begin(),v6ms.end()),v6ms.end()); nv6m["rfc4193"] = false; diff --git a/controller/JSONDB.cpp b/controller/JSONDB.cpp index 6adc8a66..a9e9d05b 100644 --- a/controller/JSONDB.cpp +++ b/controller/JSONDB.cpp @@ -144,7 +144,7 @@ bool JSONDB::_isValidObjectName(const std::string &n) std::string JSONDB::_genPath(const std::string &n,bool create) { - std::vector<std::string> pt(Utils::split(n.c_str(),"/","","")); + std::vector<std::string> pt(OSUtils::split(n.c_str(),"/","","")); if (pt.size() == 0) return std::string(); |