Author: gsim
Date: Fri Oct 24 05:39:10 2008
New Revision: 707616
URL: http://svn.apache.org/viewvc?rev=707616&view=rev
Log:
removed qualifiers from return values (cause problems on newer compilers)
Modified:
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Endian.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Endian.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldValue.h
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Endian.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Endian.cpp?rev=707616&r1=707615&r2=707616&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Endian.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Endian.cpp Fri Oct 24
05:39:10 2008
@@ -35,7 +35,7 @@
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++) {
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Endian.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Endian.h?rev=707616&r1=707615&r2=707616&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Endian.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Endian.h Fri Oct 24 05:39:10
2008
@@ -34,7 +34,7 @@
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();
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldValue.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldValue.h?rev=707616&r1=707615&r2=707616&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldValue.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FieldValue.h Fri Oct 24
05:39:10 2008
@@ -162,11 +162,7 @@
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 << ":"; };
};