diff options
-rw-r--r-- | cpp/lib/common/sys/apr/LFSessionContext.cpp | 2 | ||||
-rw-r--r-- | gentools/templ.cpp/AMQP_ClientOperations.h.tmpl | 7 | ||||
-rw-r--r-- | gentools/templ.cpp/AMQP_ClientProxy.h.tmpl | 4 | ||||
-rw-r--r-- | gentools/templ.cpp/AMQP_HighestVersion.h.tmpl | 4 | ||||
-rw-r--r-- | gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl | 4 | ||||
-rw-r--r-- | gentools/templ.cpp/AMQP_ServerOperations.h.tmpl | 4 | ||||
-rw-r--r-- | gentools/templ.cpp/AMQP_ServerProxy.h.tmpl | 4 | ||||
-rw-r--r-- | gentools/templ.cpp/MethodBodyClass.h.tmpl | 6 |
8 files changed, 21 insertions, 14 deletions
diff --git a/cpp/lib/common/sys/apr/LFSessionContext.cpp b/cpp/lib/common/sys/apr/LFSessionContext.cpp index ff7a0107b6..e0c415a12f 100644 --- a/cpp/lib/common/sys/apr/LFSessionContext.cpp +++ b/cpp/lib/common/sys/apr/LFSessionContext.cpp @@ -65,7 +65,7 @@ void LFSessionContext::read(){ } }catch(QpidError error){ std::cout << "Error [" << error.code << "] " << error.msg - << " (" << error.location.file << ":" << error.location.line + << " (" << error.loc.file << ":" << error.loc.line << ")" << std::endl; } }else{ 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" diff --git a/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl b/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl index 4b3932d309..b43b3a6747 100644 --- a/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl +++ b/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl @@ -26,8 +26,8 @@ %{VLIST} * ${major}-${minor} */ -#ifndef _AMQP_ClientProxy_ -#define _AMQP_ClientProxy_ +#ifndef qpid_framing_AMQP_ClientProxy__ +#define qpid_framing_AMQP_ClientProxy__ #include "framing/Proxy.h" diff --git a/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl b/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl index 96ee9416b0..9753b454ba 100644 --- a/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl +++ b/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl @@ -25,8 +25,8 @@ * Supported AMQP versions: %{VLIST} * ${major}-${minor} */ -#ifndef _AMQP_HighestVersion_ -#define _AMQP_HighestVersion_ +#ifndef qpid_framing_highestProtocolVersion__ +#define qpid_framing_highestProtocolVersion__ #include <ProtocolVersion.h> diff --git a/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl b/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl index 3baebdf618..84596ea5a0 100644 --- a/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl +++ b/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl @@ -26,8 +26,8 @@ %{VLIST} * ${major}-${minor} */ -#ifndef _METHOD_VERSION_MAP_H_ -#define _METHOD_VERSION_MAP_H_ +#ifndef qpid_framing_AMQP_MethodVersionMap__ +#define qpid_framing_AMQP_MethodVersionMap__ #include <map> #include <AMQMethodBody.h> diff --git a/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl b/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl index aca065c757..7f47ac8efb 100644 --- a/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl +++ b/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl @@ -26,8 +26,8 @@ %{VLIST} * ${major}-${minor} */ -#ifndef _AMQP_ServerOperations_ -#define _AMQP_ServerOperations_ +#ifndef qpid_framing_AMQP_ServerOperations__ +#define qpid_framing_AMQP_ServerOperations__ #include "ProtocolVersion.h" diff --git a/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl b/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl index 69638e325c..5b8a12ee34 100644 --- a/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl +++ b/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl @@ -26,8 +26,8 @@ %{VLIST} * ${major}-${minor} */ -#ifndef _AMQP_ServerProxy_ -#define _AMQP_ServerProxy_ +#ifndef qpid_framing_AMQP_ServerProxy__ +#define qpid_framing_AMQP_ServerProxy__ #include "framing/Proxy.h" diff --git a/gentools/templ.cpp/MethodBodyClass.h.tmpl b/gentools/templ.cpp/MethodBodyClass.h.tmpl index 2031f8e346..351399a991 100644 --- a/gentools/templ.cpp/MethodBodyClass.h.tmpl +++ b/gentools/templ.cpp/MethodBodyClass.h.tmpl @@ -26,6 +26,9 @@ %{VLIST} * ${major}-${minor} */ +#ifndef qpid_framing_${CLASS}${METHOD}Body__ +#define qpid_framing_${CLASS}${METHOD}Body__ + #include <string> #include <sstream> @@ -35,9 +38,6 @@ #include <FieldTable.h> #include <FramingContent.h> -#ifndef _${CLASS}${METHOD}Body_ -#define _${CLASS}${METHOD}Body_ - namespace qpid { namespace framing |