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

added operator!=

Browse Source 
Convert.cpp almost done
This commit is contained in:
Marty Kraimer
2010-10-20 16:06:25 -04:00
parent f7c89f2ed9
commit e0ca45a028
22 changed files with 1834 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pvDataApp/factory/BasePVBoolean.h
View File

@@ -27,6 +27,7 @@ namespace epics { namespace pvData {
virtual void toString(StringBuilder buf);
virtual void toString(StringBuilder buf,int indentLevel);
virtual bool operator==(PVField *pv) ;
virtual bool operator!=(PVField *pv) ;
private:
bool value;
};
@@ -66,5 +67,10 @@ namespace epics { namespace pvData {
return getConvert()->equals(this,pvField);
}
bool BasePVBoolean::operator!=(PVField *pvField)
{
return !(getConvert()->equals(this,pvField));
}
}}
#endif /* BASEPVBOOLEAN_H */

6
pvDataApp/factory/BasePVBooleanArray.h
View File

@@ -34,6 +34,7 @@ namespace epics { namespace pvData {
virtual void toString(StringBuilder buf);
virtual void toString(StringBuilder buf,int indentLevel);
virtual bool operator==(PVField *pv) ;
virtual bool operator!=(PVField *pv) ;
private:
bool *value;
};
@@ -149,5 +150,10 @@ namespace epics { namespace pvData {
{
return getConvert()->equals(this,pv);
}
bool BasePVBooleanArray::operator!=(PVField *pv)
{
return !(getConvert()->equals(this,pv));
}
}}
#endif /* BASEPVBOOLEANARRAY_H */

6
pvDataApp/factory/BasePVByte.h
View File

@@ -27,6 +27,7 @@ namespace epics { namespace pvData {
virtual void toString(StringBuilder buf);
virtual void toString(StringBuilder buf,int indentLevel);
virtual bool operator==(PVField *pv) ;
virtual bool operator!=(PVField *pv) ;
private:
epicsInt8 value;
};
@@ -66,5 +67,10 @@ namespace epics { namespace pvData {
return getConvert()->equals(this,pvField);
}
bool BasePVByte::operator!=(PVField *pvField)
{
return !(getConvert()->equals(this,pvField));
}
}}
#endif /* BASEPVBYTE_H */

6
pvDataApp/factory/BasePVByteArray.h
View File

@@ -34,6 +34,7 @@ namespace epics { namespace pvData {
virtual void toString(StringBuilder buf);
virtual void toString(StringBuilder buf,int indentLevel);
virtual bool operator==(PVField *pv) ;
virtual bool operator!=(PVField *pv) ;
private:
epicsInt8 *value;
};
@@ -149,5 +150,10 @@ namespace epics { namespace pvData {
{
return getConvert()->equals(this,pv);
}
bool BasePVByteArray::operator!=(PVField *pv)
{
return !(getConvert()->equals(this,pv));
}
}}
#endif /* BASEPVBYTEARRAY_H */

6
pvDataApp/factory/BasePVDouble.h
View File

@@ -27,6 +27,7 @@ namespace epics { namespace pvData {
virtual void toString(StringBuilder buf);
virtual void toString(StringBuilder buf,int indentLevel);
virtual bool operator==(PVField *pv) ;
virtual bool operator!=(PVField *pv) ;
private:
double value;
};
@@ -66,5 +67,10 @@ namespace epics { namespace pvData {
return getConvert()->equals(this,pvField);
}
bool BasePVDouble::operator!=(PVField *pvField)
{
return !(getConvert()->equals(this,pvField));
}
}}
#endif /* BASEPVDOUBLE_H */

6
pvDataApp/factory/BasePVDoubleArray.h
View File

@@ -34,6 +34,7 @@ namespace epics { namespace pvData {
virtual void toString(StringBuilder buf);
virtual void toString(StringBuilder buf,int indentLevel);
virtual bool operator==(PVField *pv) ;
virtual bool operator!=(PVField *pv) ;
private:
double *value;
};
@@ -149,5 +150,10 @@ namespace epics { namespace pvData {
{
return getConvert()->equals(this,pv);
}
bool BasePVDoubleArray::operator!=(PVField *pv)
{
return !(getConvert()->equals(this,pv));
}
}}
#endif /* BASEPVDOUBLEARRAY_H */

6
pvDataApp/factory/BasePVFloat.h
View File

@@ -27,6 +27,7 @@ namespace epics { namespace pvData {
virtual void toString(StringBuilder buf);
virtual void toString(StringBuilder buf,int indentLevel);
virtual bool operator==(PVField *pv) ;
virtual bool operator!=(PVField *pv) ;
private:
float value;
};
@@ -66,5 +67,10 @@ namespace epics { namespace pvData {
return getConvert()->equals(this,pvField);
}
bool BasePVFloat::operator!=(PVField *pvField)
{
return !(getConvert()->equals(this,pvField));
}
}}
#endif /* BASEPVFLOAT_H */

6
pvDataApp/factory/BasePVFloatArray.h
View File

@@ -34,6 +34,7 @@ namespace epics { namespace pvData {
virtual void toString(StringBuilder buf);
virtual void toString(StringBuilder buf,int indentLevel);
virtual bool operator==(PVField *pv) ;
virtual bool operator!=(PVField *pv) ;
private:
float *value;
};
@@ -149,5 +150,10 @@ namespace epics { namespace pvData {
{
return getConvert()->equals(this,pv);
}
bool BasePVFloatArray::operator!=(PVField *pv)
{
return !(getConvert()->equals(this,pv));
}
}}
#endif /* BASEPVFLOATARRAY_H */

6
pvDataApp/factory/BasePVInt.h
View File

@@ -27,6 +27,7 @@ namespace epics { namespace pvData {
virtual void toString(StringBuilder buf);
virtual void toString(StringBuilder buf,int indentLevel);
virtual bool operator==(PVField *pv) ;
virtual bool operator!=(PVField *pv) ;
private:
epicsInt32 value;
};
@@ -66,5 +67,10 @@ namespace epics { namespace pvData {
return getConvert()->equals(this,pvField);
}
bool BasePVInt::operator!=(PVField *pvField)
{
return !(getConvert()->equals(this,pvField));
}
}}
#endif /* BASEPVINT_H */

6
pvDataApp/factory/BasePVIntArray.h
View File

@@ -34,6 +34,7 @@ namespace epics { namespace pvData {
virtual void toString(StringBuilder buf);
virtual void toString(StringBuilder buf,int indentLevel);
virtual bool operator==(PVField *pv) ;
virtual bool operator!=(PVField *pv) ;
private:
epicsInt32 *value;
};
@@ -149,5 +150,10 @@ namespace epics { namespace pvData {
{
return getConvert()->equals(this,pv);
}
bool BasePVIntArray::operator!=(PVField *pv)
{
return !(getConvert()->equals(this,pv));
}
}}
#endif /* BASEPVINTARRAY_H */

6
pvDataApp/factory/BasePVLong.h
View File

@@ -27,6 +27,7 @@ namespace epics { namespace pvData {
virtual void toString(StringBuilder buf);
virtual void toString(StringBuilder buf,int indentLevel);
virtual bool operator==(PVField *pv) ;
virtual bool operator!=(PVField *pv) ;
private:
epicsInt64 value;
};
@@ -66,5 +67,10 @@ namespace epics { namespace pvData {
return getConvert()->equals(this,pvField);
}
bool BasePVLong::operator!=(PVField *pvField)
{
return !(getConvert()->equals(this,pvField));
}
}}
#endif /* BASEPVLONG_H */

6
pvDataApp/factory/BasePVLongArray.h
View File

@@ -34,6 +34,7 @@ namespace epics { namespace pvData {
virtual void toString(StringBuilder buf);
virtual void toString(StringBuilder buf,int indentLevel);
virtual bool operator==(PVField *pv) ;
virtual bool operator!=(PVField *pv) ;
private:
epicsInt64 *value;
};
@@ -149,5 +150,10 @@ namespace epics { namespace pvData {
{
return getConvert()->equals(this,pv);
}
bool BasePVLongArray::operator!=(PVField *pv)
{
return !(getConvert()->equals(this,pv));
}
}}
#endif /* BASEPVLONGARRAY_H */

6
pvDataApp/factory/BasePVShort.h
View File

@@ -27,6 +27,7 @@ namespace epics { namespace pvData {
virtual void toString(StringBuilder buf);
virtual void toString(StringBuilder buf,int indentLevel);
virtual bool operator==(PVField *pv) ;
virtual bool operator!=(PVField *pv) ;
private:
epicsInt16 value;
};
@@ -66,5 +67,10 @@ namespace epics { namespace pvData {
return getConvert()->equals(this,pvField);
}
bool BasePVShort::operator!=(PVField *pvField)
{
return !(getConvert()->equals(this,pvField));
}
}}
#endif /* BASEPVSHORT_H */

6
pvDataApp/factory/BasePVShortArray.h
View File

@@ -34,6 +34,7 @@ namespace epics { namespace pvData {
virtual void toString(StringBuilder buf);
virtual void toString(StringBuilder buf,int indentLevel);
virtual bool operator==(PVField *pv) ;
virtual bool operator!=(PVField *pv) ;
private:
epicsInt16 *value;
};
@@ -149,5 +150,10 @@ namespace epics { namespace pvData {
{
return getConvert()->equals(this,pv);
}
bool BasePVShortArray::operator!=(PVField *pv)
{
return !(getConvert()->equals(this,pv));
}
}}
#endif /* BASEPVSHORTARRAY_H */

6
pvDataApp/factory/BasePVString.h
View File

@@ -27,6 +27,7 @@ namespace epics { namespace pvData {
virtual void toString(StringBuilder buf);
virtual void toString(StringBuilder buf,int indentLevel);
virtual bool operator==(PVField *pv) ;
virtual bool operator!=(PVField *pv) ;
private:
String value;
};
@@ -66,5 +67,10 @@ namespace epics { namespace pvData {
return getConvert()->equals(this,pvField);
}
bool BasePVString::operator!=(PVField *pvField)
{
return !(getConvert()->equals(this,pvField));
}
}}
#endif /* BASEPVSTRING_H */

6
pvDataApp/factory/BasePVStringArray.h
View File

@@ -34,6 +34,7 @@ namespace epics { namespace pvData {
virtual void toString(StringBuilder buf);
virtual void toString(StringBuilder buf,int indentLevel);
virtual bool operator==(PVField *pv) ;
virtual bool operator!=(PVField *pv) ;
private:
String *value;
};
@@ -149,5 +150,10 @@ namespace epics { namespace pvData {
{
return getConvert()->equals(this,pv);
}
bool BasePVStringArray::operator!=(PVField *pv)
{
return !(getConvert()->equals(this,pv));
}
}}
#endif /* BASEPVSTRINGARRAY_H */

5
pvDataApp/factory/BasePVStructure.h
View File

@@ -193,6 +193,11 @@ namespace epics { namespace pvData {
throw std::logic_error(notImplemented);
}
bool PVStructure::operator!=(PVField *pv)
{
throw std::logic_error(notImplemented);
}
class BasePVStructure : public PVStructure {
public:
BasePVStructure(PVStructure *parent,StructureConstPtr structure);

5
pvDataApp/factory/BasePVStructureArray.h
View File

@@ -98,6 +98,11 @@ namespace epics { namespace pvData {
throw std::logic_error(notImplemented);
}
bool PVStructureArray::operator!=(PVField *pv)
{
throw std::logic_error(notImplemented);
}
class BasePVStructureArray : public PVStructureArray {
public:
BasePVStructureArray(PVStructure *parent,

1743
pvDataApp/factory/Convert.cpp
View File

File diff suppressed because it is too large Load Diff

2
pvDataApp/misc/bitSet.cpp
View File

@@ -1,3 +1,5 @@
#include "string.h"
#include "stdio.h"
#include "bitSet.h"
namespace epics { namespace pvData {

3
pvDataApp/pv/pvData.h
View File

@@ -81,6 +81,7 @@ namespace epics { namespace pvData {
virtual void toString(StringBuilder buf) ;
virtual void toString(StringBuilder buf,int indentLevel) ;
virtual bool operator==(PVField *pv) = 0;
virtual bool operator!=(PVField *pv) = 0;
protected:
PVField(PVStructure *parent,FieldConstPtr field);
void replaceStructure();
@@ -170,6 +171,7 @@ namespace epics { namespace pvData {
virtual void toString(StringBuilder buf) = 0;
virtual void toString(StringBuilder buf,int indentLevel) = 0;
virtual bool operator==(PVField *pv) = 0;
virtual bool operator!=(PVField *pv) = 0;
protected:
PVStructureArray(PVStructure *parent,
StructureArrayConstPtr structureArray);
@@ -208,6 +210,7 @@ namespace epics { namespace pvData {
virtual void toString(StringBuilder buf) ;
virtual void toString(StringBuilder buf,int indentLevel) ;
virtual bool operator==(PVField *pv) ;
virtual bool operator!=(PVField *pv) ;
virtual void serialize(
ByteBuffer *pbuffer,SerializableControl *pflusher) ;
virtual void deserialize(

2
pvDataApp/test/testBitSet.cpp
View File

@@ -6,7 +6,7 @@
#include <stddef.h>
#include <string.h>
#include <stdio.h>
#include "BitSet.h"
#include "bitSet.h"
#include <epicsAssert.h>