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/01/04 23:05:53 UTC
svn commit: r492774 - in
/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing: AMQFrame.h
FramingContent.h amqp_types.h
Author: aconway
Date: Thu Jan 4 14:05:53 2007
New Revision: 492774
URL: http://svn.apache.org/viewvc?view=rev&rev=492774
Log:
Fixed compile errors, not all fixed yet:
- Fix error in code generator for decoding timestamps.
- Add dummy op<< for framing::Content
Modified:
incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQFrame.h
incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FramingContent.h
incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/amqp_types.h
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQFrame.h
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQFrame.h?view=diff&rev=492774&r1=492773&r2=492774
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQFrame.h (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQFrame.h Thu Jan 4 14:05:53 2007
@@ -33,37 +33,36 @@
#define _AMQFrame_
namespace qpid {
- namespace framing {
+namespace framing {
- class AMQFrame : virtual public AMQDataBlock
- {
- static AMQP_MethodVersionMap versionMap;
+class AMQFrame : virtual public AMQDataBlock
+{
+ static AMQP_MethodVersionMap versionMap;
- u_int16_t channel;
- u_int8_t type;//used if the body is decoded separately from the 'head'
- AMQBody::shared_ptr body;
- AMQBody::shared_ptr createMethodBody(Buffer& buffer);
+ u_int16_t channel;
+ u_int8_t type;//used if the body is decoded separately from the 'head'
+ AMQBody::shared_ptr body;
+ AMQBody::shared_ptr createMethodBody(Buffer& buffer);
- public:
- AMQFrame();
- AMQFrame(u_int16_t channel, AMQBody* body);
- AMQFrame(u_int16_t channel, AMQBody::shared_ptr& body);
- virtual ~AMQFrame();
- virtual void encode(Buffer& buffer);
- virtual bool decode(Buffer& buffer);
- virtual u_int32_t size() const;
- u_int16_t getChannel();
- AMQBody::shared_ptr& getBody();
+ public:
+ AMQFrame();
+ AMQFrame(u_int16_t channel, AMQBody* body);
+ AMQFrame(u_int16_t channel, AMQBody::shared_ptr& body);
+ virtual ~AMQFrame();
+ virtual void encode(Buffer& buffer);
+ virtual bool decode(Buffer& buffer);
+ virtual u_int32_t size() const;
+ u_int16_t getChannel();
+ AMQBody::shared_ptr& getBody();
- u_int32_t decodeHead(Buffer& buffer);
- void decodeBody(Buffer& buffer, uint32_t size);
+ u_int32_t decodeHead(Buffer& buffer);
+ void decodeBody(Buffer& buffer, uint32_t size);
- friend std::ostream& operator<<(std::ostream& out, const AMQFrame& body);
- };
+ friend std::ostream& operator<<(std::ostream& out, const AMQFrame& body);
+};
- }
-}
+}} // namespace qpid::framing
#endif
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FramingContent.h
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FramingContent.h?view=diff&rev=492774&r1=492773&r2=492774
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FramingContent.h (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/FramingContent.h Thu Jan 4 14:05:53 2007
@@ -38,11 +38,9 @@
void encode(Buffer& buffer) const;
void decode(Buffer& buffer);
size_t size() const;
-};
-
-// TODO aconway 2007-01-04: operator << is undefined, just for compilation.
-std::ostream& operator<<(std::ostream&, const Content&);
+ friend std::ostream& operator<<(std::ostream&, const Content&);
+};
}} // namespace qpid::framing
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/amqp_types.h
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/amqp_types.h?view=diff&rev=492774&r1=492773&r2=492774
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/amqp_types.h (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/amqp_types.h Thu Jan 4 14:05:53 2007
@@ -1,3 +1,5 @@
+#ifndef AMQP_TYPES_H
+#define AMQP_TYPES_H
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -30,16 +32,11 @@
#include "stdint.h"
#endif
-#ifndef AMQP_TYPES_H
-#define AMQP_TYPES_H
-namespace qpid
-{
-namespace framing
-{
+namespace qpid {
+namespace framing {
using std::string;
-}
-}
+}} // namespace qpid::framing
#endif