diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-07-31 18:38:54 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-07-31 18:38:54 +0000 |
| commit | c0b23b22e5f1265f824e084b0b5dd070538f734c (patch) | |
| tree | 880d166280953ac0b5cbca07abf89ddce701c654 | |
| parent | 07db72b1d740b944b71fd320dfa2ba600a7a095d (diff) | |
| download | ATCD-c0b23b22e5f1265f824e084b0b5dd070538f734c.tar.gz | |
Tue Jul 31 18:37:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_dirent.h | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 795cdfee64e..cd198c38603 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Tue Jul 31 18:37:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_NS_dirent.h: + Removed ACE_STD_NAMESPACE for rewinddir, it causes compile errors + and fixed compile errors with Borland C++ Unicode + Tue Jul 31 18:14:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * ace/*.{h,cpp,inl}: diff --git a/ACE/ace/OS_NS_dirent.h b/ACE/ace/OS_NS_dirent.h index f830e9db6b6..369d530e8a8 100644 --- a/ACE/ace/OS_NS_dirent.h +++ b/ACE/ace/OS_NS_dirent.h @@ -68,8 +68,10 @@ inline void ace_rewinddir_helper (ACE_DIR *dir) # if defined (rewinddir) rewinddir (dir); # undef rewinddir +# elif defined (ACE_HAS_WREWINDDIR) && defined (ACE_USES_WCHAR) + ::wrewinddir (dir); # else - ACE_STD_NAMESPACE::rewinddir (dir); + ::rewinddir (dir); # endif /* defined (rewinddir) */ } #endif /* ACE_LACKS_REWINDDIR */ |