diff options
| author | Erik Sohns <esohns@users.noreply.github.com> | 2023-01-22 17:38:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-22 17:38:34 +0100 |
| commit | 9e18d338ec598e1a8da6d32a0fba5a20c76978f7 (patch) | |
| tree | 045f42001bd4e15cf8285686798fe47acd2f2b60 /ACE/ace/High_Res_Timer.cpp | |
| parent | 8b6ad82dc91f728cea2c9e86a17e5969a3338fcc (diff) | |
| parent | 8ab31e3e5bb8c09a9c326a54545f4cb475345a78 (diff) | |
| download | ATCD-9e18d338ec598e1a8da6d32a0fba5a20c76978f7.tar.gz | |
Merge branch 'master' into message_queue_ex_get_queue
Diffstat (limited to 'ACE/ace/High_Res_Timer.cpp')
| -rw-r--r-- | ACE/ace/High_Res_Timer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ACE/ace/High_Res_Timer.cpp b/ACE/ace/High_Res_Timer.cpp index ef30f0833fb..1546cd03d07 100644 --- a/ACE/ace/High_Res_Timer.cpp +++ b/ACE/ace/High_Res_Timer.cpp @@ -227,7 +227,7 @@ ACE_High_Res_Timer::global_scale_factor () #endif /* (ACE_WIN32 || ACE_HAS_POWERPC_TIMER || \ ACE_HAS_PENTIUM) && \ ! ACE_HAS_HI_RES_TIMER && - ((WIN32 && ! WINCE) || ghs || __GNUG__) */ + ((WIN32) || ghs || __GNUG__) */ return ACE_High_Res_Timer::global_scale_factor_; } |