1 files changed, 5 insertions, 9 deletions
diff --git a/cpp/rubygen/templates/Operations.rb b/cpp/rubygen/templates/Operations.rb
index 1002bf07a4..91007ef3e1 100755
--- a/cpp/rubygen/templates/Operations.rb
+++ b/cpp/rubygen/templates/Operations.rb
@@ -29,9 +29,11 @@ class OperationsGen < CppGen
       handlerclass=handler_classname c
       gen <<EOS
 // ==================== class #{handlerclass} ====================
-class #{handlerclass} : public virtual Invocable {
+class #{handlerclass} {
     // Constructors and destructors
   public:
+    class Invoker;              // Declared in #{@chassis.caps}Invoker
+      
     #{handlerclass}(){};
     virtual ~#{handlerclass}() {}
     // Protocol methods
@@ -64,16 +66,10 @@ namespace framing {
 
 class AMQMethodBody;
 
-class Invocable 
-{
-protected:
-    Invocable() {}        
-    virtual ~Invocable() {}        
-};
-
 class #{@classname} {
-
   public:
+    class Invoker;              // Declared in #{@chassis.caps}Invoker
+
     virtual ~#{@classname}() {}
 
     virtual ProtocolVersion getVersion() const = 0;