summaryrefslogtreecommitdiff
path: root/devel/qca/files/patch-r1273508
diff options
context:
space:
mode:
authorDima Panov <fluffy@FreeBSD.org>2012-06-12 07:14:51 +0000
committerDima Panov <fluffy@FreeBSD.org>2012-06-12 07:14:51 +0000
commitcca6d705b293f43b8acbcfded81a53ae35a0b0a9 (patch)
tree6a7d3af8e68cc57f55e98eb3cc1d8f4829fdae40 /devel/qca/files/patch-r1273508
parentMark BROKEN on 10.x: unsupported (diff)
- Allow to pass QMAKESPEC to make [1]
- Backport patch from upstream to fix c++ code, it fixes build with clang/gcc46+ Submitted by: avg (via kde-freebsd ml) [1]
Diffstat (limited to 'devel/qca/files/patch-r1273508')
-rw-r--r--devel/qca/files/patch-r127350859
1 files changed, 59 insertions, 0 deletions
diff --git a/devel/qca/files/patch-r1273508 b/devel/qca/files/patch-r1273508
new file mode 100644
index 000000000000..dd6d85b851b1
--- /dev/null
+++ b/devel/qca/files/patch-r1273508
@@ -0,0 +1,59 @@
+--- ./src/botantools/botan/botan/secmem.h 2007-04-20 08:26:13.000000000 +1100
++++ ./src/botantools/botan/botan/secmem.h 2012-05-08 14:54:53.513833555 +1100
+@@ -191,15 +191,15 @@
+ {
+ public:
+ MemoryVector<T>& operator=(const MemoryRegion<T>& in)
+- { if(this != &in) set(in); return (*this); }
++ { if(this != &in) this->set(in); return (*this); }
+
+ MemoryVector(u32bit n = 0) { MemoryRegion<T>::init(false, n); }
+ MemoryVector(const T in[], u32bit n)
+- { MemoryRegion<T>::init(false); set(in, n); }
++ { MemoryRegion<T>::init(false); this->set(in, n); }
+ MemoryVector(const MemoryRegion<T>& in)
+- { MemoryRegion<T>::init(false); set(in); }
++ { MemoryRegion<T>::init(false); this->set(in); }
+ MemoryVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
+- { MemoryRegion<T>::init(false); set(in1); append(in2); }
++ { MemoryRegion<T>::init(false); this->set(in1); append(in2); }
+ };
+
+ /*************************************************
+@@ -210,15 +210,15 @@
+ {
+ public:
+ SecureVector<T>& operator=(const MemoryRegion<T>& in)
+- { if(this != &in) set(in); return (*this); }
++ { if(this != &in) this->set(in); return (*this); }
+
+ SecureVector(u32bit n = 0) { MemoryRegion<T>::init(true, n); }
+ SecureVector(const T in[], u32bit n)
+- { MemoryRegion<T>::init(true); set(in, n); }
++ { MemoryRegion<T>::init(true); this->set(in, n); }
+ SecureVector(const MemoryRegion<T>& in)
+- { MemoryRegion<T>::init(true); set(in); }
++ { MemoryRegion<T>::init(true); this->set(in); }
+ SecureVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
+- { MemoryRegion<T>::init(true); set(in1); append(in2); }
++ { MemoryRegion<T>::init(true); this->set(in1); append(in2); }
+ };
+
+ /*************************************************
+@@ -229,14 +229,14 @@
+ {
+ public:
+ SecureBuffer<T,L>& operator=(const SecureBuffer<T,L>& in)
+- { if(this != &in) set(in); return (*this); }
++ { if(this != &in) this->set(in); return (*this); }
+
+ SecureBuffer() { MemoryRegion<T>::init(true, L); }
+ SecureBuffer(const T in[], u32bit n)
+ { MemoryRegion<T>::init(true, L); copy(in, n); }
+ private:
+ SecureBuffer<T, L>& operator=(const MemoryRegion<T>& in)
+- { if(this != &in) set(in); return (*this); }
++ { if(this != &in) this->set(in); return (*this); }
+ };
+
+ }