From c51438c59747cc25737536a42cafdef08aa64a3b Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Tue, 28 Nov 2006 00:46:35 +0000 Subject: [PATCH] fixed infinite recursion introduced by change in generic epicsThreadOnce code --- src/libCom/osi/os/WIN32/osdTime.cpp | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/libCom/osi/os/WIN32/osdTime.cpp b/src/libCom/osi/os/WIN32/osdTime.cpp index 1d7849613..5e75c9bbd 100644 --- a/src/libCom/osi/os/WIN32/osdTime.cpp +++ b/src/libCom/osi/os/WIN32/osdTime.cpp @@ -100,21 +100,9 @@ static void osdTimeInit ( void * ) osdTimeInitSuccess = true; pCurrentTime = new currentTime (); - + // bypass recursion crowbar in epicsThreadOnce + osdTimeOnceFlag = 1; pCurrentTime->startPLL (); - - // self test FILETIME conversion only if - // its a debug build -# if defined ( _DEBUG ) - { - epicsTime ts0 = epicsTime::getCurrent (); - FILETIME ft = ts0; - epicsTime ts1 = ft; - double diff = fabs ( ts0 - ts1 ); - // we expect to loose 100 nS of precision when moving to and from win32 filetime - assert ( diff <= 100e-9 ); - } -# endif } }