diff options
| author | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-10-15 16:46:05 +0000 |
|---|---|---|
| committer | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-10-15 16:46:05 +0000 |
| commit | 75cd0a04895e7809fddf92406fe1bd39e954f8cd (patch) | |
| tree | f835245e9110ae7bd7d15e0156e256522572b961 /ace/OS.cpp | |
| parent | 320160ab6e19cfcc52967af30e33eb8890f64685 (diff) | |
| download | ATCD-merge_101503.tar.gz | |
This commit was manufactured by cvs2svn to create tag 'merge_101503'.merge_101503
Diffstat (limited to 'ace/OS.cpp')
| -rw-r--r-- | ace/OS.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ace/OS.cpp b/ace/OS.cpp index d2c1ec2af99..d18a5bce379 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -7680,9 +7680,8 @@ long ACE_OS::num_processors (void) { ACE_OS_TRACE ("ACE_OS::num_processors"); -#if defined (ACE_HAS_PHARLAP) - return 1; -#elif defined (ACE_WIN32) || defined (ACE_WIN64) + +#if defined (ACE_WIN32) || defined (ACE_WIN64) SYSTEM_INFO sys_info; ::GetSystemInfo (&sys_info); return sys_info.dwNumberOfProcessors; @@ -7697,9 +7696,8 @@ long ACE_OS::num_processors_online (void) { ACE_OS_TRACE ("ACE_OS::num_processors_online"); -#if defined (ACE_HAS_PHARLAP) - return 1; -#elif defined (ACE_WIN32) || defined (ACE_WIN64) + +#if defined (ACE_WIN32) || defined (ACE_WIN64) SYSTEM_INFO sys_info; ::GetSystemInfo (&sys_info); return sys_info.dwNumberOfProcessors; |