diff options
Diffstat (limited to 'gentools/templ.cpp/AMQP_ClientOperations.h.tmpl')
| -rw-r--r-- | gentools/templ.cpp/AMQP_ClientOperations.h.tmpl | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl b/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl index d4edfddd89..5005f353a9 100644 --- a/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl +++ b/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl @@ -26,8 +26,15 @@ %{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" |