epics/pvData
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

removed BitSetPtr due to possible 4.6.1 gcc problem

Browse Source
This commit is contained in:
Matej Sekoranja
2012-05-21 21:11:20 +02:00
parent e9b0dcd9f4
commit 770e63b8da
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pvDataApp/misc/bitSet.cpp
View File

@@ -14,9 +14,9 @@
namespace epics { namespace pvData {
PVDATA_REFCOUNT_MONITOR_DEFINE(bitSet);
BitSetPtr BitSet::create(uint32 nbits)
BitSet::shared_pointer BitSet::create(uint32 nbits)
{
return BitSetPtr(new BitSet(nbits));
return BitSet::shared_pointer(new BitSet(nbits));
}
BitSet::BitSet() : words(0), wordsLength(0), wordsInUse(0) {

4
pvDataApp/misc/bitSet.h
View File

@@ -36,12 +36,10 @@ namespace epics { namespace pvData {
*
* Based on Java implementation.
*/
class BitSet;
typedef std::tr1::shared_ptr<BitSet> BitSetPtr;
class BitSet : public Serializable {
public:
POINTER_DEFINITIONS(BitSet);
static BitSetPtr create(uint32 nbits);
static BitSet::shared_pointer create(uint32 nbits);
/**
* Creates a new bit set. All bits are initially {@code false}.
*/

8
pvDataApp/monitor/monitor.h
View File

@@ -33,14 +33,14 @@ class MonitorElement {
MonitorElement(){}
MonitorElement(PVStructurePtr &pvStructurePtr);
PVStructurePtr pvStructurePtr;
BitSetPtr changedBitSet;
BitSetPtr overrunBitSet;
BitSet::shared_pointer changedBitSet;
BitSet::shared_pointer overrunBitSet;
};
MonitorElement::MonitorElement(PVStructurePtr &pvStructurePtr)
: pvStructurePtr(pvStructurePtr),
changedBitSet(BitSetPtr(BitSet::create(pvStructurePtr->getNumberFields()))),
overrunBitSet(BitSetPtr(BitSet::create(pvStructurePtr->getNumberFields())))
changedBitSet(BitSet::create(pvStructurePtr->getNumberFields())),
overrunBitSet(BitSet::create(pvStructurePtr->getNumberFields()))
{
}