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

More Windows build fixes.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/libCom/cxxTemplates/tsSLList.h
+2 -2
View File
@@ -40,7 +40,7 @@ template <class T>
class tsSLNode { class tsSLNode {
public: public:
tsSLNode (); tsSLNode ();
tsSLNode < T > & operator = ( const tsSLNode < T > & ) const; tsSLNode < T > & operator = ( const tsSLNode < T > & );
private: private:
void removeNextItem (); // removes the item after this node void removeNextItem (); // removes the item after this node
T *pNext; T *pNext;
@@ -148,7 +148,7 @@ inline tsSLNode < T > :: tsSLNode ( const tsSLNode < T > & )
// //
template < class T > template < class T >
inline tsSLNode < T > & tsSLNode < T >::operator = inline tsSLNode < T > & tsSLNode < T >::operator =
( const tsSLNode < T > & ) const ( const tsSLNode < T > & )
{ {
return *this; return *this;
} }
src/libCom/fdmgr/fdManager.cpp
+3 -3
View File
@@ -219,7 +219,7 @@ epicsShareFunc void fdManager::process (double delay)
// fdReg::destroy() // fdReg::destroy()
// (default destroy method) // (default destroy method)
// //
epicsShareFunc void fdReg::destroy() void fdReg::destroy()
{ {
delete this; delete this;
} }
@@ -227,7 +227,7 @@ epicsShareFunc void fdReg::destroy()
// //
// fdReg::~fdReg() // fdReg::~fdReg()
// //
epicsShareFunc fdReg::~fdReg() fdReg::~fdReg()
{ {
this->manager.removeReg(*this); this->manager.removeReg(*this);
} }
@@ -235,7 +235,7 @@ epicsShareFunc fdReg::~fdReg()
// //
// fdReg::show() // fdReg::show()
// //
epicsShareFunc void fdReg::show(unsigned level) const void fdReg::show(unsigned level) const
{ {
printf ("fdReg at %p\n", (void *) this); printf ("fdReg at %p\n", (void *) this);
if (level>1u) { if (level>1u) {
src/libCom/fdmgr/fdManager.h
+11 -10
View File
@@ -107,8 +107,8 @@ private:
epicsShareFunc void installReg (fdReg &reg); epicsShareFunc void installReg (fdReg &reg);
epicsShareFunc void removeReg (fdReg &reg); epicsShareFunc void removeReg (fdReg &reg);
void lazyInitTimerQueue (); void lazyInitTimerQueue ();
fdManager ( const fdManager & ); fdManager ( const fdManager & );
fdManager & operator = ( const fdManager & ); fdManager & operator = ( const fdManager & );
friend class fdReg; friend class fdReg;
}; };
@@ -122,16 +122,17 @@ epicsShareExtern fdManager fileDescriptorManager;
// //
// file descriptor registration // 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; friend class fdManager;
public: public:
epicsShareFunc fdReg (const SOCKET fdIn, const fdRegType type, fdReg (const SOCKET fdIn, const fdRegType type,
const bool onceOnly=false, fdManager &manager = fileDescriptorManager); 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: // Called by the file descriptor manager:
@@ -142,7 +143,7 @@ public:
// //
// fdReg::destroy() does a "delete this" // fdReg::destroy() does a "delete this"
// //
epicsShareFunc virtual void destroy (); virtual void destroy ();
private: private:
enum state {active, pending, limbo}; enum state {active, pending, limbo};
@@ -154,14 +155,14 @@ private:
// lifetime of a fdReg object if the constructor // lifetime of a fdReg object if the constructor
// specified "onceOnly" // specified "onceOnly"
// //
epicsShareFunc virtual void callBack ()=0; virtual void callBack ()=0;
unsigned char state; // state enums go here unsigned char state; // state enums go here
unsigned char onceOnly; unsigned char onceOnly;
fdManager &manager; fdManager &manager;
fdReg ( const fdReg & ); fdReg ( const fdReg & );
fdReg & operator = ( const fdReg & ); fdReg & operator = ( const fdReg & );
}; };
// //