More Windows build fixes.

This commit is contained in:
Andrew Johnson
2012-07-19 14:59:55 -05:00
parent b09fbe5cec
commit 20b3955cd7
3 changed files with 16 additions and 15 deletions

View File

@@ -40,7 +40,7 @@ template <class T>
class tsSLNode {
public:
tsSLNode ();
tsSLNode < T > & operator = ( const tsSLNode < T > & ) const;
tsSLNode < T > & operator = ( const tsSLNode < T > & );
private:
void removeNextItem (); // removes the item after this node
T *pNext;
@@ -148,7 +148,7 @@ inline tsSLNode < T > :: tsSLNode ( const tsSLNode < T > & )
//
template < class T >
inline tsSLNode < T > & tsSLNode < T >::operator =
( const tsSLNode < T > & ) const
( const tsSLNode < T > & )
{
return *this;
}

View File

@@ -219,7 +219,7 @@ epicsShareFunc void fdManager::process (double delay)
// fdReg::destroy()
// (default destroy method)
//
epicsShareFunc void fdReg::destroy()
void fdReg::destroy()
{
delete this;
}
@@ -227,7 +227,7 @@ epicsShareFunc void fdReg::destroy()
//
// fdReg::~fdReg()
//
epicsShareFunc fdReg::~fdReg()
fdReg::~fdReg()
{
this->manager.removeReg(*this);
}
@@ -235,7 +235,7 @@ epicsShareFunc fdReg::~fdReg()
//
// fdReg::show()
//
epicsShareFunc void fdReg::show(unsigned level) const
void fdReg::show(unsigned level) const
{
printf ("fdReg at %p\n", (void *) this);
if (level>1u) {

View File

@@ -107,8 +107,8 @@ private:
epicsShareFunc void installReg (fdReg &reg);
epicsShareFunc void removeReg (fdReg &reg);
void lazyInitTimerQueue ();
fdManager ( const fdManager & );
fdManager & operator = ( const fdManager & );
fdManager ( const fdManager & );
fdManager & operator = ( const fdManager & );
friend class fdReg;
};
@@ -122,16 +122,17 @@ epicsShareExtern fdManager fileDescriptorManager;
//
// file descriptor registration
//
class epicsShareClass fdReg : public fdRegId, public tsDLNode<fdReg>, public tsSLNode<fdReg> {
class epicsShareClass fdReg :
public fdRegId, public tsDLNode<fdReg>, public tsSLNode<fdReg> {
friend class fdManager;
public:
epicsShareFunc fdReg (const SOCKET fdIn, const fdRegType type,
fdReg (const SOCKET fdIn, const fdRegType type,
const bool onceOnly=false, fdManager &manager = fileDescriptorManager);
epicsShareFunc virtual ~fdReg ();
virtual ~fdReg ();
epicsShareFunc virtual void show (unsigned level) const;
virtual void show (unsigned level) const;
//
// Called by the file descriptor manager:
@@ -142,7 +143,7 @@ public:
//
// fdReg::destroy() does a "delete this"
//
epicsShareFunc virtual void destroy ();
virtual void destroy ();
private:
enum state {active, pending, limbo};
@@ -154,14 +155,14 @@ private:
// lifetime of a fdReg object if the constructor
// specified "onceOnly"
//
epicsShareFunc virtual void callBack ()=0;
virtual void callBack ()=0;
unsigned char state; // state enums go here
unsigned char onceOnly;
fdManager &manager;
fdReg ( const fdReg & );
fdReg & operator = ( const fdReg & );
fdReg ( const fdReg & );
fdReg & operator = ( const fdReg & );
};
//