summaryrefslogtreecommitdiff
path: root/protocols/ace/TMCast/Group.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'protocols/ace/TMCast/Group.cpp')
-rw-r--r--protocols/ace/TMCast/Group.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/protocols/ace/TMCast/Group.cpp b/protocols/ace/TMCast/Group.cpp
index 29187838a85..464533bec2f 100644
--- a/protocols/ace/TMCast/Group.cpp
+++ b/protocols/ace/TMCast/Group.cpp
@@ -8,7 +8,6 @@
// OS primitives
#include <ace/OS.h>
-#include <ace/OS_NS_stdlib.h>
#include <ace/Synch.h>
#include <ace/Time_Value.h>
#include <ace/SOCK_Dgram_Mcast.h>
@@ -84,7 +83,7 @@ namespace ACE_TMCast
this,
THR_JOINABLE,
&unused,
- &thread_) != 0) ACE_OS::abort ();
+ &thread_) != 0) ::abort ();
}
virtual ~Scheduler ()
@@ -95,7 +94,7 @@ namespace ACE_TMCast
in_control_.push (MessagePtr (new Terminate));
}
- if (ACE_OS::thr_join (thread_, 0) != 0) ACE_OS::abort ();
+ if (ACE_OS::thr_join (thread_, 0) != 0) ::abort ();
// cerr << "Scheduler is down." << endl;
}
@@ -202,7 +201,7 @@ namespace ACE_TMCast
{
// cerr << "unknown message type from link listener: "
// << typeid (*m).name () << endl;
- ACE_OS::abort ();
+ abort ();
}
}
@@ -397,7 +396,7 @@ namespace ACE_TMCast
// << "unexpected message " << typeid (*m).name ()
// << " " << typeid (Aborted).name () << endl;
- ACE_OS::abort ();
+ abort ();
}
}
@@ -440,7 +439,7 @@ namespace ACE_TMCast
// cerr << "recv: group-scheduler messaging protocol violation. "
// << "unexpected message " << typeid (*m).name () << endl;
- ACE_OS::abort ();
+ abort ();
}
}