[mingw32-qpid-cpp] Added patch to allow the code to be properly compiled on the new 4.6 gcc.
Ted Ross
tross at fedoraproject.org
Tue Jul 5 18:33:43 UTC 2011
commit c35d0fa6dee6d72a4363c4578ad25045cac44b62
Author: Ted Ross <ross at localhost.localdomain>
Date: Tue Jul 5 14:33:06 2011 -0400
Added patch to allow the code to be properly compiled on the new 4.6 gcc.
mingw32-qpid-cpp.spec | 2 ++
qpid-mutable.patch | 22 ++++++++++++++++++++++
2 files changed, 24 insertions(+), 0 deletions(-)
---
diff --git a/mingw32-qpid-cpp.spec b/mingw32-qpid-cpp.spec
index 760091c..97c97e5 100644
--- a/mingw32-qpid-cpp.spec
+++ b/mingw32-qpid-cpp.spec
@@ -18,6 +18,7 @@ Source0: http://www.apache.org/dist/qpid/0.10/qpid-0.10.tar.gz
Patch0: QPID-3159.patch
Patch1: qpid-mingw32.patch
+Patch2: qpid-mutable.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,6 +40,7 @@ an AMQP message broker using the AMQP protocol.
%setup -q -n qpid-%{version}
%patch0 -p2
%patch1 -p2
+%patch2 -p2
%build
%{__mkdir_p} build
diff --git a/qpid-mutable.patch b/qpid-mutable.patch
new file mode 100644
index 0000000..d84d63f
--- /dev/null
+++ b/qpid-mutable.patch
@@ -0,0 +1,22 @@
+commit 29bf96f3d9a2c4269c793103e57ef0b44934423a
+Author: Andrew Stitcher <astitcher at apache.org>
+Date: Mon May 9 19:55:16 2011 +0000
+
+ QPID-3004: Get Clang to compile qpid c++
+ - Remove illegal mutable
+
+ git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1101177 13f79535-47bb-0310-9956-ffa450edef68
+
+diff --git a/cpp/src/qpid/framing/SendContent.h b/cpp/src/qpid/framing/SendContent.h
+index 745c948..1c464b9 100644
+--- a/cpp/src/qpid/framing/SendContent.h
++++ b/cpp/src/qpid/framing/SendContent.h
+@@ -37,7 +37,7 @@ namespace framing {
+ */
+ class SendContent
+ {
+- mutable FrameHandler& handler;
++ FrameHandler& handler;
+ const uint16_t maxFrameSize;
+ uint expectedFrameCount;
+ uint frameCount;
More information about the scm-commits
mailing list