diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2010-03-29 16:36:27 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2010-03-29 16:36:27 +0200 |
| commit | 71e026399d644c3e46aff5cab5e92c8ac56f0c79 (patch) | |
| tree | b4f14df6b530ff86cd8acb23f2d04c4d6d18e41f /xsde | |
| parent | c964e1d8c0ff4e645691386ff92b41440223649b (diff) | |
Only override _pre if we are using mixin reuse
Diffstat (limited to 'xsde')
| -rw-r--r-- | xsde/cxx/hybrid/parser-header.cxx | 2 | ||||
| -rw-r--r-- | xsde/cxx/hybrid/parser-source.cxx | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/xsde/cxx/hybrid/parser-header.cxx b/xsde/cxx/hybrid/parser-header.cxx index a09375a..65f7024 100644 --- a/xsde/cxx/hybrid/parser-header.cxx +++ b/xsde/cxx/hybrid/parser-header.cxx @@ -120,7 +120,7 @@ namespace CXX // _pre // - if (!base_enum) + if (mixin && !base_enum) os << "virtual void" << endl << "_pre ();" << endl; diff --git a/xsde/cxx/hybrid/parser-source.cxx b/xsde/cxx/hybrid/parser-source.cxx index 7d8c434..c13cbd2 100644 --- a/xsde/cxx/hybrid/parser-source.cxx +++ b/xsde/cxx/hybrid/parser-source.cxx @@ -286,12 +286,13 @@ namespace CXX { // _pre // - os << "void " << name << "::" << endl - << "_pre ()" - << "{" - // Override it to cut off our base. - // - << "}"; + if (mixin) + os << "void " << name << "::" << endl + << "_pre ()" + << "{" + // Override it to cut off our base. + // + << "}"; // _characters // |