diff options
author | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-12-15 09:22:15 +0000 |
---|---|---|
committer | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-12-15 09:22:15 +0000 |
commit | 8db193d9b7a2d8b5178fe683ac4861892f46d69f (patch) | |
tree | edfcf7291c6c733837dd627bc23ef38569e73879 /ACE/ace | |
parent | a222cf6c662dce30c3607713fdbfb1371d67bc54 (diff) | |
download | ATCD-8db193d9b7a2d8b5178fe683ac4861892f46d69f.tar.gz |
ChangeLogTag: Mon Dec 15 09:15:54 UTC 2008 Olli Savia <ops@iki.fi>
Diffstat (limited to 'ACE/ace')
-rw-r--r-- | ACE/ace/ACE.h | 8 | ||||
-rw-r--r-- | ACE/ace/ACE.inl | 9 |
2 files changed, 14 insertions, 3 deletions
diff --git a/ACE/ace/ACE.h b/ACE/ace/ACE.h index eaa6915433d..38f4233c8eb 100644 --- a/ACE/ace/ACE.h +++ b/ACE/ace/ACE.h @@ -418,6 +418,9 @@ namespace ACE /// @c ACE_OS::malloc to allocate the new string. extern ACE_Export char *strnnew (const char *str, size_t n); + /// Determine if a specified pathname is "dot dir" (ie. "." or ".."). + ACE_NAMESPACE_INLINE_FUNCTION bool isdotdir (const char *s); + #if defined (ACE_HAS_WCHAR) extern ACE_Export const wchar_t *strend (const wchar_t *s); @@ -429,10 +432,9 @@ namespace ACE extern ACE_Export wchar_t *strnnew (const wchar_t *str, size_t n); -#endif /* ACE_HAS_WCHAR */ + ACE_NAMESPACE_INLINE_FUNCTION bool isdotdir (const wchar_t *s); - /// Determine if a specified pathname is "dot dir" (ie. "." or ".."). - ACE_NAMESPACE_INLINE_FUNCTION bool isdotdir (const char *s); +#endif /* ACE_HAS_WCHAR */ /** * On Windows, determines if a specified pathname ends with ".exe" diff --git a/ACE/ace/ACE.inl b/ACE/ace/ACE.inl index 507ec46108e..cb4c0e215c5 100644 --- a/ACE/ace/ACE.inl +++ b/ACE/ace/ACE.inl @@ -291,6 +291,15 @@ ACE::isdotdir (const char *s) ((s[1] == 0) || (s[1] == '.' && s[2] == 0))); } +#if defined (ACE_HAS_WCHAR) +ACE_INLINE bool +ACE::isdotdir (const wchar_t *s) +{ + return (s[0] == ACE_TEXT ('.') && + ((s[1] == 0) || (s[1] == ACE_TEXT ('.') && s[2] == 0))); +} +#endif /* ACE_HAS_WCHAR */ + ACE_INLINE void ACE::unique_name (const void *object, ACE_TCHAR *name, |