Return-Path: 
 <commits-return-10229-apmail-qpid-commits-archive=qpid.apache.org@qpid.apache.org>
Delivered-To: apmail-qpid-commits-archive@www.apache.org
Received: (qmail 49217 invoked from network); 20 Aug 2009 16:19:03 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 20 Aug 2009 16:19:03 -0000
Received: (qmail 68859 invoked by uid 500); 20 Aug 2009 16:19:22 -0000
Delivered-To: apmail-qpid-commits-archive@qpid.apache.org
Received: (qmail 68845 invoked by uid 500); 20 Aug 2009 16:19:22 -0000
Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@qpid.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@qpid.apache.org>
List-Post: <mailto:commits@qpid.apache.org>
List-Id: <commits.qpid.apache.org>
Reply-To: dev@qpid.apache.org
Delivered-To: mailing list commits@qpid.apache.org
Received: (qmail 68822 invoked by uid 99); 20 Aug 2009 16:19:22 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Aug 2009 16:19:22 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Aug 2009 16:19:19 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 2BA49238888E; Thu, 20 Aug 2009 16:18:58 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
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 -0000
To: commits@qpid.apache.org
From: gsim@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090820161858.2BA49238888E@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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