You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2007/03/13 22:23:21 UTC
svn commit: r517878 - in /incubator/qpid/branches/qpid.0-9: ./
cpp/lib/common/framing/Value.cpp cpp/lib/common/framing/Value.h
gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
Author: aconway
Date: Tue Mar 13 14:23:20 2007
New Revision: 517878
URL: http://svn.apache.org/viewvc?view=rev&rev=517878
Log:
Merged revisions 497439 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid
........
r497439 | gsim | 2007-01-18 09:14:54 -0500 (Thu, 18 Jan 2007) | 3 lines
Added the non-standard 'binary' type to the field table implementation to support the java client.
........
Modified:
incubator/qpid/branches/qpid.0-9/ (props changed)
incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Value.cpp
incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Value.h
incubator/qpid/branches/qpid.0-9/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
Propchange: incubator/qpid/branches/qpid.0-9/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Mar 13 14:23:20 2007
@@ -1 +1 @@
-/incubator/qpid/trunk/qpid:1-492620,492636,492641,492756,493126-493151,494540,494553,494587,495629,495661,496317,496665,496678,497341
+/incubator/qpid/trunk/qpid:1-492620,492636,492641,492756,493126-493151,494540,494553,494587,495629,495661,496317,496665,496678,497341,497439
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Value.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Value.cpp?view=diff&rev=517878&r1=517877&r2=517878
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Value.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Value.cpp Tue Mar 13 14:23:20 2007
@@ -85,6 +85,11 @@
case 'F':
value.reset(new FieldTableValue());
break;
+
+ //non-standard types, introduced in java client for JMS compliance
+ case 'x':
+ value.reset(new BinaryValue());
+ break;
default:
std::stringstream out;
out << "Unknown field table value type: " << type;
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Value.h
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Value.h?view=diff&rev=517878&r1=517877&r2=517878
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Value.h (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/Value.h Tue Mar 13 14:23:20 2007
@@ -158,6 +158,14 @@
virtual void print(std::ostream& out) const;
};
+//non-standard types, introduced in java client for JMS compliance
+class BinaryValue : public StringValue {
+ public:
+ BinaryValue(const std::string& v) : StringValue(v) {}
+ BinaryValue() {}
+ virtual char getType() const { return 'x'; }
+};
+
}} // qpid::framing
#endif
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=517878&r1=517877&r2=517878
==============================================================================
--- 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 14:23:20 2007
@@ -26,15 +26,10 @@
%{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"