Updates and bugfixes

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@477844 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 37 insertions, 32 deletions

diff --git a/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl b/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
index 4caa53fb3f..48e2468674 100644
--- a/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
+++ b/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
@@ -1,24 +1,24 @@
 &{AMQP_ClientProxy.h}
-/**
-*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements.  See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership.  The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License.  You may obtain a copy of the License at
-* 
-*   http://www.apache.org/licenses/LICENSE-2.0
-* 
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied.  See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*
-*/
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
 
 /*
  * This file is auto-generated by ${GENERATOR} - do not modify.
@@ -29,9 +29,9 @@
 #ifndef _AMQP_ClientProxy_
 #define _AMQP_ClientProxy_
 
-#include "AMQP_ClientOperations.h"
-#include "qpid/framing/FieldTable.h"
-#include "qpid/framing/OutputHandler.h"
+#include <qpid/framing/AMQP_ClientOperations.h>
+#include <qpid/framing/FieldTable.h>
+#include <qpid/framing/OutputHandler.h>
 
 namespace qpid {
 namespace framing {
@@ -40,24 +40,29 @@ class AMQP_ClientProxy : virtual public AMQP_ClientOperations
 {
 private:
     OutputHandler* out;
-    u_int8_t major;
-    u_int8_t minor;
-
-	// Inner class instances
-	
-%{CLIST} ${cph_inner_class_instance}
+%{CLIST} ${cph_handler_pointer_defn}
 
 public:
     AMQP_ClientProxy(OutputHandler* out, u_int8_t major, u_int8_t minor);
     virtual ~AMQP_ClientProxy() {}
 
-	// Inner class instance get methods
-	
-%{CLIST} ${cph_inner_class_get_method}
+	// Get methods for handlers
+
+%{CLIST} ${cph_handler_pointer_get_method}
 
 	// Inner class definitions
 
 %{CLIST} ${cph_inner_class_defn}
+
+private:
+	// Inner class instances
+	
+%{CLIST} ${cph_inner_class_instance}
+
+public:
+	// Inner class instance get methods
+	
+%{CLIST} ${cph_inner_class_get_method}
     
 }; /* class AMQP_ClientProxy */