diff options
| author | Alan Conway <aconway@apache.org> | 2007-03-13 21:23:20 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-03-13 21:23:20 +0000 |
| commit | 63226e024b8ff81f250636855623bf70cd2f3338 (patch) | |
| tree | 98a819e5e0430e8eaff520fbb85ded8c6abd9d69 /gentools/templ.cpp | |
| parent | 18266b9714d209bdd4088c3400212c29d42f1068 (diff) | |
| download | qpid-python-63226e024b8ff81f250636855623bf70cd2f3338.tar.gz | |
Merged revisions 497439 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid
........
r497439 | gsim | 2007-01-18 09:14:54 -0500 (Thu, 18 Jan 2007) | 3 lines
Added the non-standard 'binary' type to the field table implementation to support the java client.
........
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@517878 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'gentools/templ.cpp')
| -rw-r--r-- | gentools/templ.cpp/AMQP_ClientOperations.h.tmpl | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl b/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl index 5005f353a9..2b96e55444 100644 --- a/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl +++ b/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl @@ -26,15 +26,10 @@ %{VLIST} * ${major}-${minor} */ -<<<<<<< .working -#ifndef _AMQP_ClientOperations_ -#define _AMQP_ClientOperations_ -======= #ifndef qpid_framing_AMQP_ClientOperations__ #define qpid_framing_AMQP_ClientOperations__ #include <sstream> ->>>>>>> .merge-right.r496678 #include "ProtocolVersion.h" |