# HG changeset patch # User Chris Cannam # Date 1486632097 0 # Node ID d2a32436bf09f4ab1c6610af64a8e8b466165187 # Parent 458766b73e719256439f71b0c3442e167e728dbc Fix some syntax that the compiler used with Emscripten on Travis doesn't like diff -r 458766b73e71 -r d2a32436bf09 vamp-json/VampJson.h --- a/vamp-json/VampJson.h Tue Feb 07 09:51:29 2017 +0000 +++ b/vamp-json/VampJson.h Thu Feb 09 09:21:37 2017 +0000 @@ -479,11 +479,11 @@ Vamp::Plugin::FeatureList fl; if (!j.is_array()) { err = "array expected for feature list"; - return {}; + return fl; } for (const json11::Json &fj : j.array_items()) { fl.push_back(toFeature(fj, serialisation, err)); - if (failed(err)) return {}; + if (failed(err)) return fl; } return fl; } @@ -497,16 +497,16 @@ Vamp::Plugin::FeatureSet fs; if (!j.is_object()) { err = "object expected for feature set"; - return {}; + return fs; } for (auto &entry : j.object_items()) { int n = omapper.idToIndex(entry.first); if (fs.find(n) != fs.end()) { err = "duplicate numerical index for output"; - return {}; + return fs; } fs[n] = toFeatureList(entry.second, serialisation, err); - if (failed(err)) return {}; + if (failed(err)) return fs; } return fs; }