summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-01-12 06:13:38 +0000
committerbala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-01-12 06:13:38 +0000
commit5d8657866f438da0ca4c07979af64cb878c1e1e4 (patch)
treed4a467c8a68c08eb01acb222fcaef670898ab8c5
parentdf05b2794bc3300441a71994ba59d6d4b1864766 (diff)
downloadATCD-5d8657866f438da0ca4c07979af64cb878c1e1e4.tar.gz
ChangeLogTag:Wed Jan 12 00:12:03 2005 Balachandran Natarajan <bala@dre.vanderbilt.edu>
-rw-r--r--ChangeLog9
-rw-r--r--ace/OS_NS_signal.inl2
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bc7b3ebfeaa..bcbb496d1c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed Jan 12 00:12:03 2005 Balachandran Natarajan <bala@dre.vanderbilt.edu>
+
+ * ace/OS_NS_signal.inl:
+
+ Fixed a compile error with the following checkin "Tue Jan 11
+ 18:14:22 2005 Steve Huston <shuston@riverace.com>". Not sure
+ whether this is going to break aCC. The existing code broke
+ atleast g++ 3.3.4. Need to sync with Steve on this.
+
Tue Jan 11 18:14:22 2005 Steve Huston <shuston@riverace.com>
* ace/OS_NS_signal.inl: Added "namespace ACE_OS" to this as some other
diff --git a/ace/OS_NS_signal.inl b/ace/OS_NS_signal.inl
index 350eb50fb6d..a2159ad2604 100644
--- a/ace/OS_NS_signal.inl
+++ b/ace/OS_NS_signal.inl
@@ -37,7 +37,7 @@ pthread_sigmask (int how, const sigset_t *nsp, sigset_t *osp)
}
ACE_INLINE int
-sigaction (int signum, const struct ::sigaction *nsa, struct ::sigaction *osa)
+sigaction (int signum, const struct sigaction *nsa, struct sigaction *osa)
{
ACE_OS_TRACE ("ACE_OS::sigaction");
if (signum == 0)