diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-09-19 09:55:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-19 09:55:26 +0200 |
| commit | 96f0f9c16668c07531ea8c60c7b912f2e7b55806 (patch) | |
| tree | 163dacdeafb58269b2c7e81c61d563f2ed82a4d9 /ACE | |
| parent | 14610fc4e135e9a07067353b0fd00f054f1288e5 (diff) | |
| parent | d7c2081760f1fed0c7e5929c35b7cc0fe9429c2e (diff) | |
| download | ATCD-96f0f9c16668c07531ea8c60c7b912f2e7b55806.tar.gz | |
Merge pull request #1934 from jwillemsen/jwi-require_truncation_
Use uniform initialisation for require_truncation_ so tha we can generate a default constructor
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ace/OS_NS_dirent.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ACE/ace/OS_NS_dirent.h b/ACE/ace/OS_NS_dirent.h index a8a95b2e1d7..98298083e24 100644 --- a/ACE/ace/OS_NS_dirent.h +++ b/ACE/ace/OS_NS_dirent.h @@ -41,9 +41,7 @@ extern "C" { #elif defined (ACE_SCANDIR_CMP_USES_CONST_VOIDPTR) typedef int (*ACE_SCANDIR_OS_COMPARATOR)(const void *f1, const void *f2); #endif /* ACE_SCANDIR_CMP_USES_VOIDPTR */ - typedef int (*ACE_SCANDIR_COMPARATOR)(const ACE_DIRENT **f1, - const ACE_DIRENT **f2); - + typedef int (*ACE_SCANDIR_COMPARATOR)(const ACE_DIRENT **f1, const ACE_DIRENT **f2); #if defined (ACE_SCANDIR_SEL_LACKS_CONST) typedef int (*ACE_SCANDIR_OS_SELECTOR)(ACE_DIRENT *filename); #endif /* ACE_SCANDIR_SEL_LACKS_CONST */ @@ -56,7 +54,6 @@ extern "C" { * be usable later as there is no way to save the macro definition * using the pre-processor. */ - #if !defined (ACE_LACKS_REWINDDIR) # if !defined (ACE_HAS_WREWINDDIR) || !defined (ACE_USES_WCHAR) inline void ace_rewinddir_helper (ACE_DIR *dir) |