From ce28781b776c94077f1591174e5e925c820c3fa3 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Wed, 9 Feb 2000 00:53:51 +0000
Subject: [PATCH] fixed gnu warnings

---
 src/libCom/fdmgr/fdmgr.cpp | 68 +++++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/libCom/fdmgr/fdmgr.cpp b/src/libCom/fdmgr/fdmgr.cpp
index c5cddc378..978f5cb2d 100644
--- a/src/libCom/fdmgr/fdmgr.cpp
+++ b/src/libCom/fdmgr/fdmgr.cpp
@@ -32,7 +32,7 @@
 // NOTES: 
 // 1) the routines in this file provide backward compatibility with the original
 // "C" based file descriptor manager API
-// 2) This library is not thread safe
+// 2) This library is _not_ thread safe
 //
 
 #define epicsExportSharedSymbols
@@ -62,37 +62,6 @@ private:
 	epicsShareFunc virtual void callBack ();
 };
 
-epicsShareFunc fdRegForOldFdmgr::fdRegForOldFdmgr (const SOCKET fdIn, const fdRegType typeIn, 
-	const bool onceOnlyIn, fdManager &managerIn, pCallBackFDMgr pFuncIn, void *pParamIn) :
-    fdReg (fdIn, typeIn, onceOnlyIn, managerIn),
-    pFunc (pFuncIn),
-    pParam (pParamIn)
-{
-    if (pFuncIn==NULL) {
-#       ifdef noExceptionsFromCXX
-            assert (0);
-#       else            
-            throw noFunctionSpecified ();
-#       endif
-    }
-}
-
-epicsShareFunc fdRegForOldFdmgr::~fdRegForOldFdmgr ()
-{
-    if (this->pFunc==NULL) {
-#       ifdef noExceptionsFromCXX
-            assert (0);
-#       else            
-            throw doubleDelete ();
-#       endif
-    }
-}
-
-epicsShareFunc void fdRegForOldFdmgr::callBack ()
-{
-    (*this->pFunc) (this->pParam);
-}
-
 class oldFdmgr : public fdManager {
     friend class osiTimerForOldFdmgr;
     friend epicsShareFunc int epicsShareAPI fdmgr_clear_timeout (fdctx *pfdctx, fdmgrAlarmId id);
@@ -104,9 +73,8 @@ private:
     chronIntIdResTable <osiTimerForOldFdmgr> resTbl;
 };
 
-
 //
-// osiTimer
+// osiTimerForOldFdmgr
 //
 class osiTimerForOldFdmgr : public osiTimer, public chronIntIdRes<osiTimerForOldFdmgr> {
 public:
@@ -139,6 +107,38 @@ private:
     unsigned id;
 };
 
+
+epicsShareFunc fdRegForOldFdmgr::fdRegForOldFdmgr (const SOCKET fdIn, const fdRegType typeIn, 
+	const bool onceOnlyIn, fdManager &managerIn, pCallBackFDMgr pFuncIn, void *pParamIn) :
+    fdReg (fdIn, typeIn, onceOnlyIn, managerIn),
+    pFunc (pFuncIn),
+    pParam (pParamIn)
+{
+    if (pFuncIn==NULL) {
+#       ifdef noExceptionsFromCXX
+            assert (0);
+#       else            
+            throw noFunctionSpecified ();
+#       endif
+    }
+}
+
+epicsShareFunc fdRegForOldFdmgr::~fdRegForOldFdmgr ()
+{
+    if (this->pFunc==NULL) {
+#       ifdef noExceptionsFromCXX
+            assert (0);
+#       else            
+            throw doubleDelete ();
+#       endif
+    }
+}
+
+epicsShareFunc void fdRegForOldFdmgr::callBack ()
+{
+    (*this->pFunc) (this->pParam);
+}
+
 osiTimerForOldFdmgr::osiTimerForOldFdmgr (oldFdmgr &fdmgrIn, 
     double delayIn, pCallBackFDMgr pFuncIn, void *pParamIn) :
     osiTimer (delayIn, fdmgrIn.timerQueueRef ()),