Author: aconway
Date: Wed Apr 2 17:57:44 2008
New Revision: 644125
URL: http://svn.apache.org/viewvc?rev=644125&view=rev
Log:
Fix serialize test failure on 64 bit architerctures.
Modified:
incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Map.h
incubator/qpid/trunk/qpid/cpp/src/tests/amqp_0_10/Map.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/python_tests
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Map.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Map.h?rev=644125&r1=644124&r2=644125&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Map.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Map.h Wed Apr 2 17:57:44
2008
@@ -157,7 +157,7 @@
}
template <class S> void Map::encode(S& s) const {
- s(contentSize())(size()); // size, count
+ s(contentSize())(uint32_t(size())); // size, count
for (const_iterator i = begin(); i != end(); ++i)
s(i->first)(i->second); // key (type value)
}
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/amqp_0_10/Map.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/amqp_0_10/Map.cpp?rev=644125&r1=644124&r2=644125&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/amqp_0_10/Map.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/amqp_0_10/Map.cpp Wed Apr 2
17:57:44 2008
@@ -88,6 +88,7 @@
map["A"] = true;
map["b"] = Str8("hello");
Codec::encode(back_inserter(data))(map);
+ BOOST_CHECK_EQUAL(Codec::size(map), data.size());
Map map2;
Codec::decode(data.begin())(map2);
BOOST_CHECK_EQUAL(map.size(), 2u);
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/python_tests
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/python_tests?rev=644125&r1=644124&r2=644125&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/python_tests (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/python_tests Wed Apr 2 17:57:44
2008
@@ -1,7 +1,7 @@
#!/bin/sh
# Run the python tests.
if test -d ../../../python ; then
- cd ../../../python && ./run-tests -v -s ../specs/amqp.0-10-preview.xml -I
cpp_failing_0-10_preview.txt -b localhost:$QPID_PORT $PYTHON_TESTS &&
./run-tests --skip-self-test -v -s "0-10" -I cpp_failing_0-10.txt -b
localhost:$QPID_PORT $PYTHON_TESTS
+ cd ../../../python && ./run-tests --skip-self-test -v -s
../specs/amqp.0-10-preview.xml -I cpp_failing_0-10_preview.txt -b
localhost:$QPID_PORT $PYTHON_TESTS && ./run-tests --skip-self-test -v -s "0-10"
-I cpp_failing_0-10.txt -b localhost:$QPID_PORT $PYTHON_TESTS
else
echo Warning: python tests not found.
fi
