diff options
| author | Deepak Kodihalli <dkodihal@in.ibm.com> | 2017-03-03 00:02:09 -0600 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-03-09 21:59:26 +0000 |
| commit | 5221e1b6a0d3200991b0aee446c6dc90656a57b2 (patch) | |
| tree | 7da48a3b5d8609ed9e1ee03b150cdec3d1358002 /tools | |
| parent | 7924b17e81031bceef11ce08db1b5a684ac1d520 (diff) | |
| download | phosphor-logging-5221e1b6a0d3200991b0aee446c6dc90656a57b2.tar.gz phosphor-logging-5221e1b6a0d3200991b0aee446c6dc90656a57b2.zip | |
Match error full name and namespace
Remove the addition of the extra "namespace Error" while generating
error full names, as the error full name doesn't have the extra "Error".
This extra namespace addition was being done to match up sdbusplus error
binding generation, but this will have to be re-looked at.
Change-Id: Ib99ce8e3a09dd76a23b8cc6fe7e706551a1699d6
Signed-off-by: Deepak Kodihalli <dkodihal@in.ibm.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/phosphor-logging/templates/elog-gen-template.mako.hpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tools/phosphor-logging/templates/elog-gen-template.mako.hpp b/tools/phosphor-logging/templates/elog-gen-template.mako.hpp index e321e6b..9728d44 100644 --- a/tools/phosphor-logging/templates/elog-gen-template.mako.hpp +++ b/tools/phosphor-logging/templates/elog-gen-template.mako.hpp @@ -28,8 +28,6 @@ namespace logging namespace ${s} { % endfor -namespace Error -{ namespace _${classname} { <% @@ -63,7 +61,7 @@ struct ${b} parent_name = tmpparent[-1] ## namespaces are all the name items except the last one parent_namespace = '::'.join(tmpparent[:-1]) - parent_meta += [parent_namespace + "::Error::" + parent_name + "::" + + parent_meta += [parent_namespace + "::" + parent_name + "::" + p for p in meta[parent]] parent_meta_short = ', '.join(meta[parent]) if(meta_string): @@ -86,7 +84,6 @@ struct ${classname} using metadata_types = std::tuple<${meta_string}>; }; -} // namespace Error % for s in reversed(namespaces): } // namespace ${s} % endfor |
