You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kg...@apache.org on 2012/12/20 18:31:27 UTC
svn commit: r1424598 - in /qpid/branches/0.20/qpid/cpp/src/qpid/amqp: ./
descriptors.h
Author: kgiusti
Date: Thu Dec 20 17:31:27 2012
New Revision: 1424598
URL: http://svn.apache.org/viewvc?rev=1424598&view=rev
Log:
NO-JIRA: merge compile fix from trunk
Modified:
qpid/branches/0.20/qpid/cpp/src/qpid/amqp/ (props changed)
qpid/branches/0.20/qpid/cpp/src/qpid/amqp/descriptors.h
Propchange: qpid/branches/0.20/qpid/cpp/src/qpid/amqp/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Dec 20 17:31:27 2012
@@ -0,0 +1,8 @@
+/qpid/branches/0.5.x-dev/qpid/cpp/src/qpid/amqp:892761,894875
+/qpid/branches/0.6-release-windows-installer/cpp/src/qpid/amqp:926803
+/qpid/branches/0.6-release-windows-installer/qpid/cpp/src/qpid/amqp:926803,927233
+/qpid/branches/QPID-2519/cpp/src/qpid/amqp:1072051-1079078
+/qpid/branches/java-network-refactor/qpid/cpp/src/qpid/amqp:805429-825319
+/qpid/branches/qpid-2935/qpid/cpp/src/qpid/amqp:1061302-1072333
+/qpid/branches/qpid-3346/qpid/cpp/src/qpid/amqp:1144319-1179855
+/qpid/trunk/qpid/cpp/src/qpid/amqp:1413364,1413676,1415137,1418000,1424072
Modified: qpid/branches/0.20/qpid/cpp/src/qpid/amqp/descriptors.h
URL: http://svn.apache.org/viewvc/qpid/branches/0.20/qpid/cpp/src/qpid/amqp/descriptors.h?rev=1424598&r1=1424597&r2=1424598&view=diff
==============================================================================
--- qpid/branches/0.20/qpid/cpp/src/qpid/amqp/descriptors.h (original)
+++ qpid/branches/0.20/qpid/cpp/src/qpid/amqp/descriptors.h Thu Dec 20 17:31:27 2012
@@ -79,8 +79,8 @@ namespace filters {
const std::string LEGACY_DIRECT_FILTER_SYMBOL("apache.org:legacy-amqp-direct-binding:string");
const std::string LEGACY_TOPIC_FILTER_SYMBOL("apache.org:legacy-amqp-direct-binding:string");
-const uint64_t LEGACY_DIRECT_FILTER_CODE(0x0000468C00000000);
-const uint64_t LEGACY_TOPIC_FILTER_CODE(0x0000468C00000001);
+const uint64_t LEGACY_DIRECT_FILTER_CODE(0x0000468C00000000ULL);
+const uint64_t LEGACY_TOPIC_FILTER_CODE(0x0000468C00000001ULL);
}
}} // namespace qpid::amqp
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org