Changeset 128:9e7376ae770a in rrlib_util


Ignore:
Timestamp:
31.05.2015 23:08:38 (4 years ago)
Author:
Tobias Föhst <foehst@…>
Branch:
13.10
Children:
129:2aeacbc68ea9, 130:9777943e41e5, 134:fb5983113932
Phase:
public
Rebase:
39313738313966646236393831353234613262616337313330623737666466663134616230313861
Message:

Bugfix: casts are not allowed in #if expressions (and CLOCKS_PER_SEC resolves to one in c++11)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tTime.h

    r99 r128  
    112112  static inline tTime TaskTime() 
    113113  { 
    114 # if (CLOCKS_PER_SEC == 1000000) 
    115  
    116     return tTime(0, clock()); 
    117 # else 
    118  
    119     return tTime(0, clock() * (1000000 / CLOCKS_PER_SEC)); 
    120 # endif 
    121  
     114    return tTime(0, clock() * (clock_t(1000000) / CLOCKS_PER_SEC)); 
    122115  } 
    123116 
Note: See TracChangeset for help on using the changeset viewer.