Updates and bugfixes

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

1 files changed, 24 insertions, 21 deletions

diff --git a/qpid/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl b/qpid/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
index 65f42f54e6..3bf043c51d 100644
--- a/qpid/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
+++ b/qpid/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
@@ -1,24 +1,24 @@
 &{AMQP_ServerProxy.cpp}
-/**
-*
-* 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.
@@ -27,7 +27,10 @@
  */
 
 #include <sstream>
-#include "AMQP_ServerProxy.h"
+
+#include <qpid/framing/AMQP_ServerProxy.h>
+#include <qpid/framing/AMQFrame.h>
+%{MLIST} ${spc_method_body_include}
 
 namespace qpid {
 namespace framing {