os veresion
| @@ -7,7 +7,7 @@ | ||
| 7 | 7 | #include "ts/c++/tsCallBuffer.h" |
| 8 | 8 | #include "ts/c++/tsReadLine.h" |
| 9 | 9 | |
| 10 | -CLASS_TINYSTATE(ts/c++/tsOSversion,ts/c++/tinyState) | |
| 10 | +CLASS_TINYSTATE(ts/c++/tsOSversion,ts/c++/tsOSversionBase) | |
| 11 | 11 | |
| 12 | 12 | |
| 13 | 13 | #if 0 |
| @@ -26,8 +26,6 @@ | ||
| 26 | 26 | stdOSversion * vers); |
| 27 | 27 | private: |
| 28 | 28 | protected: |
| 29 | - stdOSversion * vers; | |
| 30 | - | |
| 31 | 29 | tsIOstring * ior; |
| 32 | 30 | tsIOstring * ioe; |
| 33 | 31 | tsIOstring * iow; |
| @@ -41,7 +39,7 @@ | ||
| 41 | 39 | tsOSversion_::tsOSversion_( |
| 42 | 40 | tinyState * _parent, |
| 43 | 41 | stdOSversion * vers) |
| 44 | - : tinyState_(_parent) | |
| 42 | + : tsOSversionBase_(_parent,vers) | |
| 45 | 43 | { |
| 46 | 44 | REF_SET(this->vers,vers); |
| 47 | 45 | } |
| @@ -51,7 +49,7 @@ | ||
| 51 | 49 | tinyState * _parent, |
| 52 | 50 | stdOSversion * vers) |
| 53 | 51 | { |
| 54 | - this->TS_BASECLASS::inherit(_parent); | |
| 52 | + this->TS_BASECLASS::inherit(_parent,vers); | |
| 55 | 53 | } |
| 56 | 54 | |
| 57 | 55 |
| @@ -67,7 +65,7 @@ | ||
| 67 | 65 | ********************************************/ |
| 68 | 66 | |
| 69 | 67 | |
| 70 | -TS_STATE(INI_START) | |
| 68 | +TS_STATE(INI_tsOSversionBase_START) | |
| 71 | 69 | { |
| 72 | 70 | int pid; |
| 73 | 71 | listen(parent,TSE_DESTROY); |
| @@ -117,7 +115,6 @@ | ||
| 117 | 115 | } |
| 118 | 116 | TS_STATE(FIN_START) |
| 119 | 117 | { |
| 120 | - REF_SET(vers->helper,0); | |
| 121 | 118 | GCIO(ior,iow,ioe); |
| 122 | 119 | REF_SET(ior,0); |
| 123 | 120 | REF_SET(iow,0); |
| @@ -124,5 +121,5 @@ | ||
| 124 | 121 | REF_SET(ioe,0); |
| 125 | 122 | REF_SET(v,0); |
| 126 | 123 | REF_SET(bv,0); |
| 127 | - return rDO|FIN_TINYSTATE_START; | |
| 124 | + return rDO|FIN_tsOSversionBase_START; | |
| 128 | 125 | } |
modules/tinyState/trunk/src/arch/posix/machine/Darwin/ts/c++/tsOSversion.cpp