Author: aconway
Date: Tue Mar 13 13:28:37 2007
New Revision: 517855
URL: http://svn.apache.org/viewvc?view=rev&rev=517855
Log:
Merged revisions 496678 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid
........
r496678 | kpvdr | 2007-01-16 08:09:50 -0500 (Tue, 16 Jan 2007) | 1 line
Fixed QPID-296 Header guards may not be compliant with C++ standard
........
Modified:
incubator/qpid/branches/qpid.0-9/ (props changed)
incubator/qpid/branches/qpid.0-9/cpp/lib/common/sys/apr/LFSessionContext.cpp
incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/MethodBodyClass.h.tmpl
Propchange: incubator/qpid/branches/qpid.0-9/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Mar 13 13:28:37 2007
@@ -1 +1 @@
-/incubator/qpid/trunk/qpid:1-492620,492636,492641,492756,493126-493151,494540,494553,494587,495629,495661,496317,496665
+/incubator/qpid/trunk/qpid:1-492620,492636,492641,492756,493126-493151,494540,494553,494587,495629,495661,496317,496665,496678
Modified:
incubator/qpid/branches/qpid.0-9/cpp/lib/common/sys/apr/LFSessionContext.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/sys/apr/LFSessionContext.cpp?view=diff&rev=517855&r1=517854&r2=517855
==============================================================================
---
incubator/qpid/branches/qpid.0-9/cpp/lib/common/sys/apr/LFSessionContext.cpp
(original)
+++
incubator/qpid/branches/qpid.0-9/cpp/lib/common/sys/apr/LFSessionContext.cpp
Tue Mar 13 13:28:37 2007
@@ -65,7 +65,7 @@
}
}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{
Modified:
incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl?view=diff&rev=517855&r1=517854&r2=517855
==============================================================================
---
incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
(original)
+++
incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
Tue Mar 13 13:28:37 2007
@@ -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"
Modified:
incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl?view=diff&rev=517855&r1=517854&r2=517855
==============================================================================
--- incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
(original)
+++ incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
Tue Mar 13 13:28:37 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 "framing/Proxy.h"
Modified:
incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl?view=diff&rev=517855&r1=517854&r2=517855
==============================================================================
---
incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
(original)
+++
incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
Tue Mar 13 13:28:37 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/branches/qpid.0-9/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl?view=diff&rev=517855&r1=517854&r2=517855
==============================================================================
---
incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
(original)
+++
incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
Tue Mar 13 13:28:37 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/branches/qpid.0-9/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl?view=diff&rev=517855&r1=517854&r2=517855
==============================================================================
---
incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
(original)
+++
incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
Tue Mar 13 13:28:37 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 "ProtocolVersion.h"
Modified:
incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl?view=diff&rev=517855&r1=517854&r2=517855
==============================================================================
--- incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
(original)
+++ incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
Tue Mar 13 13:28:37 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 "framing/Proxy.h"
Modified:
incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/MethodBodyClass.h.tmpl
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/MethodBodyClass.h.tmpl?view=diff&rev=517855&r1=517854&r2=517855
==============================================================================
--- incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/MethodBodyClass.h.tmpl
(original)
+++ incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/MethodBodyClass.h.tmpl
Tue Mar 13 13:28:37 2007
@@ -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>
#include <FramingContent.h>
-
-#ifndef _${CLASS}${METHOD}Body_
-#define _${CLASS}${METHOD}Body_
namespace qpid
{
