summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim van der Riet <kpvdr@apache.org>2006-12-19 20:32:54 +0000
committerKim van der Riet <kpvdr@apache.org>2006-12-19 20:32:54 +0000
commitb16ddc61231e2dc035adbde7d0c5298a45743992 (patch)
tree329bbe04c26a2a37898e4749630f391fb07b19d0
parentb13a325c1cd6688e53ea586b7aa1ff31f25a14e3 (diff)
downloadqpid-python-b16ddc61231e2dc035adbde7d0c5298a45743992.tar.gz
[For Andrew Stitcher] Made the generator generate non-virtual inheritance; it doesn't create a noticeable speed up in itself, but it's not needed where it's used.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@488801 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl2
-rw-r--r--qpid/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl2
-rw-r--r--qpid/gentools/templ.cpp/MethodBodyClass.h.tmpl2
3 files changed, 3 insertions, 3 deletions
diff --git a/qpid/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl b/qpid/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
index 62df7baf18..6773fab5c6 100644
--- a/qpid/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
+++ b/qpid/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
@@ -36,7 +36,7 @@
namespace qpid {
namespace framing {
-class AMQP_ClientProxy : virtual public AMQP_ClientOperations
+class AMQP_ClientProxy : public AMQP_ClientOperations
{
private:
OutputHandler* out;
diff --git a/qpid/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl b/qpid/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
index 9275c64590..5f808982fa 100644
--- a/qpid/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
+++ b/qpid/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
@@ -36,7 +36,7 @@
namespace qpid {
namespace framing {
-class AMQP_ServerProxy : virtual public AMQP_ServerOperations
+class AMQP_ServerProxy : public AMQP_ServerOperations
{
private:
OutputHandler* out;
diff --git a/qpid/gentools/templ.cpp/MethodBodyClass.h.tmpl b/qpid/gentools/templ.cpp/MethodBodyClass.h.tmpl
index be9fb82e31..50c8feebac 100644
--- a/qpid/gentools/templ.cpp/MethodBodyClass.h.tmpl
+++ b/qpid/gentools/templ.cpp/MethodBodyClass.h.tmpl
@@ -43,7 +43,7 @@ namespace framing
{
${version_namespace_start}
-class ${CLASS}${METHOD}Body : virtual public AMQMethodBody
+class ${CLASS}${METHOD}Body : public AMQMethodBody
{
// Method field declarations