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 /controller/JSONDB.cpp | |
| parent | 8ebcd44405841dc0b7529336cdc5207bda876633 (diff) | |
| parent | ccdd4ffda70a35219fae1cdce1306f3d4ebd8dc9 (diff) | |
| download | infinitytier-1be55d61820344f08f06e2ba79cee2d876601267.tar.gz infinitytier-1be55d61820344f08f06e2ba79cee2d876601267.zip | |
Merge branch 'dev' into systemtray
Diffstat (limited to 'controller/JSONDB.cpp')
| -rw-r--r-- | controller/JSONDB.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |