From 71e026399d644c3e46aff5cab5e92c8ac56f0c79 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 29 Mar 2010 16:36:27 +0200
Subject: Only override _pre if we are using mixin reuse

---
 xsde/cxx/hybrid/parser-header.cxx |  2 +-
 xsde/cxx/hybrid/parser-source.cxx | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'xsde/cxx/hybrid')

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
             //
-- 
cgit v1.1