From 9e0598fb74533923da50b4e31996ea128fb45dde Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Thu, 19 Dec 2019 16:13:25 -0800 Subject: [PATCH] minor --- src/pvxs/data.h | 4 ++-- src/type.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pvxs/data.h b/src/pvxs/data.h index 8aab519..4aab8ed 100644 --- a/src/pvxs/data.h +++ b/src/pvxs/data.h @@ -177,8 +177,8 @@ struct Member { //! Member for non-Compund //! @pre code.kind()!=Kind::Compound inline - Member(TypeCode code, const std::string& name, const std::string& id = std::string()) - :Member(code, name, id, {}) + Member(TypeCode code, const std::string& name) + :Member(code, name, {}) {} //! Compound member with type ID PVXS_API diff --git a/src/type.cpp b/src/type.cpp index 10c1cf1..2ea02c6 100644 --- a/src/type.cpp +++ b/src/type.cpp @@ -146,7 +146,8 @@ void copy_tree(const FieldDesc* desc, Member& node) node.children.reserve(desc->miter.size()); for(auto& pair : desc->miter) { auto cdesc = desc+pair.second; - node.children.emplace_back(cdesc->code, cdesc->id, pair.first); + node.children.emplace_back(cdesc->code, pair.first); + node.children.back().id = cdesc->id; copy_tree(cdesc, node.children.back()); } }