From 9750a057f2f36c5b88a5bc53c0a051b605dac061 Mon Sep 17 00:00:00 2001
From: Francois Andriot <francois.andriot@free.fr>
Date: Mon, 7 May 2012 01:06:08 +0200
Subject: RHEL/Fedora: massive updates for Fedora 17 (TDE 3.5.13 entire build)

---
 .../piklab-3.5.13-fix_gcc47_compilation.patch      | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 redhat/applications/piklab/piklab-3.5.13-fix_gcc47_compilation.patch

(limited to 'redhat/applications/piklab/piklab-3.5.13-fix_gcc47_compilation.patch')

diff --git a/redhat/applications/piklab/piklab-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/piklab/piklab-3.5.13-fix_gcc47_compilation.patch
new file mode 100644
index 000000000..9b3adfbce
--- /dev/null
+++ b/redhat/applications/piklab/piklab-3.5.13-fix_gcc47_compilation.patch
@@ -0,0 +1,33 @@
+--- piklab/src/common/common/range.h.ORI	2012-05-06 11:39:36.080834047 +0200
++++ piklab/src/common/common/range.h	2012-05-06 11:39:43.239684938 +0200
+@@ -43,7 +43,7 @@
+ {
+ public:
+   GenericRangeVector() {}
+-  GenericRangeVector(const RangeType &range) { append(range); }
++  GenericRangeVector(const RangeType &range) { this->append(range); }
+   bool isEmpty() const {
+     uint nb = this->count();
+     for (uint i=0; i<nb; i++) if ( !this->at(i).isEmpty() ) return false;
+--- piklab/src/xml_to_data/device_xml_to_data.h.ORI	2012-05-06 11:45:56.824911257 +0200
++++ piklab/src/xml_to_data/device_xml_to_data.h	2012-05-06 11:46:04.135759246 +0200
+@@ -76,7 +76,7 @@
+     TQValueList<DataType *> list;
+     for (it=_map.begin(); it!=_map.end(); ++it)
+       list.append(const_cast<DataType *>(static_cast<const DataType *>(it.data())));
+-    uint size = toCppString(list, ts);
++    uint size = this->toCppString(list, ts);
+     ts << ";" << endl;
+     ts << "const uint " << namespaceName() << "::DATA_SIZE = " << size << ";" << endl;
+     file.close();
+--- piklab/src/devices/base/device_group.h.ORI	2012-05-06 11:47:08.950411718 +0200
++++ piklab/src/devices/base/device_group.h	2012-05-06 11:47:17.607231757 +0200
+@@ -52,7 +52,7 @@
+ {
+ protected:
+   virtual void initSupported() {
+-    TQValueList<DataType *> list = fromCppString(dataStream(), dataSize());
++    TQValueList<DataType *> list = this->fromCppString(dataStream(), dataSize());
+     for (uint i=0; i<uint(list.count()); i++) addDevice(list[i]->name(), list[i], ::Group::Support::Tested);
+   }
+   virtual uint dataSize() const = 0;
-- 
cgit v1.2.1