removed qualifiers from return values (cause problems on newer compilers)

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@707616 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 3 insertions, 7 deletions

diff --git a/qpid/cpp/src/qpid/framing/Endian.cpp b/qpid/cpp/src/qpid/framing/Endian.cpp
index a2d4566e5e..1948579b88 100644
--- a/qpid/cpp/src/qpid/framing/Endian.cpp
+++ b/qpid/cpp/src/qpid/framing/Endian.cpp
@@ -35,7 +35,7 @@ bool Endian::testBigEndian()
     return a == b;
 }
 
-uint8_t* const Endian::convertIfRequired(uint8_t* const octets, int width)
+uint8_t* Endian::convertIfRequired(uint8_t* const octets, int width)
 {
     if (instance.littleEndian) {
         for (int i = 0; i < (width/2); i++) {
diff --git a/qpid/cpp/src/qpid/framing/Endian.h b/qpid/cpp/src/qpid/framing/Endian.h
index 14d3f9e66d..077d5a3e9b 100644
--- a/qpid/cpp/src/qpid/framing/Endian.h
+++ b/qpid/cpp/src/qpid/framing/Endian.h
@@ -34,7 +34,7 @@ namespace framing {
 class Endian
 {
   public:
-    static uint8_t* const  convertIfRequired(uint8_t* const octets, int width);
+    static uint8_t* convertIfRequired(uint8_t* const octets, int width);
   private:
     const bool littleEndian;
     Endian();
diff --git a/qpid/cpp/src/qpid/framing/FieldValue.h b/qpid/cpp/src/qpid/framing/FieldValue.h
index 18c45f3ff8..68081c5674 100644
--- a/qpid/cpp/src/qpid/framing/FieldValue.h
+++ b/qpid/cpp/src/qpid/framing/FieldValue.h
@@ -162,11 +162,7 @@ class FixedWidthValue : public FieldValue::Data {
         v |= octets[width-1];
         return v;
     }
-    void copyInto(uint8_t* const data) const
-    {
-        for (uint i = 0; i < width; ++i) data[i] = octets[i];
-    }
-    uint8_t* const rawOctets() { return octets; }
+    uint8_t* rawOctets() { return octets; }
 
     void print(std::ostream& o) const { o << "F" << width << ":"; };
 };