summaryrefslogtreecommitdiff
path: root/controller
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2016-11-04 15:34:49 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2016-11-04 15:34:49 -0700
commit7729cbe31368abb2a737bfc5a74e81c4fb4c6717 (patch)
tree934ced1773672fa65e464f81ea0d427ad2581e06 /controller
parent3e865067bee030a5d79d9c321152c392d46e4542 (diff)
downloadinfinitytier-7729cbe31368abb2a737bfc5a74e81c4fb4c6717.tar.gz
infinitytier-7729cbe31368abb2a737bfc5a74e81c4fb4c6717.zip
Fix ambiguous error on some compilers.
Diffstat (limited to 'controller')
-rw-r--r--controller/JSONDB.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/controller/JSONDB.cpp b/controller/JSONDB.cpp
index bb0b98ed..59110f25 100644
--- a/controller/JSONDB.cpp
+++ b/controller/JSONDB.cpp
@@ -20,7 +20,7 @@
namespace ZeroTier {
-static const nlohmann::json _EMPTY_JSON({{}});
+static const nlohmann::json _EMPTY_JSON(nlohmann::json::object());
bool JSONDB::put(const std::string &n,const nlohmann::json &obj)
{