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, 34 insertions, 29 deletions

diff --git a/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl b/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
index eeed9eae5b..4a92c9c422 100644
--- a/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
+++ b/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
@@ -1,43 +1,48 @@
 &{AMQP_ClientOperations.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.
  * Supported AMQP versions:
 %{VLIST} *   ${major}-${minor}
  */
+
+#include <sstream>
  
 #ifndef _AMQP_ClientOperations_
 #define _AMQP_ClientOperations_
 
-#include "qpid/framing/FieldTable.h"
+#include <qpid/framing/FieldTable.h>
+#include <qpid/framing/ProtocolVersion.h>
+#include <qpid/framing/ProtocolVersionException.h>
 
 namespace qpid {
 namespace framing {
 
 class AMQP_ClientOperations
 {
-private:
+protected:
     ProtocolVersion version;
+	AMQP_ClientOperations() {}
 
 public:
     AMQP_ClientOperations(u_int8_t major, u_int8_t minor) : version(major, minor) {}
@@ -47,25 +52,25 @@ public:
     inline u_int8_t getMajor() const { return version.getMajor(); }
     inline u_int8_t getMinor() const { return version.getMinor(); }
     inline const ProtocolVersion& getVersion() const { return version; }
-    inline isVersion(u_int8_t _major, u_int8_t _minor) const
+    inline bool isVersion(u_int8_t _major, u_int8_t _minor) const
     {
         return version.equals(_major, _minor);
     }
-    inline isVersion(ProtocolVersion& _version) const
+    inline bool isVersion(ProtocolVersion& _version) const
     {
         return version.equals(_version);
     }
 
 	// Include framing constant declarations
-	#include "AMQP_Constants.h"
+	#include <qpid/framing/AMQP_Constants.h>
 	
-    // Method handler get methods
-
-%{CLIST} ${coh_method_handler_get_method}
-
     // Inner classes
 
 %{CLIST} ${coh_inner_class}
+	
+    // Method handler get methods
+
+%{CLIST} ${coh_method_handler_get_method}
 
 }; /* class AMQP_ClientOperations */