diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2012-05-06 14:22:52 -0500 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-27 04:09:43 +0200 |
commit | 2d30adc9200561af76c6954b5a867688fcad2e25 (patch) | |
tree | 0ed940a5b626169347137f9844c9d7c6d73e8972 | |
parent | 48b2c9de903946a80f222f17222265f963e34a88 (diff) | |
download | piklab-2d30adc9200561af76c6954b5a867688fcad2e25.tar.gz piklab-2d30adc9200561af76c6954b5a867688fcad2e25.zip |
GCC 4.7 fixes.
Thanks to Francois Andriot.
(cherry picked from commit ae1ac3851e70f87bfc452da97812812c77f52c01)
-rw-r--r-- | src/common/common/range.h | 2 | ||||
-rw-r--r-- | src/devices/base/device_group.h | 2 | ||||
-rw-r--r-- | src/xml_to_data/device_xml_to_data.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/common/common/range.h b/src/common/common/range.h index 2d4ece7..fec214b 100644 --- a/src/common/common/range.h +++ b/src/common/common/range.h @@ -43,7 +43,7 @@ class GenericRangeVector : public TQValueVector<RangeType> { 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; diff --git a/src/devices/base/device_group.h b/src/devices/base/device_group.h index 1ecc6d1..46bc62d 100644 --- a/src/devices/base/device_group.h +++ b/src/devices/base/device_group.h @@ -52,7 +52,7 @@ class Group : public GroupBase, public DataStreamer<DataType> { 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; diff --git a/src/xml_to_data/device_xml_to_data.h b/src/xml_to_data/device_xml_to_data.h index 36b8824..b505cdd 100644 --- a/src/xml_to_data/device_xml_to_data.h +++ b/src/xml_to_data/device_xml_to_data.h @@ -76,7 +76,7 @@ public: 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(); |