diff options
| author | David Robillard <d@drobilla.net> | 2007-07-27 00:26:40 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-07-27 00:26:40 +0000 |
| commit | 972a3e8476687951e8af4e9c1d4f25014dab1b82 (patch) | |
| tree | b20e1827a15a4309679fa68c7f8764e2381bde6b /src/libs/serialisation | |
| parent | f36e709b68144191d51959d6a2224cd9c3ad7871 (diff) | |
| download | ingen-972a3e8476687951e8af4e9c1d4f25014dab1b82.tar.gz ingen-972a3e8476687951e8af4e9c1d4f25014dab1b82.tar.bz2 ingen-972a3e8476687951e8af4e9c1d4f25014dab1b82.zip | |
Use uint32_t for num_ports (and poly), matches LV2 and size_t is excessive on 64-bit.
Remove (linear) sorted assertion from Table, except in unit tests.
git-svn-id: http://svn.drobilla.net/lad/ingen@643 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/serialisation')
| -rw-r--r-- | src/libs/serialisation/Loader.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libs/serialisation/Loader.cpp b/src/libs/serialisation/Loader.cpp index ac7141cd..d4c93b03 100644 --- a/src/libs/serialisation/Loader.cpp +++ b/src/libs/serialisation/Loader.cpp @@ -16,6 +16,7 @@ */ #include <iostream> +#include <set> #include <locale.h> #include <glibmm/ustring.h> #include <raul/RDFModel.hpp> @@ -51,7 +52,7 @@ Loader::load(SharedPtr<EngineInterface> engine, // FIXME: this whole thing is a mess - Raul::Table<Path, bool> created; + std::set<Path> created; RDF::Model model(*rdf_world, document_uri); @@ -126,7 +127,7 @@ Loader::load(SharedPtr<EngineInterface> engine, if (created.find(node_path) == created.end()) { engine->create_node(node_path, plugin, false); - created[node_path] = true; + created.insert(node_path); } string floatkey = rdf_world->prefixes().qualify((*i)["floatkey"].to_string()); @@ -156,7 +157,7 @@ Loader::load(SharedPtr<EngineInterface> engine, const Path subpatch_path = patch_path.base() + (string)name; if (created.find(subpatch_path) == created.end()) { - created[subpatch_path] = true; + created.insert(subpatch_path); load(engine, rdf_world, document_uri, patch_path, name, patch); } } @@ -217,7 +218,7 @@ Loader::load(SharedPtr<EngineInterface> engine, //cerr << "TYPE: " << type << endl; bool is_output = (type == "ingen:OutputPort"); // FIXME: check validity engine->create_port(port_path, datatype, is_output); - created[port_path] = true; + created.insert(port_path); } RDF::Node val_node = (*i)["portval"]; |