Merge 3.15 into 3.16

2018-02-05 12:06:37 -06:00
parent eef6f3afbb 61296b8cff
commit cd8fd8a08f
2 changed files with 2 additions and 13 deletions
--- a/src/ca/client/access.cpp
+++ b/src/ca/client/access.cpp
@@ -127,21 +127,10 @@ const char * ca_message_text []

 static epicsThreadOnceId caClientContextIdOnce = EPICS_THREAD_ONCE_INIT;

-extern "C" void ca_client_exit_handler (void *)
-{
-    if ( caClientContextId ) {
-        epicsThreadPrivateDelete ( caClientContextId );
-        caClientContextId = 0;
-    }
-}
-
 // runs once only for each process
 extern "C" void ca_init_client_context ( void * )
 {
    caClientContextId = epicsThreadPrivateCreate ();
-    if ( caClientContextId ) {
-        epicsAtExit ( ca_client_exit_handler,0 );
-    }
 }

 /*