diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-08-13 19:51:24 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-08-13 19:51:24 +0200 |
| commit | 99fd41c18381b59a1a7ab29bd973dc65699fce6b (patch) | |
| tree | e80241ee7df836704c8b1d92b4ffc9f3f23cb1f8 /ACE/ace/OS_NS_string.h | |
| parent | 5406db4418c095980b2fdacf81887d2955e1336c (diff) | |
| parent | dbc170b91a66b53d043e1d7e5083589318363d6f (diff) | |
| download | ATCD-99fd41c18381b59a1a7ab29bd973dc65699fce6b.tar.gz | |
Resolve merge conflicts
Diffstat (limited to 'ACE/ace/OS_NS_string.h')
| -rw-r--r-- | ACE/ace/OS_NS_string.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/ACE/ace/OS_NS_string.h b/ACE/ace/OS_NS_string.h index 4327daed35f..7d98895b8ac 100644 --- a/ACE/ace/OS_NS_string.h +++ b/ACE/ace/OS_NS_string.h @@ -53,12 +53,6 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION void *memchr (void *s, int c, size_t len); -#if defined (ACE_LACKS_MEMCHR) - /// Emulated memchr - Finds a character in a buffer. - extern ACE_Export - const void *memchr_emulation (const void *s, int c, size_t len); -#endif /* ACE_LACKS_MEMCHR */ - /// Compares two buffers. ACE_NAMESPACE_INLINE_FUNCTION int memcmp (const void *t, const void *s, size_t len); @@ -67,16 +61,6 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION void *memcpy (void *t, const void *s, size_t len); -#if defined (ACE_HAS_MEMCPY_LOOP_UNROLL) -/* - * Version of memcpy where the copy loop is unrolled. - * On certain platforms this results in better performance. - * This is determined and set via autoconf. - */ - extern ACE_Export - void *fast_memcpy (void *t, const void *s, size_t len); -#endif - /// Moves one buffer to another. ACE_NAMESPACE_INLINE_FUNCTION void *memmove (void *t, const void *s, size_t len); |