diff options
| author | mcorino <mcorino@users.noreply.github.com> | 2004-11-05 11:34:38 +0000 |
|---|---|---|
| committer | mcorino <mcorino@users.noreply.github.com> | 2004-11-05 11:34:38 +0000 |
| commit | 5af3e4e16488b48b6fb3be7adc1f693db87215ef (patch) | |
| tree | c823df27c6570a05c55755efd24706cc32c946ac | |
| parent | 9294b64a4decba5c62c44cf2db5822e26d6bb334 (diff) | |
| download | ATCD-5af3e4e16488b48b6fb3be7adc1f693db87215ef.tar.gz | |
ChangeLogTag: Fri Nov 5 10:30:12 UTC 2004 Martin Corino <mcorino@remedy.nl>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ace/OS_NS_stdlib.cpp | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index dbdaa065564..640c3c4091d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Nov 5 10:30:12 UTC 2004 Martin Corino <mcorino@remedy.nl> + + * ace/OS_NS_stdlib.cpp: + Fixed ACE_OS::mkstemp_emulation() for VxWorks because of 'max' + macro clash with 'std::numeric_limits<char>::max ()'. + Fri Nov 5 07:28:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Test_Output.cpp: diff --git a/ace/OS_NS_stdlib.cpp b/ace/OS_NS_stdlib.cpp index 28770a7f70e..4ca25391d8a 100644 --- a/ace/OS_NS_stdlib.cpp +++ b/ace/OS_NS_stdlib.cpp @@ -623,7 +623,7 @@ ACE_OS::mkstemp_emulation (ACE_TCHAR * s) // greatly slowing down this mkstemp() implementation. It is more // practical to limit the search space to UTF-8 / ASCII characters // (i.e. 127 characters). -# if defined (ACE_HAS_WINCE) +# if defined (ACE_HAS_WINCE) || defined (ACE_VXWORKS) static float const MAX_VAL = static_cast<float> (127); #else static float const MAX_VAL = |