Fixed QPID-296 Header guards may not be compliant with C++ standard

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@496678 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 16 insertions, 16 deletions

diff --git a/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl b/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
index e7a9bb1933..a9fb0e0f69 100644
--- a/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
+++ b/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
@@ -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>
diff --git a/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl b/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
index b5b11b4dc9..0653ed7186 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 <AMQP_ClientOperations.h>
 #include <FieldTable.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 6db1ceae0c..c197871d4b 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 b55705b980..e87723667b 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 <sstream>
 
diff --git a/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl b/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
index c0acf6222e..fab29f2c60 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 <AMQP_ServerOperations.h>
 #include <FieldTable.h>
diff --git a/gentools/templ.cpp/MethodBodyClass.h.tmpl b/gentools/templ.cpp/MethodBodyClass.h.tmpl
index 1edd938d3d..5819a9cf9c 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>
 
@@ -34,9 +37,6 @@
 #include <Buffer.h>
 #include <FieldTable.h>
 
-#ifndef _${CLASS}${METHOD}Body_
-#define _${CLASS}${METHOD}Body_
-
 namespace qpid
 {
 namespace framing