qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject svn commit: r806237 - in /qpid/trunk/qpid/cpp: include/qpid/framing/FieldValue.h src/qpid/framing/FieldValue.cpp
Date Thu, 20 Aug 2009 16:18:58 GMT
Author: gsim
Date: Thu Aug 20 16:18:57 2009
New Revision: 806237

URL: http://svn.apache.org/viewvc?rev=806237&view=rev
Log:
Fixed distcheck target, broken by my last commit.


Modified:
    qpid/trunk/qpid/cpp/include/qpid/framing/FieldValue.h
    qpid/trunk/qpid/cpp/src/qpid/framing/FieldValue.cpp

Modified: qpid/trunk/qpid/cpp/include/qpid/framing/FieldValue.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/framing/FieldValue.h?rev=806237&r1=806236&r2=806237&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/framing/FieldValue.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/framing/FieldValue.h Thu Aug 20 16:18:57 2009
@@ -24,7 +24,6 @@
 #include "qpid/Exception.h"
 #include "qpid/framing/amqp_types.h"
 #include "qpid/framing/Buffer.h"
-#include "qpid/framing/Endian.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/CommonImportExport.h"
 
@@ -105,6 +104,8 @@
   protected:
     FieldValue(uint8_t t, Data* d): typeOctet(t), data(d) {}
 
+    static uint8_t* convertIfRequired(uint8_t* const octets, int width);
+
   private:
     uint8_t typeOctet;
     std::auto_ptr<Data> data;
@@ -199,7 +200,7 @@
     FixedWidthValue<W>* const fwv = dynamic_cast< FixedWidthValue<W>* const>(data.get());
     if (fwv) {
         T value;
-        uint8_t* const octets = Endian::convertIfRequired(fwv->rawOctets(), W);
+        uint8_t* const octets = convertIfRequired(fwv->rawOctets(), W);
         uint8_t* const target = reinterpret_cast<uint8_t*>(&value);
         for (uint i = 0; i < W; ++i) target[i] = octets[i];
         return value;

Modified: qpid/trunk/qpid/cpp/src/qpid/framing/FieldValue.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/framing/FieldValue.cpp?rev=806237&r1=806236&r2=806237&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/framing/FieldValue.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/framing/FieldValue.cpp Thu Aug 20 16:18:57 2009
@@ -207,4 +207,9 @@
     out << ')';
 }
 
+uint8_t* FieldValue::convertIfRequired(uint8_t* const octets, int width)
+{
+    return Endian::convertIfRequired(octets, width);
+}
+
 }}



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message