diff options
| author | Alan Conway <aconway@apache.org> | 2006-10-11 15:50:15 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2006-10-11 15:50:15 +0000 |
| commit | 2bcadbb42a6fb2f096c1fc0a4b957d64a5024ef6 (patch) | |
| tree | 886eb0659c6f28c2f1d26de7d5fd29fff0072dc5 /cpp/common/framing/generated | |
| parent | 9fc2b6c5f0848d65f1bf20e62279c055d12a1d40 (diff) | |
| download | qpid-python-2bcadbb42a6fb2f096c1fc0a4b957d64a5024ef6.tar.gz | |
Turned up gcc warnings, fixed warnings in code, enabled -Werror.
Note: #include "qpid_test_plugin.h" instead of <cppunit/TestPlugin.h>
Works around warning from a cppunit macro.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@462834 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/common/framing/generated')
4 files changed, 9 insertions, 12 deletions
diff --git a/cpp/common/framing/generated/stylesheets/amqp_client_handler_impl.xsl b/cpp/common/framing/generated/stylesheets/amqp_client_handler_impl.xsl index aa095eaf79..0cc34e0ecf 100644 --- a/cpp/common/framing/generated/stylesheets/amqp_client_handler_impl.xsl +++ b/cpp/common/framing/generated/stylesheets/amqp_client_handler_impl.xsl @@ -7,7 +7,7 @@ =============================== Template: client_handler_impl_h =============================== - Template to generate the AMQP_ServerHandlerImpl class header file. + Template to generate the AMQP_ClientHandlerImpl class header file. --> <xsl:template match="amqp" mode="client_handler_impl_h"> <xsl:param name="domain-cpp-table"/> @@ -122,7 +122,7 @@ class AMQP_ClientHandlerImpl : virtual public AMQP_ClientOperations ================================= Template: client_handler_impl_cpp ================================= - Template to generate the AMQP_ServerHandlerImpl class stubs. + Template to generate the AMQP_ClientHandlerImpl class stubs. --> <xsl:template match="amqp" mode="client_handler_impl_cpp"> <xsl:param name="domain-cpp-table"/> @@ -163,12 +163,12 @@ AMQP_ClientHandlerImpl::~AMQP_ClientHandlerImpl() <xsl:for-each select="method"> <xsl:if test="chassis[@name='client']"> <xsl:text>void AMQP_ClientHandlerImpl::</xsl:text><xsl:value-of select="$class"/><xsl:text>HandlerImpl::</xsl:text> - <xsl:value-of select="amqp:cpp-name(@name)"/><xsl:text>( u_int16_t channel</xsl:text> + <xsl:value-of select="amqp:cpp-name(@name)"/><xsl:text>( u_int16_t /*channel*/</xsl:text> <xsl:if test="field"> <xsl:text>,
 </xsl:text> <xsl:for-each select="field"> <xsl:variable name="domain-cpp-type" select="amqp:cpp-lookup(@domain, $domain-cpp-table)"/> - <xsl:value-of select="concat($domain-cpp-type, amqp:cpp-arg-ref($domain-cpp-type), ' ', amqp:cpp-name(@name))"/> + <xsl:value-of select="concat($domain-cpp-type, amqp:cpp-arg-ref($domain-cpp-type), ' /*', amqp:cpp-name(@name), '*/')"/> <xsl:if test="position()!=last()"> <xsl:text>,
 </xsl:text> </xsl:if> diff --git a/cpp/common/framing/generated/stylesheets/amqp_server_handler_impl.xsl b/cpp/common/framing/generated/stylesheets/amqp_server_handler_impl.xsl index de879a5670..6450d3fd0c 100644 --- a/cpp/common/framing/generated/stylesheets/amqp_server_handler_impl.xsl +++ b/cpp/common/framing/generated/stylesheets/amqp_server_handler_impl.xsl @@ -163,12 +163,12 @@ AMQP_ServerHandlerImpl::~AMQP_ServerHandlerImpl() <xsl:for-each select="method"> <xsl:if test="chassis[@name='server']"> <xsl:text>void AMQP_ServerHandlerImpl::</xsl:text><xsl:value-of select="$class"/><xsl:text>HandlerImpl::</xsl:text> - <xsl:value-of select="amqp:cpp-name(@name)"/><xsl:text>( u_int16_t channel</xsl:text> + <xsl:value-of select="amqp:cpp-name(@name)"/><xsl:text>( u_int16_t /*channel*/</xsl:text> <xsl:if test="field"> <xsl:text>,
 </xsl:text> <xsl:for-each select="field"> <xsl:variable name="domain-cpp-type" select="amqp:cpp-lookup(@domain, $domain-cpp-table)"/> - <xsl:value-of select="concat($domain-cpp-type, amqp:cpp-arg-ref($domain-cpp-type), ' ', amqp:cpp-name(@name))"/> + <xsl:value-of select="concat($domain-cpp-type, amqp:cpp-arg-ref($domain-cpp-type), ' /*', amqp:cpp-name(@name), '*/')"/> <xsl:if test="position()!=last()"> <xsl:text>,
 </xsl:text> </xsl:if> diff --git a/cpp/common/framing/generated/stylesheets/amqp_server_operations.xsl b/cpp/common/framing/generated/stylesheets/amqp_server_operations.xsl index b42242e8fe..4b97700f04 100644 --- a/cpp/common/framing/generated/stylesheets/amqp_server_operations.xsl +++ b/cpp/common/framing/generated/stylesheets/amqp_server_operations.xsl @@ -66,7 +66,7 @@ class AMQP_ServerOperations <xsl:value-of select="amqp:process-docs(doc)"/> <xsl:text>*/
</xsl:text> </xsl:if> - <xsl:for-each select="rule">/** + <xsl:for-each select="rule"> <xsl:text>
/**
</xsl:text> <xsl:text>Rule "</xsl:text><xsl:value-of select="@name"/><xsl:text>":
</xsl:text> <xsl:value-of select="amqp:process-docs(doc)"/> diff --git a/cpp/common/framing/generated/stylesheets/cpp.xsl b/cpp/common/framing/generated/stylesheets/cpp.xsl index ae66f65745..f9e5ba4141 100644 --- a/cpp/common/framing/generated/stylesheets/cpp.xsl +++ b/cpp/common/framing/generated/stylesheets/cpp.xsl @@ -122,7 +122,7 @@ public: } </xsl:if> - inline void encodeContent(Buffer& buffer) const + inline void encodeContent(Buffer& <xsl:if test="$f/field">buffer</xsl:if>) const { <xsl:if test="$f/field[@type='bit']"> u_int8_t flags = 0; @@ -140,11 +140,8 @@ public: </xsl:for-each> } - inline void decodeContent(Buffer& buffer) + inline void decodeContent(Buffer& <xsl:if test="$f/field">buffer</xsl:if>) { - <xsl:if test="$f/field[@type='bit']"> - u_int8_t maxbit = <xsl:value-of select="$f/@bit-field-count"/>; - </xsl:if> <xsl:for-each select="$f/field"> <xsl:choose> <xsl:when test="@type = 'bit' and @boolean-index = 1"> |