tags 355352 + patch
severity 355352 important
thanks
Here's a patch.
--- ./src/common/ivi_String.h~ 2006-03-10 04:35:22.000000000 +0000
+++ ./src/common/ivi_String.h 2006-03-10 04:35:27.000000000 +0000
@@ -43,7 +43,7 @@
int equal(String *str) const;
int equal(const char *str) const;
int equal(const char *str, Uint32 len) const;
- static int String::equal(const char *str1, const char *str2);
+ static int equal(const char *str1, const char *str2);
void operator = (const String &rhs);
void operator = (const Char *str_in);
--- ./src/common/vector.h~ 2006-03-10 04:36:08.000000000 +0000
+++ ./src/common/vector.h 2006-03-10 04:36:45.000000000 +0000
@@ -59,21 +59,21 @@
return numObjs;
}
- virtual void Vector<vType>::empty(void) {
+ virtual void empty(void) {
numObjs = 0;
}
- virtual void Vector<vType>::append(vType *newObj);
- virtual void Vector<vType>::append(Vector<vType> *aVect);
- virtual void Vector<vType>::append(Vector<vType> *aVect,
+ virtual void append(vType *newObj);
+ virtual void append(Vector<vType> *aVect);
+ virtual void append(Vector<vType> *aVect,
Uint32 startIdx, Uint32 endIdx);
- virtual int Vector<vType>::remove(vType *rm_el);
+ virtual int remove(vType *rm_el);
- virtual void Vector<vType>::setEqual(Vector<vType> *aVect);
+ virtual void setEqual(Vector<vType> *aVect);
- virtual void Vector<vType>::swap(void);
- virtual void Vector<vType>::swap(Uint32 startIdx, Uint32 endIdx);
+ virtual void swap(void);
+ virtual void swap(Uint32 startIdx, Uint32 endIdx);
vType **get_storage() { return objArray; }
--- ./src/common/DesignDB.h~ 2006-03-10 04:37:03.000000000 +0000
+++ ./src/common/DesignDB.h 2006-03-10 04:37:23.000000000 +0000
@@ -53,7 +53,7 @@
int getSignals(TreeNode *parent, Vector<TreeNode> *sigs,
Char **patterns, Uint32 numPatterns);
- int DesignDB::tclCmdGlob(
+ int tclCmdGlob(
int argc,
char **argv
);
@@ -80,7 +80,7 @@
* - flags
* Allows user-specified search options such as -r
*********************************************************/
- Vector<TreeNode> *DesignDB::globElems(
+ Vector<TreeNode> *globElems(
TreeNode *Parent,
const char *PathSpec,
const char *elemType,
--- ./src/common/SigDB.h~ 2006-03-10 04:37:33.000000000 +0000
+++ ./src/common/SigDB.h 2006-03-10 04:37:47.000000000 +0000
@@ -68,7 +68,7 @@
/************************************************************
* addSignal()
************************************************************/
- virtual Vector<DFIOTrace> *SigDB::addSignal(Char *path);
+ virtual Vector<DFIOTrace> *addSignal(Char *path);
/************************************************************
* addClient()
@@ -106,10 +106,10 @@
************************************************************/
private:
Int32 Configure(Uint32 argc, Char **argc, Uint32 flags);
- void SigDB::addSimSignals(IviSim *sim, const char *path);
- void SigDB::addDFIOSignals(DFIO *dfio, const char *path);
+ void addSimSignals(IviSim *sim, const char *path);
+ void addDFIOSignals(DFIO *dfio, const char *path);
- static int SigDB::SDB_SimStepEnd(
+ static int SDB_SimStepEnd(
ClientData clientData,
Tcl_Interp *interp,
int objc,
--- ./src/common/StimTraceRdr.h~ 2006-03-10 04:38:11.000000000 +0000
+++ ./src/common/StimTraceRdr.h 2006-03-10 04:38:18.000000000 +0000
@@ -75,7 +75,7 @@
IviSim *sim;
- static int StimTraceRdr::DataCB(p_cb_data cb_data_p);
+ static int DataCB(p_cb_data cb_data_p);
};
#endif /* INCLUDED_STIM_TRACE_RDR_H */
--- ./src/wave_widget/WaveWidget.h~ 2006-03-10 04:38:42.000000000 +0000
+++ ./src/wave_widget/WaveWidget.h 2006-03-10 04:38:48.000000000 +0000
@@ -611,7 +611,7 @@
* Return:
* - Returns the distance between bars
******************************************************************/
- Uint32 WaveWidget::UpdateTimeScale(
+ Uint32 UpdateTimeScale(
Uint32 pixmapStartTime,
Uint32 pixmapEndTime,
Uint32 pixmapWidth);
--
Martin Michlmayr
http://www.cyrius.com/
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
