diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-07-19 13:26:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-19 13:26:29 +0200 |
| commit | 9813f22105a6d411be7659e2441f6a64893a642b (patch) | |
| tree | d2d955831f2bf1c0ec2a711d160f3fe9218198a4 | |
| parent | 335e4a12ade8196a5e0bc8b7efa9d9f038f5883a (diff) | |
| parent | 377501f6634e161bcb82f7babf11753806db96fb (diff) | |
| download | ATCD-9813f22105a6d411be7659e2441f6a64893a642b.tar.gz | |
Merge pull request #1620 from jwillemsen/jwi-stdnamespace
Removed ACE_STD_NAMESPACE from all signal related operations, these a…
| -rw-r--r-- | ACE/ace/OS_NS_signal.h | 13 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_string.cpp | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/ACE/ace/OS_NS_signal.h b/ACE/ace/OS_NS_signal.h index c09ef5e94e1..1fb6ca3b114 100644 --- a/ACE/ace/OS_NS_signal.h +++ b/ACE/ace/OS_NS_signal.h @@ -48,7 +48,7 @@ inline int ace_sigemptyset_helper (sigset_t *s) return sigemptyset (s); # undef sigemptyset # else - return ACE_STD_NAMESPACE::sigemptyset (s); + return ::sigemptyset (s); # endif /* defined (sigemptyset) */ } @@ -58,7 +58,7 @@ inline int ace_sigfillset_helper (sigset_t *s) return sigfillset (s); # undef sigfillset # else - return ACE_STD_NAMESPACE::sigfillset (s); + return ::sigfillset (s); # endif /* defined (sigfillset) */ } @@ -68,7 +68,7 @@ inline int ace_sigaddset_helper (sigset_t *s, int signum) return sigaddset (s, signum); # undef sigaddset # else - return ACE_STD_NAMESPACE::sigaddset (s, signum); + return ::sigaddset (s, signum); # endif /* defined (sigaddset) */ } @@ -78,7 +78,7 @@ inline int ace_sigdelset_helper (sigset_t *s, int signum) return sigdelset (s, signum); # undef sigdelset # else - return ACE_STD_NAMESPACE::sigdelset (s, signum); + return ::sigdelset (s, signum); # endif /* defined (sigdelset) */ } @@ -88,7 +88,7 @@ inline int ace_sigismember_helper (sigset_t *s, int signum) return sigismember (s, signum); # undef sigismember # else - return ACE_STD_NAMESPACE::sigismember (s, signum); + return ::sigismember (s, signum); # endif /* defined (sigismember) */ } #endif /* !defined (ACE_LACKS_SIGSET) */ @@ -100,12 +100,11 @@ inline int ace_sigsuspend_helper (const sigset_t *s) return sigsuspend (s); # undef sigsuspend # else - return ACE_STD_NAMESPACE::sigsuspend (s); + return ::sigsuspend (s); # endif /* defined (sigsuspen) */ } #endif /* ACE_HAS_SIGSUSPEND */ - # if !defined (SIG_BLOCK) # define SIG_BLOCK 1 # endif /* SIG_BLOCK */ diff --git a/ACE/ace/OS_NS_string.cpp b/ACE/ace/OS_NS_string.cpp index ff5c4e1e549..cbeda603bbf 100644 --- a/ACE/ace/OS_NS_string.cpp +++ b/ACE/ace/OS_NS_string.cpp @@ -148,7 +148,7 @@ ACE_OS::strsignal (int signum) ret_val = 0; else # endif /* (ACE_NEEDS_STRSIGNAL_RANGE_CHECK */ - ret_val = ACE_STD_NAMESPACE::strsignal (signum); + ret_val = ::strsignal (signum); if (ret_val <= reinterpret_cast<char *> (0)) { |