diff --git a/src/cas/generic/casEventMask.cc b/src/cas/generic/casEventMask.cc index 281751443..d7f4ea1bb 100644 --- a/src/cas/generic/casEventMask.cc +++ b/src/cas/generic/casEventMask.cc @@ -29,6 +29,9 @@ * * History * $Log$ + * Revision 1.7 1997/08/05 00:47:07 jhill + * fixed warnings + * * Revision 1.6 1997/04/10 19:34:07 jhill * API changes * @@ -213,13 +216,13 @@ void casEventRegistry::show(unsigned level) const // casEventMaskEntry::casEventMaskEntry( casEventRegistry ®In, casEventMask maskIn, const char *pName) : - reg(regIn), casEventMask (maskIn), stringId (pName) + casEventMask (maskIn), stringId (pName), reg (regIn) { int stat; - assert(this->resourceName()!=NULL); + assert (this->resourceName()!=NULL); stat = this->reg.add(*this); - assert(stat==0); + assert (stat==0); } // diff --git a/src/cas/generic/st/casDGIntfOS.cc b/src/cas/generic/st/casDGIntfOS.cc index 39057d126..822225640 100644 --- a/src/cas/generic/st/casDGIntfOS.cc +++ b/src/cas/generic/st/casDGIntfOS.cc @@ -18,15 +18,15 @@ // class casDGReadReg : public fdReg { public: - casDGReadReg (casDGIntfOS &osIn) : - os (osIn), fdReg (osIn.getFD(), fdrRead) {} - ~casDGReadReg (); - - void show (unsigned level) const; + casDGReadReg (casDGIntfOS &osIn) : + fdReg (osIn.getFD(), fdrRead), os (osIn) {} + ~casDGReadReg (); + + void show (unsigned level) const; private: - casDGIntfOS &os; - - void callBack (); + casDGIntfOS &os; + + void callBack (); }; diff --git a/src/cas/generic/st/casIntfOS.cc b/src/cas/generic/st/casIntfOS.cc index 1788502e2..9dfcf8e3f 100644 --- a/src/cas/generic/st/casIntfOS.cc +++ b/src/cas/generic/st/casIntfOS.cc @@ -19,7 +19,7 @@ class casServerReg : public fdReg { public: casServerReg (casIntfOS &osIn) : - os (osIn), fdReg (osIn.getFD(), fdrRead) {} + fdReg (osIn.getFD(), fdrRead), os (osIn) {} ~casServerReg (); private: casIntfOS &os; diff --git a/src/cas/generic/st/casStreamOS.cc b/src/cas/generic/st/casStreamOS.cc index 1002bf4d0..a19070ad8 100644 --- a/src/cas/generic/st/casStreamOS.cc +++ b/src/cas/generic/st/casStreamOS.cc @@ -4,6 +4,9 @@ // // // $Log$ +// Revision 1.7 1997/08/05 00:47:21 jhill +// fixed warnings +// // Revision 1.6 1997/06/30 22:54:34 jhill // use %p with pointers // @@ -58,7 +61,7 @@ private: // casStreamReadReg::casStreamReadReg() // inline casStreamReadReg::casStreamReadReg (casStreamOS &osIn) : - os (osIn), fdReg (osIn.getFD(), fdrRead) + fdReg (osIn.getFD(), fdrRead), os (osIn) { # if defined(DEBUG) printf ("Read on %d\n", this->os.getFD()); @@ -103,7 +106,7 @@ private: // casStreamWriteReg::casStreamWriteReg() // inline casStreamWriteReg::casStreamWriteReg (casStreamOS &osIn) : - os (osIn), fdReg (osIn.getFD(), fdrWrite, TRUE) + fdReg (osIn.getFD(), fdrWrite, TRUE), os (osIn) { # if defined(DEBUG) printf ("Write on %d\n", this->os.getFD());