|author||Boris Kolpackov <firstname.lastname@example.org>||2014-09-18 12:31:05 +0200|
|committer||Boris Kolpackov <email@example.com>||2014-09-18 12:31:05 +0200|
Include member headers for bases in file-per-type mode
Diffstat (limited to 'xsd')
1 files changed, 31 insertions, 0 deletions
diff --git a/xsd/cxx/tree/elements.cxx b/xsd/cxx/tree/elements.cxx
index 202ab62..2119174 100644
@@ -1322,7 +1322,38 @@ namespace CXX
if (t == source && !weak)
+ if (u.user ().context ().count ("type-schema"))
+ // Strong include into a type schema -- this is a base class.
+ // We have already included its header in our header so it
+ // would seem we don't need to do anything here. There is one
+ // subtle issue, however: Our constructors include arguments
+ // for base members which we simply pass to the base. The base
+ // header has only forward declarations for its members. This
+ // is not a problem if we pass references to base members --
+ // forward declarations are sufficient for this case. The
+ // problematic case is when we pass them as auto/unique_ptr.
+ // Because we pass them by value (which is done to support
+ // unique_ptr move semantics), the compiler needs to be able
+ // to destroy the member, presumably if an exception is thrown.
+ // And for that forward declarations are not enough.
+ // So what we are going to do here is include all the base
+ // member headers (transitively), just like the base's source
+ // file does.
+ // Note that we only do this for source since in the inline
+ // case the necessary files are already pulled via the the
+ // .ixx file includes.
+ Traversal::Schema schema;
+ schema >> *this;
+ schema.dispatch (s);
SemanticGraph::Path path (
s.context ().count ("renamed")