Changeset 42:27ec629865bc in rrlib_thread


Ignore:
Timestamp:
02.03.2019 16:37:52 (8 months ago)
Author:
Max Reichardt <mreichardt@…>
Branch:
17.03
Children:
43:910c1a1e8756, 45:455c4c18ae61
Parents:
39:d45d6f5f5d3a (diff), 41:d05449b579fa (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Message:

Merge with 14.08

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • tThread.cpp

    r38 r42  
    235235  // remove from thread list 
    236236  tLock lock(thread_list_ref->obj_mutex); 
    237   assert(this != NULL); 
    238237 
    239238  // remove thread from list 
  • tThread.cpp

    r41 r42  
    3838#ifndef RRLIB_SINGLE_THREADED 
    3939#include <sys/resource.h> 
     40#ifndef __CYGWIN__ 
    4041#include <sys/syscall.h> 
     42#endif 
    4143#include <unistd.h> 
    4244#endif 
     
    7375//---------------------------------------------------------------------- 
    7476#ifndef RRLIB_SINGLE_THREADED 
     77#ifndef __CYGWIN__ 
    7578#ifdef _PTHREAD_H 
    7679#define RRLIB_THREAD_USING_PTHREADS 
     80#endif 
    7781#endif 
    7882#endif 
     
    227231tThread::~tThread() 
    228232{ 
    229   RRLIB_LOG_PRINT(DEBUG_VERBOSE_1, "Deleting thread ", this); 
     233  //RRLIB_LOG_PRINT(DEBUG_VERBOSE_1, "Deleting thread ", this); 
    230234 
    231235  // remove from thread list 
Note: See TracChangeset for help on using the changeset viewer.