diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-10-27 10:54:30 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-10-27 10:54:30 +0200 |
| commit | 9b18e1b7460c6f10feb441ae7c8e681b615b8460 (patch) | |
| tree | 10953f5466cd8a9df1276f9eb35c629ddc405711 /ACE/ace/OS_NS_string.inl | |
| parent | 36a9f816d472c0ba515a6a9ed3f78225994c122c (diff) | |
| download | ATCD-9b18e1b7460c6f10feb441ae7c8e681b615b8460.tar.gz | |
use nullptr, layout changes, const changes
* ACE/ace/Configuration.cpp:
* ACE/ace/OS_NS_string.h:
* ACE/ace/OS_NS_string.inl:
* ACE/ace/String_Base.cpp:
* ACE/ace/String_Base.h:
* ACE/ace/String_Base.inl:
Diffstat (limited to 'ACE/ace/OS_NS_string.inl')
| -rw-r--r-- | ACE/ace/OS_NS_string.inl | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ACE/ace/OS_NS_string.inl b/ACE/ace/OS_NS_string.inl index ec1ea1eb63c..94f0380ea43 100644 --- a/ACE/ace/OS_NS_string.inl +++ b/ACE/ace/OS_NS_string.inl @@ -65,7 +65,7 @@ ACE_OS::strcat (wchar_t *s, const wchar_t *t) ACE_INLINE const char * ACE_OS::strchr (const char *s, int c) { - return const_cast <const char *> (::strchr (s, c)); + return ::strchr (s, c); } #if defined (ACE_HAS_WCHAR) @@ -90,9 +90,7 @@ ACE_OS::strchr (char *s, int c) ACE_INLINE wchar_t * ACE_OS::strchr (wchar_t *s, wchar_t c) { - return - const_cast<wchar_t *> (ACE_OS::strchr (const_cast<const wchar_t *> (s), - c)); + return const_cast<wchar_t *> (ACE_OS::strchr (const_cast<const wchar_t *> (s), c)); } #endif /* ACE_HAS_WCHAR */ @@ -338,8 +336,7 @@ ACE_OS::strpbrk (char *s1, const char *s2) ACE_INLINE wchar_t * ACE_OS::strpbrk (wchar_t *s, const wchar_t *t) { - return const_cast<wchar_t *> (ACE_OS::strpbrk ( - const_cast<const wchar_t *> (s), t)); + return const_cast<wchar_t *> (ACE_OS::strpbrk (const_cast<const wchar_t *> (s), t)); } #endif /* ACE_HAS_WCHAR */ |