Author: kpvdr
Date: Tue Jan 16 05:09:50 2007
New Revision: 496678
URL: http://svn.apache.org/viewvc?view=rev&rev=496678
Log:
Fixed QPID-296 Header guards may not be compliant with C++ standard
Modified:
incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
incubator/qpid/trunk/qpid/gentools/templ.cpp/MethodBodyClass.h.tmpl
Modified:
incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl?view=diff&rev=496678&r1=496677&r2=496678
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
(original)
+++ incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
Tue Jan 16 05:09:50 2007
@@ -26,10 +26,10 @@
%{VLIST} * ${major}-${minor}
*/
+#ifndef qpid_framing_AMQP_ClientOperations__
+#define qpid_framing_AMQP_ClientOperations__
+
#include <sstream>
-
-#ifndef _AMQP_ClientOperations_
-#define _AMQP_ClientOperations_
#include <FieldTable.h>
#include <ProtocolVersion.h>
Modified: incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl?view=diff&rev=496678&r1=496677&r2=496678
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
(original)
+++ incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl Tue
Jan 16 05:09:50 2007
@@ -26,8 +26,8 @@
%{VLIST} * ${major}-${minor}
*/
-#ifndef _AMQP_ClientProxy_
-#define _AMQP_ClientProxy_
+#ifndef qpid_framing_AMQP_ClientProxy__
+#define qpid_framing_AMQP_ClientProxy__
#include <AMQP_ClientOperations.h>
#include <FieldTable.h>
Modified:
incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl?view=diff&rev=496678&r1=496677&r2=496678
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
(original)
+++ incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl Tue
Jan 16 05:09:50 2007
@@ -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>
Modified:
incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl?view=diff&rev=496678&r1=496677&r2=496678
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
(original)
+++ incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
Tue Jan 16 05:09:50 2007
@@ -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>
Modified:
incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl?view=diff&rev=496678&r1=496677&r2=496678
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
(original)
+++ incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
Tue Jan 16 05:09:50 2007
@@ -26,8 +26,8 @@
%{VLIST} * ${major}-${minor}
*/
-#ifndef _AMQP_ServerOperations_
-#define _AMQP_ServerOperations_
+#ifndef qpid_framing_AMQP_ServerOperations__
+#define qpid_framing_AMQP_ServerOperations__
#include <sstream>
Modified: incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl?view=diff&rev=496678&r1=496677&r2=496678
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
(original)
+++ incubator/qpid/trunk/qpid/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl Tue
Jan 16 05:09:50 2007
@@ -26,8 +26,8 @@
%{VLIST} * ${major}-${minor}
*/
-#ifndef _AMQP_ServerProxy_
-#define _AMQP_ServerProxy_
+#ifndef qpid_framing_AMQP_ServerProxy__
+#define qpid_framing_AMQP_ServerProxy__
#include <AMQP_ServerOperations.h>
#include <FieldTable.h>
Modified: incubator/qpid/trunk/qpid/gentools/templ.cpp/MethodBodyClass.h.tmpl
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/templ.cpp/MethodBodyClass.h.tmpl?view=diff&rev=496678&r1=496677&r2=496678
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/templ.cpp/MethodBodyClass.h.tmpl
(original)
+++ incubator/qpid/trunk/qpid/gentools/templ.cpp/MethodBodyClass.h.tmpl Tue Jan
16 05:09:50 2007
@@ -26,6 +26,9 @@
%{VLIST} * ${major}-${minor}
*/
+#ifndef qpid_framing_${CLASS}${METHOD}Body__
+#define qpid_framing_${CLASS}${METHOD}Body__
+
#include <string>
#include <sstream>
@@ -33,9 +36,6 @@
#include <AMQMethodBody.h>
#include <Buffer.h>
#include <FieldTable.h>
-
-#ifndef _${CLASS}${METHOD}Body_
-#define _${CLASS}${METHOD}Body_
namespace qpid
{
