diff options
| author | Alan Conway <aconway@apache.org> | 2008-04-03 00:57:44 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2008-04-03 00:57:44 +0000 |
| commit | 79c69b72e4bf89d18b23ff42bde38b20af1b5738 (patch) | |
| tree | 18bcfc4ffe3fe24b426ed160ef3deaab4a1714b4 /qpid/cpp/src | |
| parent | 853000ea9e135d1b7d5d6783c5815691cc61cc91 (diff) | |
| download | qpid-python-79c69b72e4bf89d18b23ff42bde38b20af1b5738.tar.gz | |
Fix serialize test failure on 64 bit architerctures.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@644125 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/amqp_0_10/Map.h | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/amqp_0_10/Map.cpp | 1 | ||||
| -rwxr-xr-x | qpid/cpp/src/tests/python_tests | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/amqp_0_10/Map.h b/qpid/cpp/src/qpid/amqp_0_10/Map.h index ce8cd4bd08..e9b95ed0f2 100644 --- a/qpid/cpp/src/qpid/amqp_0_10/Map.h +++ b/qpid/cpp/src/qpid/amqp_0_10/Map.h @@ -157,7 +157,7 @@ template <class V> typename V::result_type MapValue::apply_visitor(const V& v) { } 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) } diff --git a/qpid/cpp/src/tests/amqp_0_10/Map.cpp b/qpid/cpp/src/tests/amqp_0_10/Map.cpp index 958470f6d7..0a58a2134a 100644 --- a/qpid/cpp/src/tests/amqp_0_10/Map.cpp +++ b/qpid/cpp/src/tests/amqp_0_10/Map.cpp @@ -88,6 +88,7 @@ BOOST_AUTO_TEST_CASE(testEncode) { 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); diff --git a/qpid/cpp/src/tests/python_tests b/qpid/cpp/src/tests/python_tests index 73b3b970c1..9a1bfff6a9 100755 --- a/qpid/cpp/src/tests/python_tests +++ b/qpid/cpp/src/tests/python_tests @@ -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 |