summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
d2fe9e8)
Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
+// Will throw if parsing fails
struct result<layouts_type> load_layout(char const *filename) {
DB("loading layout from " << filename);
struct result<layouts_type> load_layout(char const *filename) {
DB("loading layout from " << filename);
}
struct result<layer_map>
}
struct result<layer_map>
- load_layer_ids(char const *filename) {
+ load_layer_map(char const *filename) {
DB("loading IDs from " << filename);
auto j = file_to_json(filename);
DB("loading IDs from " << filename);
auto j = file_to_json(filename);
- auto l = load_layer_ids("../ids.json");
+ auto l = load_layer_map("../ids.json");
if (l.is_ok()) {
this->layers = l.unwrap();
} else {
if (l.is_ok()) {
this->layers = l.unwrap();
} else {